opendev/gerrit
Code Issues Proposed changes

Merge "Remove duplicate retrieving patchset code in editCommitMessage()"

Browse Source
This commit is contained in:
David Pursehouse
2013-03-06 02:06:31 +00:00
committed by Gerrit Code Review
parent 3eb666b742 c160b09d7e
commit 77c5235457
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -333,8 +333,8 @@ public class ChangeUtil {
MissingObjectException, IncorrectObjectTypeException, IOException,
InvalidChangeOperationException, PatchSetInfoNotAvailableException {
final Change.Id changeId = patchSetId.getParentKey();
final PatchSet patch = db.patchSets().get(patchSetId);
if (patch == null) {
final PatchSet originalPS = db.patchSets().get(patchSetId);
if (originalPS == null) {
throw new NoSuchChangeException(changeId);
}
@@ -345,7 +345,7 @@ public class ChangeUtil {
final RevWalk revWalk = new RevWalk(git);
try {
RevCommit commit =
revWalk.parseCommit(ObjectId.fromString(patch.getRevision().get()));
revWalk.parseCommit(ObjectId.fromString(originalPS.getRevision().get()));
if (commit.getFullMessage().equals(message)) {
throw new InvalidChangeOperationException("New commit message cannot be same as existing commit message");
}
@@ -372,7 +372,6 @@ public class ChangeUtil {
oi.release();
}
final PatchSet originalPS = db.patchSets().get(patchSetId);
PatchSet.Id id = nextPatchSetId(git, change.currentPatchSetId());
final PatchSet newPatchSet = new PatchSet(id);
newPatchSet.setCreatedOn(new Timestamp(now.getTime()));