opendev/gerrit
Code Issues Proposed changes

CreateChange: move code for creating commit message to a method

Browse Source 
Change-Id: I3d55aa5efb5cfdc923e16f80680547b495e53c22
This commit is contained in:
Changcheng Xiao
2019-01-28 16:07:33 +01:00
parent 7d9a8ce557
commit 63dd3ef21c
1 changed files with 30 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
java/com/google/gerrit/server/restapi/change/CreateChange.java
View File

@@ -191,25 +191,7 @@ public class CreateChange
Timestamp now = TimeUtil.nowTs();
PersonIdent author = me.newCommitterIdent(now, serverTimeZone);
// Add a Change-Id line if there isn't already one
String commitMessage = input.subject;
if (ChangeIdUtil.indexOfChangeId(commitMessage, "\n") == -1) {
ObjectId treeId = mergeTip == null ? emptyTreeId(oi) : mergeTip.getTree();
ObjectId id = ChangeIdUtil.computeChangeId(treeId, mergeTip, author, author, commitMessage);
commitMessage = ChangeIdUtil.insertId(commitMessage, id);
}
if (Boolean.TRUE.equals(me.state().getGeneralPreferences().signedOffBy)) {
commitMessage =
Joiner.on("\n")
.join(
commitMessage.trim(),
String.format(
"%s%s",
SIGNED_OFF_BY_TAG,
me.state().getAccount().getNameEmail(anonymousCowardName)));
}
String commitMessage = getCommitMessage(input.subject, me, oi, mergeTip, author);
RevCommit c;
if (input.merge != null) {
@@ -391,6 +373,35 @@ public class CreateChange
return parentCommit;
}
private String getCommitMessage(
String subject,
IdentifiedUser me,
ObjectInserter objectInserter,
RevCommit mergeTip,
PersonIdent author)
throws IOException {
// Add a Change-Id line if there isn't already one
String commitMessage = subject;
if (ChangeIdUtil.indexOfChangeId(commitMessage, "\n") == -1) {
ObjectId treeId = mergeTip == null ? emptyTreeId(objectInserter) : mergeTip.getTree();
ObjectId id = ChangeIdUtil.computeChangeId(treeId, mergeTip, author, author, commitMessage);
commitMessage = ChangeIdUtil.insertId(commitMessage, id);
}
if (Boolean.TRUE.equals(me.state().getGeneralPreferences().signedOffBy)) {
commitMessage =
Joiner.on("\n")
.join(
commitMessage.trim(),
String.format(
"%s%s",
SIGNED_OFF_BY_TAG,
me.state().getAccount().getNameEmail(anonymousCowardName)));
}
return commitMessage;
}
private static RevCommit newCommit(
ObjectInserter oi,
RevWalk rw,