opendev/gerrit
Code Issues Proposed changes

fix error message returned on push to closed change

Browse Source 
If a commit was pushed to Gerrit which contained
the Change-Id of a closed change in its commit
message the push was failing with 'No new changes'
and not as expected with "Change ... closed". This
fix ensures that in this case now the correct
error message is returned.

Signed-off-by: Edwin Kempin <edwin.kempin@gmail.com>
This commit is contained in:
Edwin Kempin
2010-12-28 08:59:42 +01:00
parent 4b706ff6cf
commit 6a4d918b29
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gerrit-server/src/main/java/com/google/gerrit/server/git/ReceiveCommits.java
View File

@@ -781,25 +781,26 @@ public class ReceiveCommits implements PreReceiveHook, PostReceiveHook {
requestReplace(cmd, changeEnt, newCommit);
}
private void requestReplace(final ReceiveCommand cmd, final Change change,
private boolean requestReplace(final ReceiveCommand cmd, final Change change,
final RevCommit newCommit) {
if (change.getStatus().isClosed()) {
reject(cmd, "change " + change.getId() + " closed");
return;
return false;
}
final ReplaceRequest req =
new ReplaceRequest(change.getId(), newCommit, cmd);
if (replaceByChange.containsKey(req.ontoChange)) {
reject(cmd, "duplicate request");
return;
return false;
}
if (replaceByCommit.containsKey(req.newCommit)) {
reject(cmd, "duplicate request");
return;
return false;
}
replaceByChange.put(req.ontoChange, req);
replaceByCommit.put(req.newCommit, req);
return true;
}
private void createNewChanges() {
@@ -854,8 +855,11 @@ public class ReceiveCommits implements PreReceiveHook, PostReceiveHook {
if (changes.size() == 1) {
// Schedule as a replacement to this one matching change.
//
requestReplace(newChange, changes.get(0), c);
continue;
if (requestReplace(newChange, changes.get(0), c)) {
continue;
} else {
return;
}
}
}