opendev/gerrit
Code Issues Proposed changes

Display a more verbose "you are not author/committer" message

Browse Source 
Make this all too common error messages easier to
understand, debug, and fix.

Issue: 909
Change-Id: Ie8c322b4fe42a1d3ff06e4dcc6f143f322383611
Signed-off-by: Shawn O. Pearce <sop@google.com>
This commit is contained in:
Shawn O. Pearce 2011-04-20 17:41:09 -07:00
parent f17c2d9221
commit ed2d1b16ce
1 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1563,7 +1563,8 @@ public class ReceiveCommits implements PreReceiveHook, PostReceiveHook {
// //
if (!currentUser.getEmailAddresses().contains(author.getEmailAddress()) if (!currentUser.getEmailAddresses().contains(author.getEmailAddress())
&& !ctl.canForgeAuthor()) { && !ctl.canForgeAuthor()) {
reject(cmd, "you are not author " + author.getEmailAddress()); sendInvalidEmailError(c, "author", author);
reject(cmd, "invalid author");
return false; return false;
} }
@ -1571,7 +1572,8 @@ public class ReceiveCommits implements PreReceiveHook, PostReceiveHook {
// //
if (!currentUser.getEmailAddresses().contains(committer.getEmailAddress()) if (!currentUser.getEmailAddresses().contains(committer.getEmailAddress())
&& !ctl.canForgeCommitter()) { && !ctl.canForgeCommitter()) {
reject(cmd, "you are not committer " + committer.getEmailAddress()); sendInvalidEmailError(c, "committer", committer);
reject(cmd, "invalid committer");
return false; return false;
} }
@ -1622,6 +1624,30 @@ public class ReceiveCommits implements PreReceiveHook, PostReceiveHook {
return true; return true;
} }
private void sendInvalidEmailError(RevCommit c, String type, PersonIdent who) {
StringBuilder sb = new StringBuilder();
sb.append("\n");
sb.append("ERROR: In commit " + c.name() + "\n");
sb.append("ERROR: " + type + " email address " + who.getEmailAddress() + "\n");
sb.append("ERROR: does not match your user account.\n");
sb.append("ERROR:\n");
if (currentUser.getEmailAddresses().isEmpty()) {
sb.append("ERROR: You have not registered any email addresses.\n");
} else {
sb.append("ERROR: The following addresses are currently registered:\n");
for (String address : currentUser.getEmailAddresses()) {
sb.append("ERROR: " + address + "\n");
}
}
sb.append("ERROR:\n");
if (canonicalWebUrl != null) {
sb.append("ERROR: To register an email address, please visit:\n");
sb.append("ERROR: " + canonicalWebUrl + "#" + PageLinks.SETTINGS_CONTACT + "\n");
}
sb.append("\n");
getReceivePack().sendMessage(sb.toString());
}
private void warnMalformedMessage(RevCommit c) { private void warnMalformedMessage(RevCommit c) {
ObjectReader reader = rp.getRevWalk().getObjectReader(); ObjectReader reader = rp.getRevWalk().getObjectReader();
if (65 < c.getShortMessage().length()) { if (65 < c.getShortMessage().length()) {