diff options
author | Jukka Jokiniva <jukka.jokiniva@qt.io> | 2019-06-12 08:57:22 +0300 |
---|---|---|
committer | Jukka Jokiniva <jukka.jokiniva@qt.io> | 2019-06-12 10:58:13 +0000 |
commit | 35e278e9a75ae30cc8779f8cb65265a05a301ecf (patch) | |
tree | 4061f103cb492feefe64cc8ff22d84f30e0096a8 | |
parent | 35021ebfa0e0a608d58704510bbffbcd88559706 (diff) |
Build comments should only be added to staged changes
Fixes: QTQAINFRA-3045
Change-Id: I2493f3b1768e6ce2d6933a4a6f897bc823810432
Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
-rw-r--r-- | src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandNewBuild.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandNewBuild.java b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandNewBuild.java index 9068155..f26131b 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandNewBuild.java +++ b/src/main/java/com/googlesource/gerrit/plugins/qtcodereview/QtCommandNewBuild.java @@ -132,9 +132,14 @@ class QtCommandNewBuild extends SshCommand { try (BatchUpdate u = updateFactory.create(dbProvider.get(), projectKey, user, TimeUtil.nowTs())) { for (Entry<ChangeData, RevCommit> item: openChanges) { Change change = item.getKey().change(); - logger.atInfo().log("qtcodereview: staging-new-build inserted change %s (%s) into build %s for %s", - change, item.getValue().toString(), build, destinationKey); - u.addOp(change.getId(), op); + if (change.getStatus() == Change.Status.STAGED) { + logger.atInfo().log("qtcodereview: staging-new-build inserted change %s (%s) into build %s for %s", + change, item.getValue().toString(), build, destinationKey); + u.addOp(change.getId(), op); + } else { + logger.atInfo().log("qtcodereview: staging-new-build change %s (%s) is included in build %s for %s", + change, item.getValue().toString(), build, destinationKey); + } } u.execute(); } |