Remove maxAutomergeVote.
It's unnecessary and interacts poorly with minAutomergeVote when
contextUser is set.
Change-Id: I7cb8c38fe83e018bbb3d3bf2969a5883fcf95fbf
diff --git a/src/main/java/com/googlesource/gerrit/plugins/automerger/ConfigLoader.java b/src/main/java/com/googlesource/gerrit/plugins/automerger/ConfigLoader.java
index 618385b..fc918a4 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/automerger/ConfigLoader.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/automerger/ConfigLoader.java
@@ -240,18 +240,10 @@
return message;
}
- public short getMaxAutomergeVote() throws ConfigInvalidException {
- return (short) getConfig().getInt("global", "maxAutomergeVote", 2);
- }
-
public short getMinAutomergeVote() throws ConfigInvalidException {
return (short) getConfig().getInt("global", "minAutomergeVote", -2);
}
- public boolean maxAutomergeVoteDisabled() throws ConfigInvalidException {
- return getConfig().getBoolean("global", "disableMaxAutomergeVote", false);
- }
-
public boolean minAutomergeVoteDisabled() throws ConfigInvalidException {
return getConfig().getBoolean("global", "disableMinAutomergeVote", false);
}
diff --git a/src/main/java/com/googlesource/gerrit/plugins/automerger/DownstreamCreator.java b/src/main/java/com/googlesource/gerrit/plugins/automerger/DownstreamCreator.java
index 0fbde41..f3def07 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/automerger/DownstreamCreator.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/automerger/DownstreamCreator.java
@@ -529,13 +529,7 @@
sdsMergeInput.downstreamBranch);
}
- ChangeApi downstreamChange = gApi.changes().create(downstreamChangeInput);
-
- // Vote maxAutomergeVote on the change so we know it was successful.
- if (!config.maxAutomergeVoteDisabled()) {
- updateVote(
- downstreamChange.get(), config.getAutomergeLabel(), config.getMaxAutomergeVote());
- }
+ gApi.changes().create(downstreamChangeInput);
}
}
@@ -685,7 +679,7 @@
private void updateDownstreamMerge(
String newParentRevision, String upstreamSubject, Integer sourceNum, boolean doMerge)
- throws RestApiException, ConfigInvalidException {
+ throws RestApiException {
MergeInput mergeInput = new MergeInput();
mergeInput.source = newParentRevision;
@@ -709,10 +703,7 @@
originalChange.restore(restoreInput);
}
- ChangeInfo downstreamChange = originalChange.createMergePatchSet(mergePatchSetInput);
- if (!config.maxAutomergeVoteDisabled()) {
- updateVote(downstreamChange, config.getAutomergeLabel(), config.getMaxAutomergeVote());
- }
+ originalChange.createMergePatchSet(mergePatchSetInput);
}
private String getPreviousRevision(ChangeApi change, int currentPatchSetNumber)
diff --git a/src/main/resources/Documentation/config.md b/src/main/resources/Documentation/config.md
index d4b0a38..a1752b1 100644
--- a/src/main/resources/Documentation/config.md
+++ b/src/main/resources/Documentation/config.md
@@ -31,16 +31,6 @@
When the automerger detects a merge conflict from one branch to another, it
will vote minAutomergeVote on this label.
-global.maxAutomergeVote
-: Value to vote on a successful automerge.
-
- When the automerger succeeds in merging downstream, it will vote
- maxAutomergeVote on the downstream change. The original change uploaded by
- the user will have a vote of 0, so that it can be easily programatically
- distinguished from the otheres.
-
- Will not vote if disableMaxAutomergeVote is true.
-
global.minAutomergeVote
: Value to vote on a failed automerge.
@@ -49,12 +39,6 @@
Will not vote if disableMinAutomergeVote is true.
-global.disableMaxAutomergeVote
-: Whether to vote on a successful automerge.
-
- If true, will not vote maxAutomergeVote on a successful downstream merge.
- Defaults to false.
-
global.disableMinAutomergeVote
: Whether to vote on a failed automerge.
diff --git a/src/test/java/com/googlesource/gerrit/plugins/automerger/ConfigLoaderIT.java b/src/test/java/com/googlesource/gerrit/plugins/automerger/ConfigLoaderIT.java
index 62e0019..ed17d57 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/automerger/ConfigLoaderIT.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/automerger/ConfigLoaderIT.java
@@ -204,30 +204,12 @@
}
@Test
- public void getMaxAutomergeVoteTest() throws Exception {
- defaultSetup("alternate.config");
- assertThat(configLoader.getMaxAutomergeVote()).isEqualTo(5);
- }
-
- @Test
public void getMinAutomergeVoteTest() throws Exception {
defaultSetup("alternate.config");
assertThat(configLoader.getMinAutomergeVote()).isEqualTo(-3);
}
@Test
- public void maxAutomergeVoteDisabledTest() throws Exception {
- defaultSetup("automerger.config");
- assertThat(configLoader.maxAutomergeVoteDisabled()).isFalse();
- }
-
- @Test
- public void maxAutomergeVoteDisabledTest_isDisabled() throws Exception {
- defaultSetup("alternate.config");
- assertThat(configLoader.maxAutomergeVoteDisabled()).isTrue();
- }
-
- @Test
public void minAutomergeVoteDisabledTest() throws Exception {
defaultSetup("automerger.config");
assertThat(configLoader.minAutomergeVoteDisabled()).isFalse();
diff --git a/src/test/resources/com/googlesource/gerrit/plugins/automerger/alternate.config b/src/test/resources/com/googlesource/gerrit/plugins/automerger/alternate.config
index ed3c829..19d69c1 100644
--- a/src/test/resources/com/googlesource/gerrit/plugins/automerger/alternate.config
+++ b/src/test/resources/com/googlesource/gerrit/plugins/automerger/alternate.config
@@ -12,9 +12,7 @@
blankMerge = .*DO NOT MERGE.*
manifestFile = default.xml
manifestProject = platform/manifest
- maxAutomergeVote = 5
minAutomergeVote = -3
- disableMaxAutomergeVote = true
ignoreProjects = platform/ignore/me
conflictMessage = line1\n\
line2\n\
diff --git a/src/test/resources/com/googlesource/gerrit/plugins/automerger/context_user.config b/src/test/resources/com/googlesource/gerrit/plugins/automerger/context_user.config
index aeb71d9..bb2d262 100644
--- a/src/test/resources/com/googlesource/gerrit/plugins/automerger/context_user.config
+++ b/src/test/resources/com/googlesource/gerrit/plugins/automerger/context_user.config
@@ -14,5 +14,4 @@
manifestFile = default.xml
manifestProject = platform/manifest
ignoreProjects = platform/ignore/me
- contextUserId = 102304
- disableMaxAutomergeVote = true
\ No newline at end of file
+ contextUserId = 102304
\ No newline at end of file
