opendev/gerrit
Code Issues Proposed changes

Merge "Provide more informative error messages when rejecting updates"

Browse Source
This commit is contained in:
Shawn Pearce 2013-05-10 17:42:55 +00:00 committed by Gerrit Code Review
commit 2165ff661e
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1747,12 +1747,16 @@ public class ReceiveCommits {
eq(newCommit.getFullMessage(), priorCommit.getFullMessage()); eq(newCommit.getFullMessage(), priorCommit.getFullMessage());
final boolean parentsEq = parentsEqual(newCommit, priorCommit); final boolean parentsEq = parentsEqual(newCommit, priorCommit);
final boolean authorEq = authorEqual(newCommit, priorCommit); final boolean authorEq = authorEqual(newCommit, priorCommit);
final ObjectReader reader = rp.getRevWalk().getObjectReader();
if (messageEq && parentsEq && authorEq && !autoClose) { if (messageEq && parentsEq && authorEq && !autoClose) {
addMessage(String.format(
"(W) No changes between prior commit %s and new commit %s",
reader.abbreviate(priorCommit).name(),
reader.abbreviate(newCommit).name()));
reject(inputCommand, "no changes made"); reject(inputCommand, "no changes made");
return false; return false;
} else { } else {
ObjectReader reader = rp.getRevWalk().getObjectReader();
StringBuilder msg = new StringBuilder(); StringBuilder msg = new StringBuilder();
msg.append("(W) "); msg.append("(W) ");
msg.append(reader.abbreviate(newCommit).name()); msg.append(reader.abbreviate(newCommit).name());