diff options
| author | Ismo Haataja <ismo.haataja@digia.com> | 2014-08-14 13:44:49 +0300 |
|---|---|---|
| committer | Ismo Haataja <ismo.haataja@digia.com> | 2014-10-15 08:49:47 +0200 |
| commit | 5cf3a81674e590e7a5134d3290a6d0a27ffee547 (patch) | |
| tree | 490f0eed0b34bbf03c0bd5a0bb02ccc167094d30 | |
| parent | 2f6d90dc0ba7853d32a902dbaf92e69ba133c2b1 (diff) | |
For a change in CI state, prevent pushing a new patch set
Check the state of a change during push and reject a new patch set
if a change is in one of CI states (STAGING, STAGED or INTEGRATING).
Task-number: QTQAINFRA-881
Change-Id: Iae73059f6378c45455373d071c107a30950fc3ee
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Ismo Haataja <ismo.haataja@digia.com>
| -rw-r--r-- | gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java index 220a0f7939..fd63c118c6 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java @@ -1741,6 +1741,9 @@ public class ReceiveCommits { } else if (change.getStatus().isClosed()) { reject(inputCommand, "change " + ontoChange + " closed"); return false; + } else if (change.getStatus().isCI()) { + reject(inputCommand, "change " + ontoChange + " currently integrating"); + return false; } else if (revisions.containsKey(newCommit)) { reject(inputCommand, "commit already exists"); return false; |