opendev/gerrit
Code Issues Proposed changes

Merge "Don't enforce maximum number of files on direct pushes"

Browse Source
This commit is contained in:
Patrick Hiesel
2020-03-25 16:08:51 +00:00
committed by Gerrit Code Review
parent 813951ffd4 6c21ad0fc0
commit c83cd676ff
2 changed files with 30 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
java/com/google/gerrit/server/git/validators/CommitValidators.java
View File

@@ -403,6 +403,17 @@ public class CommitValidators {
@Override
public List<CommitValidationMessage> onCommitReceived(CommitReceivedEvent receiveEvent)
throws CommitValidationException {
// TODO(zieren): Refactor interface to signal the intent of the event instead of hard-coding
// it here. Due to interface limitations, this method is called from both receive commits
// and from main Gerrit (e.g. when publishing a change edit). This is why we need to gate the
// early return on REFS_CHANGES (though pushes to refs/changes are not possible).
String refName = receiveEvent.command.getRefName();
if (!refName.startsWith("refs/for/") && !refName.startsWith(RefNames.REFS_CHANGES)) {
// This is a direct push bypassing review. We don't need to enforce any file-count limits
// here.
return Collections.emptyList();
}
PatchListKey patchListKey =
PatchListKey.againstBase(
receiveEvent.commit.getId(), receiveEvent.commit.getParentCount());

19
javatests/com/google/gerrit/acceptance/git/RefOperationValidationIT.java
View File

@@ -29,6 +29,7 @@ import com.google.gerrit.acceptance.AbstractDaemonTest;
import com.google.gerrit.acceptance.ExtensionRegistry;
import com.google.gerrit.acceptance.ExtensionRegistry.Registration;
import com.google.gerrit.acceptance.PushOneCommit;
import com.google.gerrit.acceptance.config.GerritConfig;
import com.google.gerrit.acceptance.testsuite.project.ProjectOperations;
import com.google.gerrit.common.data.Permission;
import com.google.gerrit.extensions.api.projects.BranchInput;
@@ -206,4 +207,22 @@ public class RefOperationValidationIT extends AbstractDaemonTest {
r4.assertErrorStatus(UPDATE_NONFASTFORWARD.name());
}
}
@Test
@GerritConfig(name = "change.maxFiles", value = "0")
public void dontEnforceFileCountForDirectPushes() throws Exception {
PushOneCommit push =
pushFactory.create(admin.newIdent(), testRepo, "change", "c.txt", "content");
PushOneCommit.Result result = push.to("refs/heads/master");
result.assertOkStatus();
}
@Test
@GerritConfig(name = "change.maxFiles", value = "0")
public void enforceFileCountLimitOnPushesForReview() throws Exception {
PushOneCommit push =
pushFactory.create(admin.newIdent(), testRepo, "change", "c.txt", "content");
PushOneCommit.Result result = push.to("refs/for/master");
result.assertErrorStatus("Exceeding maximum number of files per change");
}
}