Merge "Add more detail to the dev-readme doc"
diff --git a/Documentation/intro-project-owner.txt b/Documentation/intro-project-owner.txt
index 7a724f7..72fe717 100644
--- a/Documentation/intro-project-owner.txt
+++ b/Documentation/intro-project-owner.txt
@@ -70,8 +70,8 @@
commands:
----
- $ git fetch origin refs/meta/config:config
- $ git checkout config
+ $ git fetch ssh://localhost:29418/project refs/meta/config
+ $ git checkout FETCH_HEAD
$ git log project.config
----
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/AgreementSignup.java b/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/AgreementSignup.java
index 2d187c0..c910a7a 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/AgreementSignup.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/AgreementSignup.java
@@ -20,13 +20,7 @@
import com.google.gerrit.reviewdb.client.Account;
import com.google.inject.Inject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
public class AgreementSignup {
- private static final Logger log =
- LoggerFactory.getLogger(AgreementSignup.class);
-
private final DynamicSet<AgreementSignupListener> listeners;
private final EventUtil util;
@@ -46,7 +40,7 @@
try {
l.onAgreementSignup(event);
} catch (Exception e) {
- util.logEventListenerError(log, e);
+ util.logEventListenerError(this, l, e);
}
}
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/ChangeAbandoned.java b/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/ChangeAbandoned.java
index ad5bb98..5a7aec2 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/ChangeAbandoned.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/ChangeAbandoned.java
@@ -63,7 +63,7 @@
try {
l.onChangeAbandoned(event);
} catch (Exception e) {
- util.logEventListenerError(log, e);
+ util.logEventListenerError(this, l, e);
}
}
} catch (PatchListNotAvailableException | GpgException | IOException
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/ChangeMerged.java b/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/ChangeMerged.java
index ebfe7d6..8b4a6a0 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/ChangeMerged.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/ChangeMerged.java
@@ -63,7 +63,7 @@
try {
l.onChangeMerged(event);
} catch (Exception e) {
- util.logEventListenerError(log, e);
+ util.logEventListenerError(this, l, e);
}
}
} catch (PatchListNotAvailableException | GpgException | IOException
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/ChangeRestored.java b/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/ChangeRestored.java
index 6087070..1d2682a 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/ChangeRestored.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/ChangeRestored.java
@@ -63,7 +63,7 @@
try {
l.onChangeRestored(event);
} catch (Exception e) {
- util.logEventListenerError(log, e);
+ util.logEventListenerError(this, l, e);
}
}
} catch (PatchListNotAvailableException | GpgException | IOException
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/ChangeReverted.java b/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/ChangeReverted.java
index c4f2fc6..d963a47 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/ChangeReverted.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/ChangeReverted.java
@@ -52,7 +52,7 @@
try {
l.onChangeReverted(event);
} catch (Exception e) {
- util.logEventListenerError(log, e);
+ util.logEventListenerError(this, l, e);
}
}
} catch (OrmException e) {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/CommentAdded.java b/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/CommentAdded.java
index 35f2c7d..f1bb50a 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/CommentAdded.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/CommentAdded.java
@@ -68,7 +68,7 @@
try {
l.onCommentAdded(event);
} catch (Exception e) {
- util.logEventListenerError(log, e);
+ util.logEventListenerError(this, l, e);
}
}
} catch (PatchListNotAvailableException | GpgException | IOException
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/DraftPublished.java b/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/DraftPublished.java
index b5dba77..4f6d298 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/DraftPublished.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/DraftPublished.java
@@ -60,7 +60,7 @@
try {
l.onDraftPublished(event);
} catch (Exception e) {
- util.logEventListenerError(log, e);
+ util.logEventListenerError(this, l, e);
}
}
} catch (PatchListNotAvailableException | GpgException | IOException
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/EventUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/EventUtil.java
index c5eaa0c..682d9ec 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/EventUtil.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/EventUtil.java
@@ -35,6 +35,7 @@
import com.google.inject.Provider;
import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.sql.Timestamp;
@@ -43,6 +44,7 @@
import java.util.Map;
public class EventUtil {
+ private static final Logger log = LoggerFactory.getLogger(EventUtil.class);
private final ChangeData.Factory changeDataFactory;
private final Provider<ReviewDb> db;
@@ -54,8 +56,9 @@
Provider<ReviewDb> db) {
this.changeDataFactory = changeDataFactory;
this.db = db;
- this.changeJson = changeJsonFactory.create(
- EnumSet.allOf(ListChangesOption.class));
+ EnumSet<ListChangesOption> opts = EnumSet.allOf(ListChangesOption.class);
+ opts.remove(ListChangesOption.CHECK);
+ this.changeJson = changeJsonFactory.create(opts);
}
public ChangeInfo changeInfo(Change change) throws OrmException {
@@ -95,11 +98,16 @@
return result;
}
- public void logEventListenerError(Logger log, Exception error) {
+ public void logEventListenerError(Object event, Object listener,
+ Exception error) {
if (log.isDebugEnabled()) {
- log.debug("Error in event listener", error);
+ log.debug(String.format(
+ "Error in event listener %s for event %s",
+ listener.getClass().getName(), event.getClass().getName()), error);
} else {
- log.warn("Error in event listener: {}", error.getMessage());
+ log.warn("Error in listener {} for event {}: {}",
+ listener.getClass().getName(), event.getClass().getName(),
+ error.getMessage());
}
}
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/GitReferenceUpdated.java b/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/GitReferenceUpdated.java
index 63fa391..381dced 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/GitReferenceUpdated.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/GitReferenceUpdated.java
@@ -26,13 +26,8 @@
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.RefUpdate;
import org.eclipse.jgit.transport.ReceiveCommand;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class GitReferenceUpdated {
- private static final Logger log = LoggerFactory
- .getLogger(GitReferenceUpdated.class);
-
public static final GitReferenceUpdated DISABLED = new GitReferenceUpdated() {
@Override
public void fire(Project.NameKey project, RefUpdate refUpdate,
@@ -123,7 +118,7 @@
try {
l.onGitReferenceUpdated(event);
} catch (Exception e) {
- util.logEventListenerError(log, e);
+ util.logEventListenerError(this, l, e);
}
}
}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/HashtagsEdited.java b/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/HashtagsEdited.java
index c9cf5f1..233a89e 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/HashtagsEdited.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/HashtagsEdited.java
@@ -62,7 +62,7 @@
try {
l.onHashtagsEdited(event);
} catch (Exception e) {
- util.logEventListenerError(log, e);
+ util.logEventListenerError(this, l, e);
}
}
} catch (OrmException e) {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/ReviewerAdded.java b/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/ReviewerAdded.java
index 337982f..8860a42 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/ReviewerAdded.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/ReviewerAdded.java
@@ -67,7 +67,7 @@
try {
l.onReviewersAdded(event);
} catch (Exception e) {
- util.logEventListenerError(log, e);
+ util.logEventListenerError(this, l, e);
}
}
} catch (PatchListNotAvailableException | GpgException | IOException
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/ReviewerDeleted.java b/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/ReviewerDeleted.java
index 00950b7..4bc4764 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/ReviewerDeleted.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/ReviewerDeleted.java
@@ -71,7 +71,7 @@
try {
listener.onReviewerDeleted(event);
} catch (Exception e) {
- util.logEventListenerError(log, e);
+ util.logEventListenerError(this, listener, e);
}
}
} catch (PatchListNotAvailableException | GpgException | IOException
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/RevisionCreated.java b/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/RevisionCreated.java
index c7d1ef6..7f03c63 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/RevisionCreated.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/RevisionCreated.java
@@ -63,7 +63,7 @@
try {
l.onRevisionCreated(event);
} catch (Exception e) {
- util.logEventListenerError(log, e);
+ util.logEventListenerError(this, l, e);
}
}
} catch ( PatchListNotAvailableException | GpgException | IOException
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/TopicEdited.java b/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/TopicEdited.java
index 837d730..2e583a8 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/TopicEdited.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/TopicEdited.java
@@ -58,7 +58,7 @@
try {
l.onTopicEdited(event);
} catch (Exception e) {
- util.logEventListenerError(log, e);
+ util.logEventListenerError(this, l, e);
}
}
} catch (OrmException e) {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/VoteDeleted.java b/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/VoteDeleted.java
index 9d1e7f2..e421ea6 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/VoteDeleted.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/extensions/events/VoteDeleted.java
@@ -71,7 +71,7 @@
try {
l.onVoteDeleted(event);
} catch (Exception e) {
- util.logEventListenerError(log, e);
+ util.logEventListenerError(this, l, e);
}
}
} catch (PatchListNotAvailableException | GpgException | IOException
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java
index 71b29a1..0be2a38 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java
@@ -479,7 +479,9 @@
BatchUpdate.execute(orm.batchUpdates(allProjects),
new SubmitStrategyListener(submitInput, strategies, commits),
submissionId, dryrun);
- } catch (UpdateException | SubmoduleException e) {
+ } catch (SubmoduleException e) {
+ throw new IntegrationException(e);
+ } catch (UpdateException e) {
// BatchUpdate may have inadvertently wrapped an IntegrationException
// thrown by some legacy SubmitStrategyOp code that intended the error
// message to be user-visible. Copy the message from the wrapped
@@ -491,8 +493,7 @@
if (e.getCause() instanceof IntegrationException) {
msg = e.getCause().getMessage();
} else {
- msg = "Error submitting change" + (cs.size() != 1 ? "s" : "") + ": \n"
- + e.getMessage();
+ msg = "Error submitting change" + (cs.size() != 1 ? "s" : "");
}
throw new IntegrationException(msg, e);
}
