opendev/gerrit
Code Issues Proposed changes

Fix: Reverting a change does not preserve the change's topic

Browse Source 
When reverting a change in the UI, set the revert change's topic
to the same as the change being reverted.

Bug: Issue 1664
Change-Id: I8d225a1ec1da759877846fd37fc3611ca17a4545
This commit is contained in:
David Pursehouse
2012-11-17 10:23:37 +09:00
parent cc02f8908e
commit 17c4d82955
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -190,10 +190,11 @@ public class ChangeUtil {
if (patch == null) { if (patch == null) {
throw new NoSuchChangeException(changeId); throw new NoSuchChangeException(changeId);
} }
final Change changeToRevert = db.changes().get(changeId);
final Repository git; final Repository git;
try { try {
git = gitManager.openRepository(db.changes().get(changeId).getProject()); git = gitManager.openRepository(changeToRevert.getProject());
} catch (RepositoryNotFoundException e) { } catch (RepositoryNotFoundException e) {
throw new NoSuchChangeException(changeId, e); throw new NoSuchChangeException(changeId, e);
} }
@@ -234,8 +235,9 @@ public class ChangeUtil {
new Change.Key("I" + computedChangeId.name()), new Change.Key("I" + computedChangeId.name()),
new Change.Id(db.nextChangeId()), new Change.Id(db.nextChangeId()),
user.getAccountId(), user.getAccountId(),
db.changes().get(changeId).getDest()); changeToRevert.getDest());
change.nextPatchSetId(); change.nextPatchSetId();
change.setTopic(changeToRevert.getTopic());
final PatchSet ps = new PatchSet(change.currPatchSetId()); final PatchSet ps = new PatchSet(change.currPatchSetId());
ps.setCreatedOn(change.getCreatedOn()); ps.setCreatedOn(change.getCreatedOn());