commit 44c560d103909dd761c4223822990fd0ca8acdac
author Edwin Kempin <edwin.kempin@sap.com> Wed Apr 15 14:25:23 2015 +0200
committer Gerrit Code Review <gerrit@git.wdf.sap.corp> Wed Apr 15 14:25:23 2015 +0200
tree ec54ec47afd2398ee655b74c4e941f60cd14bfa3
parent be3f1c66f385903210b135b0e1ddf31f6a6ba70c
parent 4d620ed50e6d5dd3106d36e7ef6a48664c4036db

Merge "Improve warning on missing label"

src/main/java/com/googlesource/gerrit/plugins/importer/ReplayChangesStep.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/importer/ReplayChangesStep.java b/src/main/java/com/googlesource/gerrit/plugins/importer/ReplayChangesStep.java
index dcb2ceb..c7d058f 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/importer/ReplayChangesStep.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/importer/ReplayChangesStep.java
@@ -17,6 +17,7 @@
 import com.google.common.collect.Iterators;
 import com.google.gerrit.common.Nullable;
 import com.google.gerrit.common.errors.NoSuchAccountException;
+import com.google.gerrit.extensions.annotations.PluginName;
 import com.google.gerrit.extensions.client.ChangeStatus;
 import com.google.gerrit.extensions.common.ChangeInfo;
 import com.google.gerrit.extensions.restapi.BadRequestException;
@@ -64,6 +65,7 @@
 
   private static Logger log = LoggerFactory.getLogger(ReplayChangesStep.class);
 
+  private final String pluginName;
   private final ReplayRevisionsStep.Factory replayRevisionsFactory;
   private final ReplayInlineCommentsStep.Factory replayInlineCommentsFactory;
   private final ReplayMessagesStep.Factory replayMessagesFactory;
@@ -86,6 +88,7 @@
 
   @Inject
   ReplayChangesStep(
+      @PluginName String pluginName,
       ReplayRevisionsStep.Factory replayRevisionsFactory,
       ReplayInlineCommentsStep.Factory replayInlineCommentsFactory,
       ReplayMessagesStep.Factory replayMessagesFactory,
@@ -105,6 +108,7 @@
       @Assisted("resume") boolean resume,
       @Assisted ResumeImportStatistic importStatistic,
       @Assisted ProgressMonitor pm) {
+    this.pluginName = pluginName;
     this.replayRevisionsFactory = replayRevisionsFactory;
     this.replayInlineCommentsFactory = replayInlineCommentsFactory;
     this.replayMessagesFactory = replayMessagesFactory;
@@ -170,6 +174,13 @@
         return;
       }
     }
+
+    if (c.revisions.isEmpty()) {
+      log.warn(String.format("[%s] Change %s has no revisions.",
+          pluginName, c.id));
+      return;
+    }
+
     replayRevisionsFactory.create(repo, rw, change, c).replay(api);
     upsertChange(resumeChange, change, c);