[Bug fix] bot must not Code-review -2
We replace Code-review -2 by -1 as we don't want the -2 to stay forever.
The -1 will just be a warning that will disappear when there is a new patch set.
Anyway, the presubmit will fail thanks to devtools-cli. So we can't have Verified +1.
diff --git a/src/main/java/com/criteo/gerrit/plugins/automerge/AutomaticMerger.java b/src/main/java/com/criteo/gerrit/plugins/automerge/AutomaticMerger.java
index 2f6928b..c798186 100644
--- a/src/main/java/com/criteo/gerrit/plugins/automerge/AutomaticMerger.java
+++ b/src/main/java/com/criteo/gerrit/plugins/automerge/AutomaticMerger.java
@@ -168,9 +168,9 @@
try {
checkReviewExists(reviewNumber);
if (atomicityHelper.hasDependentReview(reviewNumber)) {
- log.info(String.format("Setting -2 on change %d, other atomic changes exists on the same repository.",
+ log.info(String.format("Warn the user by setting -1 on change %d, as other atomic changes exists on the same repository.",
reviewNumber));
- reviewUpdater.setMinusTwo(reviewNumber, AutomergeConfig.ATOMIC_REVIEWS_SAME_REPO_FILE);
+ reviewUpdater.setMinusOne(reviewNumber, AutomergeConfig.ATOMIC_REVIEWS_SAME_REPO_FILE);
} else {
log.info(String.format("Detected atomic review on change %d.", reviewNumber));
reviewUpdater.commentOnReview(reviewNumber, AutomergeConfig.ATOMIC_REVIEW_DETECTED_FILE);
diff --git a/src/main/java/com/criteo/gerrit/plugins/automerge/ReviewUpdater.java b/src/main/java/com/criteo/gerrit/plugins/automerge/ReviewUpdater.java
index 930342a..1ecdeb9 100644
--- a/src/main/java/com/criteo/gerrit/plugins/automerge/ReviewUpdater.java
+++ b/src/main/java/com/criteo/gerrit/plugins/automerge/ReviewUpdater.java
@@ -55,9 +55,9 @@
}
}
- public void setMinusTwo(final int number, final String commentTemplate) throws RestApiException, OrmException, IOException, NoSuchChangeException {
+ public void setMinusOne(final int number, final String commentTemplate) throws RestApiException, OrmException, IOException, NoSuchChangeException {
final ReviewInput message = createCrossrepoComment(commentTemplate);
- message.label("Code-Review", -2);
+ message.label("Code-Review", -1);
final RevisionResource r = atomicityHelper.getRevisionResource(number);
reviewer.get().apply(r, message);
}
