Staging-ls command should not return already merged changes

Merges can bring in changes into staging and build refs that have
already been merged. These should not be returned by the
staging-ls command.

Fixes: QTQAINFRA-3040
Change-Id: Ib007c95acf9e06e9b1e2615c9e5ed8954bb9dd12
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io>

1 files changed, 6 insertions, 2 deletions

diff --git a/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandListStaging.java b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandListStaging.java
index 9ee4dee..5ae07ed 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandListStaging.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandListStaging.java
@@ -89,8 +89,12 @@ class QtCommandListStaging extends SshCommand {
 
             for (Entry<ChangeData, RevCommit> item : open) {
                 final Change change = item.getKey().change();
-                final RevCommit commit = item.getValue();
-                stdout.println(commit.name() + " " + change.currentPatchSetId() + " " + change.getSubject());
+                final Change.Status status = change.getStatus();
+
+                if (status == Change.Status.STAGED || status == Change.Status.INTEGRATING) {
+                    final RevCommit commit = item.getValue();
+                    stdout.println(commit.name() + " " + change.currentPatchSetId() + " " + change.getSubject());
+                }
             }
 
             logger.atInfo().log("qtcodereview: staging-ls done");