From 35e278e9a75ae30cc8779f8cb65265a05a301ecf Mon Sep 17 00:00:00 2001 From: Jukka Jokiniva Date: Wed, 12 Jun 2019 08:57:22 +0300 Subject: Build comments should only be added to staged changes Fixes: QTQAINFRA-3045 Change-Id: I2493f3b1768e6ce2d6933a4a6f897bc823810432 Reviewed-by: Kari Oikarinen Reviewed-by: Paul Wicking --- .../gerrit/plugins/qtcodereview/QtCommandNewBuild.java | 11 ++++++++--- 1 file 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 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(); } -- cgit v1.2.3