Include repo config into CommitReceivedEvent
Some implementors of CommitValidationListener may need the repository
config (e.g. in order to use DiffFormatter). At the moment they need to
reopen the repository for this, but since callers have it already
available they can simply provide it.
This makes the objects that are available to implementors of
CommitValidationListener more consistent with the objects that are
available to implementors of MergeValidationListener, which already
gets the repository and hence its config. We do not want to provide the
Repository instance as it is intentionally write protected when batch
updates are done.
Signed-off-by: Edwin Kempin <ekempin@google.com>
Change-Id: Ie9439e4196c894ff261f98ba38a9db9d57e209d8
diff --git a/java/com/google/gerrit/server/change/ChangeInserter.java b/java/com/google/gerrit/server/change/ChangeInserter.java
index a086cb1..6091091 100644
--- a/java/com/google/gerrit/server/change/ChangeInserter.java
+++ b/java/com/google/gerrit/server/change/ChangeInserter.java
@@ -546,6 +546,7 @@
cmd,
projectState.getProject(),
change.getDest().branch(),
+ ctx.getRepoView().getConfig(),
ctx.getRevWalk().getObjectReader(),
commitId,
ctx.getIdentifiedUser())) {
diff --git a/java/com/google/gerrit/server/change/PatchSetInserter.java b/java/com/google/gerrit/server/change/PatchSetInserter.java
index 882352d..ef06ea1 100644
--- a/java/com/google/gerrit/server/change/PatchSetInserter.java
+++ b/java/com/google/gerrit/server/change/PatchSetInserter.java
@@ -342,6 +342,7 @@
.orElseThrow(illegalState(origNotes.getProjectName()))
.getProject(),
origNotes.getChange().getDest().branch(),
+ ctx.getRepoView().getConfig(),
ctx.getRevWalk().getObjectReader(),
commitId,
ctx.getIdentifiedUser())) {
diff --git a/java/com/google/gerrit/server/events/CommitReceivedEvent.java b/java/com/google/gerrit/server/events/CommitReceivedEvent.java
index 6e43621..eb4d9ee 100644
--- a/java/com/google/gerrit/server/events/CommitReceivedEvent.java
+++ b/java/com/google/gerrit/server/events/CommitReceivedEvent.java
@@ -17,6 +17,7 @@
import com.google.gerrit.entities.Project;
import com.google.gerrit.server.IdentifiedUser;
import java.io.IOException;
+import org.eclipse.jgit.lib.Config;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.ObjectReader;
import org.eclipse.jgit.revwalk.RevCommit;
@@ -28,6 +29,7 @@
public ReceiveCommand command;
public Project project;
public String refName;
+ public Config repoConfig;
public RevWalk revWalk;
public RevCommit commit;
public IdentifiedUser user;
@@ -40,6 +42,7 @@
ReceiveCommand command,
Project project,
String refName,
+ Config repoConfig,
ObjectReader reader,
ObjectId commitId,
IdentifiedUser user)
@@ -48,6 +51,7 @@
this.command = command;
this.project = project;
this.refName = refName;
+ this.repoConfig = repoConfig;
this.revWalk = new RevWalk(reader);
this.commit = revWalk.parseCommit(commitId);
this.user = user;
diff --git a/java/com/google/gerrit/server/git/receive/BranchCommitValidator.java b/java/com/google/gerrit/server/git/receive/BranchCommitValidator.java
index 7b5f90bd..55261223 100644
--- a/java/com/google/gerrit/server/git/receive/BranchCommitValidator.java
+++ b/java/com/google/gerrit/server/git/receive/BranchCommitValidator.java
@@ -37,7 +37,9 @@
import com.google.inject.Inject;
import com.google.inject.assistedinject.Assisted;
import java.io.IOException;
+import org.eclipse.jgit.lib.Config;
import org.eclipse.jgit.lib.ObjectReader;
+import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.notes.NoteMap;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.transport.ReceiveCommand;
@@ -94,6 +96,7 @@
/**
* Validates a single commit. If the commit does not validate, the command is rejected.
*
+ * @param repository the repository
* @param objectReader the object reader to use.
* @param cmd the ReceiveCommand executing the push.
* @param commit the commit being validated.
@@ -102,6 +105,7 @@
* @return The validation {@link Result}.
*/
Result validateCommit(
+ Repository repository,
ObjectReader objectReader,
ReceiveCommand cmd,
RevCommit commit,
@@ -109,12 +113,14 @@
NoteMap rejectCommits,
@Nullable Change change)
throws IOException {
- return validateCommit(objectReader, cmd, commit, isMerged, rejectCommits, change, false);
+ return validateCommit(
+ repository, objectReader, cmd, commit, isMerged, rejectCommits, change, false);
}
/**
* Validates a single commit. If the commit does not validate, the command is rejected.
*
+ * @param repository the repository
* @param objectReader the object reader to use.
* @param cmd the ReceiveCommand executing the push.
* @param commit the commit being validated.
@@ -124,6 +130,7 @@
* @return The validation {@link Result}.
*/
Result validateCommit(
+ Repository repository,
ObjectReader objectReader,
ReceiveCommand cmd,
RevCommit commit,
@@ -135,7 +142,14 @@
try (TraceTimer traceTimer = TraceContext.newTimer("BranchCommitValidator#validateCommit")) {
ImmutableList.Builder<CommitValidationMessage> messages = new ImmutableList.Builder<>();
try (CommitReceivedEvent receiveEvent =
- new CommitReceivedEvent(cmd, project, branch.branch(), objectReader, commit, user)) {
+ new CommitReceivedEvent(
+ cmd,
+ project,
+ branch.branch(),
+ new Config(repository.getConfig()),
+ objectReader,
+ commit,
+ user)) {
CommitValidators validators;
if (isMerged) {
validators =
diff --git a/java/com/google/gerrit/server/git/receive/ReceiveCommits.java b/java/com/google/gerrit/server/git/receive/ReceiveCommits.java
index 69db066..246c697 100644
--- a/java/com/google/gerrit/server/git/receive/ReceiveCommits.java
+++ b/java/com/google/gerrit/server/git/receive/ReceiveCommits.java
@@ -2212,6 +2212,7 @@
BranchCommitValidator.Result validationResult =
validator.validateCommit(
+ repo,
receivePack.getRevWalk().getObjectReader(),
magicBranch.cmd,
c,
@@ -3231,7 +3232,7 @@
BranchCommitValidator.Result validationResult =
validator.validateCommit(
- walk.getObjectReader(), cmd, c, false, rejectCommits, null, skipValidation);
+ repo, walk.getObjectReader(), cmd, c, false, rejectCommits, null, skipValidation);
messages.addAll(validationResult.messages());
if (!validationResult.isValid()) {
break;
