commit 78f495d1146366a50f7a8693695e45a7ad272b9e
author Manu Cupcic <cupcicm@gmail.com> Wed Sep 10 16:55:51 2014 +0000
committer Manu Cupcic <cupcicm@gmail.com> Wed Sep 10 16:57:34 2014 +0000
tree 612ee257b366656ae875be9f04a38274d000726f
parent f295c4ba0f7e465dca052dc105cf62787ec17331

[Refactor] Makes the merge strategy a bit clearer.

And fixes a bug when a review was mergeable but another one was not
submittable yet.

src/main/java/com/criteo/gerrit/plugins/automerge/AutomaticMerger.java

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 1b5f1c1..9c519b5 100644
--- a/src/main/java/com/criteo/gerrit/plugins/automerge/AutomaticMerger.java
+++ b/src/main/java/com/criteo/gerrit/plugins/automerge/AutomaticMerger.java
@@ -144,26 +144,26 @@
     } else {
       related.add(api.changes().id(change.id).get(EnumSet.of(ListChangesOption.CURRENT_REVISION)));
     }
+    boolean submittable = true;
     boolean mergeable = true;
-    boolean approvedButNotMergeable = false;
     for (final ChangeInfo info : related) {
       api.changes().id(change.id).get(EnumSet.of(ListChangesOption.CURRENT_REVISION));
       if (!info.mergeable) {
         mergeable = false;
-        approvedButNotMergeable = true;
       }
       if (!atomicityHelper.isSubmittable(info._number)) {
-        mergeable = false;
+        submittable = false;
       }
     }
     final int reviewNumber = Integer.parseInt(change.number);
-    if (mergeable) {
-      log.debug(String.format("Change %d is mergeable", reviewNumber));
-      for (final ChangeInfo info : related) {
-        atomicityHelper.mergeReview(info);
-      }
-    } else {
-      if (approvedButNotMergeable) {
+
+    if (submittable) {
+      if (mergeable) {
+        log.debug(String.format("Change %d is mergeable", reviewNumber));
+        for (final ChangeInfo info : related) {
+          atomicityHelper.mergeReview(info);
+        }
+      } else {
         reviewUpdater.commentOnReview(reviewNumber, AutomergeConfig.CANT_MERGE_COMMENT_FILE);
       }
     }