opendev/gerrit
Code Issues Proposed changes

Merge "Insert Change-Id for revert commits"

Browse Source
This commit is contained in:
Saša Živkov
2012-07-16 01:57:35 -07:00
committed by gerrit code review
parent 91f4daede5 c0ff557078
commit 54288448fd
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gerrit-server/src/main/java/com/google/gerrit/server/ChangeUtil.java
View File

@@ -62,6 +62,7 @@ import org.eclipse.jgit.revwalk.FooterLine;
import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevWalk; import org.eclipse.jgit.revwalk.RevWalk;
import org.eclipse.jgit.util.Base64; import org.eclipse.jgit.util.Base64;
import org.eclipse.jgit.util.ChangeIdUtil;
import org.eclipse.jgit.util.NB; import org.eclipse.jgit.util.NB;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@@ -463,7 +464,11 @@ public class ChangeUtil {
revertCommit.setTreeId(parentToCommitToRevert.getTree()); revertCommit.setTreeId(parentToCommitToRevert.getTree());
revertCommit.setAuthor(authorIdent); revertCommit.setAuthor(authorIdent);
revertCommit.setCommitter(myIdent); revertCommit.setCommitter(myIdent);
revertCommit.setMessage(message);
final ObjectId computedChangeId =
ChangeIdUtil.computeChangeId(parentToCommitToRevert.getTree(),
commitToRevert, authorIdent, myIdent, message);
revertCommit.setMessage(ChangeIdUtil.insertId(message, computedChangeId, true));
final ObjectInserter oi = git.newObjectInserter();; final ObjectInserter oi = git.newObjectInserter();;
ObjectId id; ObjectId id;
@@ -474,7 +479,7 @@ public class ChangeUtil {
oi.release(); oi.release();
} }
Change.Key changeKey = new Change.Key("I" + id.name()); Change.Key changeKey = new Change.Key("I" + computedChangeId.name());
final Change change = final Change change =
new Change(changeKey, new Change.Id(db.nextChangeId()), new Change(changeKey, new Change.Id(db.nextChangeId()),
user.getAccountId(), db.changes().get(changeId).getDest()); user.getAccountId(), db.changes().get(changeId).getDest());