opendev/gerrit
Code Issues Proposed changes

Always advance MergeTip during updateRepo

Browse Source 
Multiple batch update operations expect to see the results of
previous updates. In the case of inspecting the current MergeTip,
subsequent updateRepo calls expect to see the tip advancing. However,
this was not always done in updateRepo; in the rebase and cherry-pick
cases we were mistakenly delaying this until updateChange.

This resulted in a serious bug during RebaseIfNecessary, where commits
after the first one were all rebased onto the original branch tip
rather than following previous commits in the series. Worse, this case
was untested, so add a test for that.

Change-Id: Ib4f0a5667a8d2b7d37ca75b81368b24ef79374fb
This commit is contained in:
Dave Borowitz
2016-01-20 19:39:56 -05:00
parent 2a3b008abb
commit 694db8ebc9
4 changed files with 71 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/SubmitByRebaseIfNecessaryIT.java
View File

@@ -21,7 +21,10 @@ import com.google.gerrit.acceptance.TestProjectInput;
import com.google.gerrit.extensions.client.InheritableBoolean;
import com.google.gerrit.extensions.client.SubmitType;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevWalk;
import org.junit.Test;
public class SubmitByRebaseIfNecessaryIT extends AbstractSubmit {
@@ -71,6 +74,43 @@ public class SubmitByRebaseIfNecessaryIT extends AbstractSubmit {
assertPersonEquals(admin.getIdent(), head.getCommitterIdent());
}
@Test
public void submitWithRebaseMultipleChanges() throws Exception {
RevCommit initialHead = getRemoteHead();
PushOneCommit.Result change1 =
createChange("Change 1", "a.txt", "content");
submit(change1.getChangeId());
testRepo.reset(initialHead);
PushOneCommit.Result change2 =
createChange("Change 2", "b.txt", "other content");
assertThat(change2.getCommit().getParent(0))
.isNotEqualTo(change1.getCommit());
PushOneCommit.Result change3 =
createChange("Change 3", "c.txt", "third content");
approve(change2.getChangeId());
submit(change3.getChangeId());
assertRebase(testRepo, false);
assertApproved(change2.getChangeId());
assertApproved(change3.getChangeId());
RevCommit head = parse(getRemoteHead());
assertThat(head.getShortMessage()).isEqualTo("Change 3");
assertThat(head).isNotEqualTo(change3.getCommit());
assertCurrentRevision(change3.getChangeId(), 2, head);
RevCommit parent = parse(head.getParent(0));
assertThat(parent.getShortMessage()).isEqualTo("Change 2");
assertThat(parent).isNotEqualTo(change2.getCommit());
assertCurrentRevision(change2.getChangeId(), 2, parent);
RevCommit grandparent = parse(parent.getParent(0));
assertThat(grandparent).isEqualTo(change1.getCommit());
assertCurrentRevision(change1.getChangeId(), 1, grandparent);
}
@Test
@TestProjectInput(useContentMerge = InheritableBoolean.TRUE)
public void submitWithContentMerge() throws Exception {
@@ -113,4 +153,13 @@ public class SubmitByRebaseIfNecessaryIT extends AbstractSubmit {
assertCurrentRevision(change2.getChangeId(), 1, change2.getCommitId());
assertNoSubmitter(change2.getChangeId(), 1);
}
private RevCommit parse(ObjectId id) throws Exception {
try (Repository repo = repoManager.openRepository(project);
RevWalk rw = new RevWalk(repo)) {
RevCommit c = rw.parseCommit(id);
rw.parseBody(c);
return c;
}
}
}