opendev/gerrit
Code Issues Proposed changes

Don't reuse ALREADY_MERGED for an identical tree

Browse Source 
ALREADY_MERGED now means the change is already reachable from the
branch tip. This is different from the case where we catch
MergeIdenticalTreeException, which indicates the change was marked as
merged despite not actually appearing in the commit history.

Distinguish between these cases by using a newer, more descriptive
CommitMergeStatus. Add a test for this case, fixing an
IllegalStateException found in the process.

Change-Id: I842e579d12ce745b2bc84dfd93a9f5b7213c71a8
This commit is contained in:
Dave Borowitz
2016-02-09 09:45:57 -05:00
parent 0502b8a986
commit 57d09a2fac
5 changed files with 38 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/SubmitByCherryPickIT.java
View File

@@ -30,6 +30,7 @@ import com.google.gerrit.extensions.restapi.ResourceConflictException;
import com.google.gerrit.reviewdb.client.Change;
import com.google.gerrit.reviewdb.client.PatchSet;
import com.google.gerrit.server.change.Submit.TestSubmitInput;
import com.google.gerrit.server.git.strategy.CommitMergeStatus;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.Repository;
@@ -268,6 +269,31 @@ public class SubmitByCherryPickIT extends AbstractSubmit {
assertNew(change3.getChangeId());
}
@Test
@TestProjectInput(useContentMerge = InheritableBoolean.TRUE)
public void submitIdenticalTree() throws Exception {
RevCommit initialHead = getRemoteHead();
PushOneCommit.Result change1 = createChange("Change 1", "a.txt", "a");
testRepo.reset(initialHead);
PushOneCommit.Result change2 = createChange("Change 2", "a.txt", "a");
submit(change1.getChangeId());
RevCommit oldHead = getRemoteHead();
assertThat(oldHead.getShortMessage()).isEqualTo("Change 1");
// Don't check merge result, since ref isn't updated.
submit(change2.getChangeId(), new SubmitInput(), null, null, false);
assertThat(getRemoteHead()).isEqualTo(oldHead);
ChangeInfo info2 = get(change2.getChangeId());
assertThat(info2.status).isEqualTo(ChangeStatus.MERGED);
assertThat(Iterables.getLast(info2.messages).message)
.isEqualTo(CommitMergeStatus.SKIPPED_IDENTICAL_TREE.getMessage());
}
@Test
public void repairChangeStateAfterFailure() throws Exception {
RevCommit initialHead = getRemoteHead();