opendev/gerrit
Code Issues Proposed changes

Merge "PutMessage: automatically add Change-Id if requireChangeId is set"

Browse Source
This commit is contained in:
David Pursehouse
2019-07-31 04:24:08 +00:00
committed by Gerrit Code Review
parent 9b3cfd8985 098580abf2
commit 007190cde7
3 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
java/com/google/gerrit/server/restapi/change/PutMessage.java
View File

@@ -111,10 +111,13 @@ public class PutMessage
String sanitizedCommitMessage = CommitMessageUtil.checkAndSanitizeCommitMessage(input.message);
ensureCanEditCommitMessage(resource.getNotes());
ensureChangeIdIsCorrect(
projectCache.checkedGet(resource.getProject()).is(BooleanProjectConfig.REQUIRE_CHANGE_ID),
resource.getChange().getKey().get(),
sanitizedCommitMessage);
sanitizedCommitMessage =
ensureChangeIdIsCorrect(
projectCache
.checkedGet(resource.getProject())
.is(BooleanProjectConfig.REQUIRE_CHANGE_ID),
resource.getChange().getKey().get(),
sanitizedCommitMessage);
try (Repository repository = repositoryManager.openRepository(resource.getProject());
RevWalk revWalk = new RevWalk(repository);
@@ -193,7 +196,7 @@ public class PutMessage
}
}
private static void ensureChangeIdIsCorrect(
private static String ensureChangeIdIsCorrect(
boolean requireChangeId, String currentChangeId, String newCommitMessage)
throws ResourceConflictException, BadRequestException {
RevCommit revCommit =
@@ -204,14 +207,21 @@ public class PutMessage
CommitMessageUtil.checkAndSanitizeCommitMessage(revCommit.getShortMessage());
List<String> changeIdFooters = revCommit.getFooterLines(FooterConstants.CHANGE_ID);
if (requireChangeId && changeIdFooters.isEmpty()) {
throw new ResourceConflictException("missing Change-Id footer");
}
if (!changeIdFooters.isEmpty() && !changeIdFooters.get(0).equals(currentChangeId)) {
throw new ResourceConflictException("wrong Change-Id footer");
}
if (changeIdFooters.size() > 1) {
if (requireChangeId && revCommit.getFooterLines().isEmpty()) {
// sanitization always adds '\n' at the end.
newCommitMessage += "\n";
}
if (requireChangeId && changeIdFooters.isEmpty()) {
newCommitMessage += FooterConstants.CHANGE_ID.getName() + ": " + currentChangeId + "\n";
} else if (changeIdFooters.size() > 1) {
throw new ResourceConflictException("multiple Change-Id footers");
}
return newCommitMessage;
}
}