RebaseCommandTest: Open RevWalk in try-with-resource
Change-Id: If7b7a90171d1349d634a84f135471ebac29e3210 Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
This commit is contained in:
parent
7ccda5f63e
commit
92a8e0184c
|
@ -288,13 +288,14 @@ public void testRebaseShouldIgnoreMergeCommits()
|
|||
RebaseResult res = git.rebase().setUpstream("refs/heads/master").call();
|
||||
assertEquals(Status.OK, res.getStatus());
|
||||
|
||||
RevWalk rw = new RevWalk(db);
|
||||
rw.markStart(rw.parseCommit(db.resolve("refs/heads/topic")));
|
||||
assertDerivedFrom(rw.next(), e);
|
||||
assertDerivedFrom(rw.next(), d);
|
||||
assertDerivedFrom(rw.next(), c);
|
||||
assertEquals(b, rw.next());
|
||||
assertEquals(a, rw.next());
|
||||
try (RevWalk rw = new RevWalk(db)) {
|
||||
rw.markStart(rw.parseCommit(db.resolve("refs/heads/topic")));
|
||||
assertDerivedFrom(rw.next(), e);
|
||||
assertDerivedFrom(rw.next(), d);
|
||||
assertDerivedFrom(rw.next(), c);
|
||||
assertEquals(b, rw.next());
|
||||
assertEquals(a, rw.next());
|
||||
}
|
||||
|
||||
List<ReflogEntry> headLog = db.getReflogReader(Constants.HEAD)
|
||||
.getReverseEntries();
|
||||
|
@ -354,8 +355,6 @@ public void testRebasePreservingMerges2() throws Exception {
|
|||
*/
|
||||
private void doTestRebasePreservingMerges(boolean testConflict)
|
||||
throws Exception {
|
||||
RevWalk rw = new RevWalk(db);
|
||||
|
||||
// create file1 on master
|
||||
writeTrashFile(FILE1, FILE1);
|
||||
git.add().addFilepattern(FILE1).call();
|
||||
|
@ -409,7 +408,9 @@ private void doTestRebasePreservingMerges(boolean testConflict)
|
|||
f = git.commit().setMessage("commit f").call();
|
||||
} else {
|
||||
assertEquals(MergeStatus.MERGED, result.getMergeStatus());
|
||||
f = rw.parseCommit(result.getNewHead());
|
||||
try (RevWalk rw = new RevWalk(db)) {
|
||||
f = rw.parseCommit(result.getNewHead());
|
||||
}
|
||||
}
|
||||
|
||||
RebaseResult res = git.rebase().setUpstream("refs/heads/master")
|
||||
|
@ -453,23 +454,25 @@ private void doTestRebasePreservingMerges(boolean testConflict)
|
|||
assertEquals("file2", read("file2"));
|
||||
assertEquals("more change", read("file3"));
|
||||
|
||||
rw.markStart(rw.parseCommit(db.resolve("refs/heads/topic")));
|
||||
RevCommit newF = rw.next();
|
||||
assertDerivedFrom(newF, f);
|
||||
assertEquals(2, newF.getParentCount());
|
||||
RevCommit newD = rw.next();
|
||||
assertDerivedFrom(newD, d);
|
||||
if (testConflict)
|
||||
assertEquals("d new", readFile("conflict", newD));
|
||||
RevCommit newE = rw.next();
|
||||
assertDerivedFrom(newE, e);
|
||||
if (testConflict)
|
||||
assertEquals("e new", readFile("conflict", newE));
|
||||
assertEquals(newD, newF.getParent(0));
|
||||
assertEquals(newE, newF.getParent(1));
|
||||
assertDerivedFrom(rw.next(), c);
|
||||
assertEquals(b, rw.next());
|
||||
assertEquals(a, rw.next());
|
||||
try (RevWalk rw = new RevWalk(db)) {
|
||||
rw.markStart(rw.parseCommit(db.resolve("refs/heads/topic")));
|
||||
RevCommit newF = rw.next();
|
||||
assertDerivedFrom(newF, f);
|
||||
assertEquals(2, newF.getParentCount());
|
||||
RevCommit newD = rw.next();
|
||||
assertDerivedFrom(newD, d);
|
||||
if (testConflict)
|
||||
assertEquals("d new", readFile("conflict", newD));
|
||||
RevCommit newE = rw.next();
|
||||
assertDerivedFrom(newE, e);
|
||||
if (testConflict)
|
||||
assertEquals("e new", readFile("conflict", newE));
|
||||
assertEquals(newD, newF.getParent(0));
|
||||
assertEquals(newE, newF.getParent(1));
|
||||
assertDerivedFrom(rw.next(), c);
|
||||
assertEquals(b, rw.next());
|
||||
assertEquals(a, rw.next());
|
||||
}
|
||||
}
|
||||
|
||||
private String readFile(String path, RevCommit commit) throws IOException {
|
||||
|
@ -517,88 +520,89 @@ public void testRebasePreservingMergesWithUnrelatedSide2() throws Exception {
|
|||
*/
|
||||
private void doTestRebasePreservingMergesWithUnrelatedSide(
|
||||
boolean testConflict) throws Exception {
|
||||
RevWalk rw = new RevWalk(db);
|
||||
rw.sort(RevSort.TOPO);
|
||||
try (RevWalk rw = new RevWalk(db)) {
|
||||
rw.sort(RevSort.TOPO);
|
||||
|
||||
writeTrashFile(FILE1, FILE1);
|
||||
git.add().addFilepattern(FILE1).call();
|
||||
RevCommit a = git.commit().setMessage("commit a").call();
|
||||
writeTrashFile(FILE1, FILE1);
|
||||
git.add().addFilepattern(FILE1).call();
|
||||
RevCommit a = git.commit().setMessage("commit a").call();
|
||||
|
||||
writeTrashFile("file2", "blah");
|
||||
git.add().addFilepattern("file2").call();
|
||||
RevCommit b = git.commit().setMessage("commit b").call();
|
||||
writeTrashFile("file2", "blah");
|
||||
git.add().addFilepattern("file2").call();
|
||||
RevCommit b = git.commit().setMessage("commit b").call();
|
||||
|
||||
// create a topic branch
|
||||
createBranch(b, "refs/heads/topic");
|
||||
checkoutBranch("refs/heads/topic");
|
||||
// create a topic branch
|
||||
createBranch(b, "refs/heads/topic");
|
||||
checkoutBranch("refs/heads/topic");
|
||||
|
||||
writeTrashFile("file3", "more changess");
|
||||
writeTrashFile(FILE1, "preparing conflict");
|
||||
git.add().addFilepattern("file3").addFilepattern(FILE1).call();
|
||||
RevCommit c = git.commit().setMessage("commit c").call();
|
||||
writeTrashFile("file3", "more changess");
|
||||
writeTrashFile(FILE1, "preparing conflict");
|
||||
git.add().addFilepattern("file3").addFilepattern(FILE1).call();
|
||||
RevCommit c = git.commit().setMessage("commit c").call();
|
||||
|
||||
createBranch(a, "refs/heads/side");
|
||||
checkoutBranch("refs/heads/side");
|
||||
writeTrashFile("conflict", "e");
|
||||
writeTrashFile(FILE1, FILE1 + "\n" + "line 2");
|
||||
git.add().addFilepattern(".").call();
|
||||
RevCommit e = git.commit().setMessage("commit e").call();
|
||||
|
||||
// switch back to topic and merge in side, creating d
|
||||
checkoutBranch("refs/heads/topic");
|
||||
MergeResult result = git.merge().include(e)
|
||||
.setStrategy(MergeStrategy.RESOLVE).call();
|
||||
|
||||
assertEquals(MergeStatus.CONFLICTING, result.getMergeStatus());
|
||||
assertEquals(result.getConflicts().keySet(),
|
||||
Collections.singleton(FILE1));
|
||||
writeTrashFile(FILE1, "merge resolution");
|
||||
git.add().addFilepattern(FILE1).call();
|
||||
RevCommit d = git.commit().setMessage("commit d").call();
|
||||
|
||||
RevCommit f = commitFile("file2", "new content two", "topic");
|
||||
|
||||
checkoutBranch("refs/heads/master");
|
||||
writeTrashFile("fileg", "fileg");
|
||||
if (testConflict)
|
||||
writeTrashFile("conflict", "g");
|
||||
git.add().addFilepattern(".").call();
|
||||
RevCommit g = git.commit().setMessage("commit g").call();
|
||||
|
||||
checkoutBranch("refs/heads/topic");
|
||||
RebaseResult res = git.rebase().setUpstream("refs/heads/master")
|
||||
.setPreserveMerges(true).call();
|
||||
if (testConflict) {
|
||||
assertEquals(Status.STOPPED, res.getStatus());
|
||||
assertEquals(Collections.singleton("conflict"), git.status().call()
|
||||
.getConflicting());
|
||||
// resolve
|
||||
createBranch(a, "refs/heads/side");
|
||||
checkoutBranch("refs/heads/side");
|
||||
writeTrashFile("conflict", "e");
|
||||
git.add().addFilepattern("conflict").call();
|
||||
res = git.rebase().setOperation(Operation.CONTINUE).call();
|
||||
writeTrashFile(FILE1, FILE1 + "\n" + "line 2");
|
||||
git.add().addFilepattern(".").call();
|
||||
RevCommit e = git.commit().setMessage("commit e").call();
|
||||
|
||||
// switch back to topic and merge in side, creating d
|
||||
checkoutBranch("refs/heads/topic");
|
||||
MergeResult result = git.merge().include(e)
|
||||
.setStrategy(MergeStrategy.RESOLVE).call();
|
||||
|
||||
assertEquals(MergeStatus.CONFLICTING, result.getMergeStatus());
|
||||
assertEquals(result.getConflicts().keySet(),
|
||||
Collections.singleton(FILE1));
|
||||
writeTrashFile(FILE1, "merge resolution");
|
||||
git.add().addFilepattern(FILE1).call();
|
||||
RevCommit d = git.commit().setMessage("commit d").call();
|
||||
|
||||
RevCommit f = commitFile("file2", "new content two", "topic");
|
||||
|
||||
checkoutBranch("refs/heads/master");
|
||||
writeTrashFile("fileg", "fileg");
|
||||
if (testConflict)
|
||||
writeTrashFile("conflict", "g");
|
||||
git.add().addFilepattern(".").call();
|
||||
RevCommit g = git.commit().setMessage("commit g").call();
|
||||
|
||||
checkoutBranch("refs/heads/topic");
|
||||
RebaseResult res = git.rebase().setUpstream("refs/heads/master")
|
||||
.setPreserveMerges(true).call();
|
||||
if (testConflict) {
|
||||
assertEquals(Status.STOPPED, res.getStatus());
|
||||
assertEquals(Collections.singleton("conflict"), git.status().call()
|
||||
.getConflicting());
|
||||
// resolve
|
||||
writeTrashFile("conflict", "e");
|
||||
git.add().addFilepattern("conflict").call();
|
||||
res = git.rebase().setOperation(Operation.CONTINUE).call();
|
||||
}
|
||||
assertEquals(Status.OK, res.getStatus());
|
||||
|
||||
assertEquals("merge resolution", read(FILE1));
|
||||
assertEquals("new content two", read("file2"));
|
||||
assertEquals("more changess", read("file3"));
|
||||
assertEquals("fileg", read("fileg"));
|
||||
|
||||
rw.markStart(rw.parseCommit(db.resolve("refs/heads/topic")));
|
||||
RevCommit newF = rw.next();
|
||||
assertDerivedFrom(newF, f);
|
||||
RevCommit newD = rw.next();
|
||||
assertDerivedFrom(newD, d);
|
||||
assertEquals(2, newD.getParentCount());
|
||||
RevCommit newC = rw.next();
|
||||
assertDerivedFrom(newC, c);
|
||||
RevCommit newE = rw.next();
|
||||
assertEquals(e, newE);
|
||||
assertEquals(newC, newD.getParent(0));
|
||||
assertEquals(e, newD.getParent(1));
|
||||
assertEquals(g, rw.next());
|
||||
assertEquals(b, rw.next());
|
||||
assertEquals(a, rw.next());
|
||||
}
|
||||
assertEquals(Status.OK, res.getStatus());
|
||||
|
||||
assertEquals("merge resolution", read(FILE1));
|
||||
assertEquals("new content two", read("file2"));
|
||||
assertEquals("more changess", read("file3"));
|
||||
assertEquals("fileg", read("fileg"));
|
||||
|
||||
rw.markStart(rw.parseCommit(db.resolve("refs/heads/topic")));
|
||||
RevCommit newF = rw.next();
|
||||
assertDerivedFrom(newF, f);
|
||||
RevCommit newD = rw.next();
|
||||
assertDerivedFrom(newD, d);
|
||||
assertEquals(2, newD.getParentCount());
|
||||
RevCommit newC = rw.next();
|
||||
assertDerivedFrom(newC, c);
|
||||
RevCommit newE = rw.next();
|
||||
assertEquals(e, newE);
|
||||
assertEquals(newC, newD.getParent(0));
|
||||
assertEquals(e, newD.getParent(1));
|
||||
assertEquals(g, rw.next());
|
||||
assertEquals(b, rw.next());
|
||||
assertEquals(a, rw.next());
|
||||
}
|
||||
|
||||
@Test
|
||||
|
@ -687,8 +691,10 @@ public void testConflictFreeWithSingleFile() throws Exception {
|
|||
checkFile(theFile, "1master\n2\n3\ntopic\n");
|
||||
// our old branch should be checked out again
|
||||
assertEquals("refs/heads/topic", db.getFullBranch());
|
||||
assertEquals(lastMasterChange, new RevWalk(db).parseCommit(
|
||||
db.resolve(Constants.HEAD)).getParent(0));
|
||||
try (RevWalk rw = new RevWalk(db)) {
|
||||
assertEquals(lastMasterChange, rw.parseCommit(
|
||||
db.resolve(Constants.HEAD)).getParent(0));
|
||||
}
|
||||
assertEquals(origHead, db.readOrigHead());
|
||||
List<ReflogEntry> headLog = db.getReflogReader(Constants.HEAD)
|
||||
.getReverseEntries();
|
||||
|
@ -737,8 +743,10 @@ public void testDetachedHead() throws Exception {
|
|||
RebaseResult res = git.rebase().setUpstream("refs/heads/master").call();
|
||||
assertEquals(Status.OK, res.getStatus());
|
||||
checkFile(theFile, "1master\n2\n3\ntopic\n");
|
||||
assertEquals(lastMasterChange, new RevWalk(db).parseCommit(
|
||||
db.resolve(Constants.HEAD)).getParent(0));
|
||||
try (RevWalk rw = new RevWalk(db)) {
|
||||
assertEquals(lastMasterChange, rw.parseCommit(
|
||||
db.resolve(Constants.HEAD)).getParent(0));
|
||||
}
|
||||
|
||||
List<ReflogEntry> headLog = db.getReflogReader(Constants.HEAD)
|
||||
.getReverseEntries();
|
||||
|
@ -785,8 +793,10 @@ public void testFilesAddedFromTwoBranches() throws Exception {
|
|||
|
||||
// our old branch should be checked out again
|
||||
assertEquals("refs/heads/file3", db.getFullBranch());
|
||||
assertEquals(addFile2, new RevWalk(db).parseCommit(
|
||||
db.resolve(Constants.HEAD)).getParent(0));
|
||||
try (RevWalk rw = new RevWalk(db)) {
|
||||
assertEquals(addFile2, rw.parseCommit(
|
||||
db.resolve(Constants.HEAD)).getParent(0));
|
||||
}
|
||||
|
||||
checkoutBranch("refs/heads/file2");
|
||||
assertTrue(new File(db.getWorkTree(), FILE1).exists());
|
||||
|
@ -846,9 +856,10 @@ public void testStopOnConflict() throws Exception {
|
|||
assertEquals(res.getStatus(), Status.ABORTED);
|
||||
assertEquals("refs/heads/topic", db.getFullBranch());
|
||||
checkFile(FILE1, "1topic", "2", "3", "topic4");
|
||||
RevWalk rw = new RevWalk(db);
|
||||
assertEquals(lastTopicCommit, rw
|
||||
.parseCommit(db.resolve(Constants.HEAD)));
|
||||
try (RevWalk rw = new RevWalk(db)) {
|
||||
assertEquals(lastTopicCommit,
|
||||
rw.parseCommit(db.resolve(Constants.HEAD)));
|
||||
}
|
||||
assertEquals(RepositoryState.SAFE, db.getRepositoryState());
|
||||
|
||||
// rebase- dir in .git must be deleted
|
||||
|
@ -909,9 +920,10 @@ public void testStopOnConflictAndAbortWithDetachedHEAD() throws Exception {
|
|||
assertEquals(res.getStatus(), Status.ABORTED);
|
||||
assertEquals(lastTopicCommit.getName(), db.getFullBranch());
|
||||
checkFile(FILE1, "1topic", "2", "3", "topic4");
|
||||
RevWalk rw = new RevWalk(db);
|
||||
assertEquals(lastTopicCommit,
|
||||
rw.parseCommit(db.resolve(Constants.HEAD)));
|
||||
try (RevWalk rw = new RevWalk(db)) {
|
||||
assertEquals(lastTopicCommit,
|
||||
rw.parseCommit(db.resolve(Constants.HEAD)));
|
||||
}
|
||||
assertEquals(RepositoryState.SAFE, db.getRepositoryState());
|
||||
|
||||
// rebase- dir in .git must be deleted
|
||||
|
@ -966,11 +978,12 @@ public void testStopOnConflictAndContinue() throws Exception {
|
|||
assertEquals(RepositoryState.SAFE, db.getRepositoryState());
|
||||
|
||||
ObjectId headId = db.resolve(Constants.HEAD);
|
||||
RevWalk rw = new RevWalk(db);
|
||||
RevCommit rc = rw.parseCommit(headId);
|
||||
RevCommit parent = rw.parseCommit(rc.getParent(0));
|
||||
assertEquals("change file1 in topic\n\nThis is conflicting", parent
|
||||
.getFullMessage());
|
||||
try (RevWalk rw = new RevWalk(db)) {
|
||||
RevCommit rc = rw.parseCommit(headId);
|
||||
RevCommit parent = rw.parseCommit(rc.getParent(0));
|
||||
assertEquals("change file1 in topic\n\nThis is conflicting", parent
|
||||
.getFullMessage());
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
|
@ -1017,9 +1030,10 @@ public void testStopOnConflictAndContinueWithNoDeltaToMaster()
|
|||
git.rebase().setOperation(Operation.SKIP).call();
|
||||
|
||||
ObjectId headId = db.resolve(Constants.HEAD);
|
||||
RevWalk rw = new RevWalk(db);
|
||||
RevCommit rc = rw.parseCommit(headId);
|
||||
assertEquals("change file1 in master", rc.getFullMessage());
|
||||
try (RevWalk rw = new RevWalk(db)) {
|
||||
RevCommit rc = rw.parseCommit(headId);
|
||||
assertEquals("change file1 in master", rc.getFullMessage());
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
|
@ -1308,10 +1322,11 @@ public void testStopOnConflictCommitAndContinue() throws Exception {
|
|||
git.rebase().setOperation(Operation.SKIP).call();
|
||||
|
||||
ObjectId headId = db.resolve(Constants.HEAD);
|
||||
RevWalk rw = new RevWalk(db);
|
||||
RevCommit rc = rw.parseCommit(headId);
|
||||
RevCommit parent = rw.parseCommit(rc.getParent(0));
|
||||
assertEquals("A different commit message", parent.getFullMessage());
|
||||
try (RevWalk rw = new RevWalk(db)) {
|
||||
RevCommit rc = rw.parseCommit(headId);
|
||||
RevCommit parent = rw.parseCommit(rc.getParent(0));
|
||||
assertEquals("A different commit message", parent.getFullMessage());
|
||||
}
|
||||
}
|
||||
|
||||
private RevCommit writeFileAndCommit(String fileName, String commitMessage,
|
||||
|
@ -1420,9 +1435,10 @@ public void testStopOnConflictFileCreationAndDeletion() throws Exception {
|
|||
res = git.rebase().setOperation(Operation.ABORT).call();
|
||||
assertEquals(res.getStatus(), Status.ABORTED);
|
||||
assertEquals("refs/heads/topic", db.getFullBranch());
|
||||
RevWalk rw = new RevWalk(db);
|
||||
assertEquals(conflicting, rw.parseCommit(db.resolve(Constants.HEAD)));
|
||||
assertEquals(RepositoryState.SAFE, db.getRepositoryState());
|
||||
try (RevWalk rw = new RevWalk(db)) {
|
||||
assertEquals(conflicting, rw.parseCommit(db.resolve(Constants.HEAD)));
|
||||
assertEquals(RepositoryState.SAFE, db.getRepositoryState());
|
||||
}
|
||||
|
||||
// rebase- dir in .git must be deleted
|
||||
assertFalse(new File(db.getDirectory(), "rebase-merge").exists());
|
||||
|
@ -2286,14 +2302,15 @@ public String modifyCommitMessage(String commit) {
|
|||
assertEquals(RebaseResult.Status.OK, res2.getStatus());
|
||||
|
||||
ObjectId headId = db.resolve(Constants.HEAD);
|
||||
RevWalk rw = new RevWalk(db);
|
||||
RevCommit rc = rw.parseCommit(headId);
|
||||
try (RevWalk rw = new RevWalk(db)) {
|
||||
RevCommit rc = rw.parseCommit(headId);
|
||||
|
||||
ObjectId head1Id = db.resolve(Constants.HEAD + "~1");
|
||||
RevCommit rc1 = rw.parseCommit(head1Id);
|
||||
ObjectId head1Id = db.resolve(Constants.HEAD + "~1");
|
||||
RevCommit rc1 = rw.parseCommit(head1Id);
|
||||
|
||||
assertEquals(rc.getFullMessage(), c4.getFullMessage());
|
||||
assertEquals(rc1.getFullMessage(), c2.getFullMessage());
|
||||
assertEquals(rc.getFullMessage(), c4.getFullMessage());
|
||||
assertEquals(rc1.getFullMessage(), c2.getFullMessage());
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
|
@ -2643,15 +2660,16 @@ public String modifyCommitMessage(String commit) {
|
|||
}
|
||||
}).call();
|
||||
|
||||
RevWalk walk = new RevWalk(db);
|
||||
ObjectId headId = db.resolve(Constants.HEAD);
|
||||
RevCommit headCommit = walk.parseCommit(headId);
|
||||
assertEquals(headCommit.getFullMessage(),
|
||||
"update file2 on master\nnew line");
|
||||
try (RevWalk walk = new RevWalk(db)) {
|
||||
ObjectId headId = db.resolve(Constants.HEAD);
|
||||
RevCommit headCommit = walk.parseCommit(headId);
|
||||
assertEquals(headCommit.getFullMessage(),
|
||||
"update file2 on master\nnew line");
|
||||
|
||||
ObjectId head2Id = db.resolve(Constants.HEAD + "^1");
|
||||
RevCommit head1Commit = walk.parseCommit(head2Id);
|
||||
assertEquals("changed", head1Commit.getFullMessage());
|
||||
ObjectId head2Id = db.resolve(Constants.HEAD + "^1");
|
||||
RevCommit head1Commit = walk.parseCommit(head2Id);
|
||||
assertEquals("changed", head1Commit.getFullMessage());
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
|
@ -2722,17 +2740,18 @@ public String modifyCommitMessage(String commit) {
|
|||
}
|
||||
}).call();
|
||||
|
||||
RevWalk walk = new RevWalk(db);
|
||||
ObjectId headId = db.resolve(Constants.HEAD);
|
||||
RevCommit headCommit = walk.parseCommit(headId);
|
||||
assertEquals(headCommit.getFullMessage(),
|
||||
"update file2 on master\nnew line");
|
||||
try (RevWalk walk = new RevWalk(db)) {
|
||||
ObjectId headId = db.resolve(Constants.HEAD);
|
||||
RevCommit headCommit = walk.parseCommit(headId);
|
||||
assertEquals(headCommit.getFullMessage(),
|
||||
"update file2 on master\nnew line");
|
||||
|
||||
ObjectId head2Id = db.resolve(Constants.HEAD + "^1");
|
||||
RevCommit head1Commit = walk.parseCommit(head2Id);
|
||||
assertEquals(
|
||||
"Add file1\nnew line\nAdd file2\nnew line\nupdated file1 on master\nnew line",
|
||||
head1Commit.getFullMessage());
|
||||
ObjectId head2Id = db.resolve(Constants.HEAD + "^1");
|
||||
RevCommit head1Commit = walk.parseCommit(head2Id);
|
||||
assertEquals(
|
||||
"Add file1\nnew line\nAdd file2\nnew line\nupdated file1 on master\nnew line",
|
||||
head1Commit.getFullMessage());
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
|
@ -2804,15 +2823,16 @@ public String modifyCommitMessage(String commit) {
|
|||
}
|
||||
}).call();
|
||||
|
||||
RevWalk walk = new RevWalk(db);
|
||||
ObjectId headId = db.resolve(Constants.HEAD);
|
||||
RevCommit headCommit = walk.parseCommit(headId);
|
||||
assertEquals(headCommit.getFullMessage(),
|
||||
"update file2 on master\nnew line");
|
||||
try (RevWalk walk = new RevWalk(db)) {
|
||||
ObjectId headId = db.resolve(Constants.HEAD);
|
||||
RevCommit headCommit = walk.parseCommit(headId);
|
||||
assertEquals(headCommit.getFullMessage(),
|
||||
"update file2 on master\nnew line");
|
||||
|
||||
ObjectId head2Id = db.resolve(Constants.HEAD + "^1");
|
||||
RevCommit head1Commit = walk.parseCommit(head2Id);
|
||||
assertEquals("changed", head1Commit.getFullMessage());
|
||||
ObjectId head2Id = db.resolve(Constants.HEAD + "^1");
|
||||
RevCommit head1Commit = walk.parseCommit(head2Id);
|
||||
assertEquals("changed", head1Commit.getFullMessage());
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
|
@ -2855,16 +2875,17 @@ public String modifyCommitMessage(String commit) {
|
|||
}
|
||||
}).call();
|
||||
|
||||
RevWalk walk = new RevWalk(db);
|
||||
ObjectId headId = db.resolve(Constants.HEAD);
|
||||
RevCommit headCommit = walk.parseCommit(headId);
|
||||
assertEquals("update file2 on master\nnew line",
|
||||
headCommit.getFullMessage());
|
||||
try (RevWalk walk = new RevWalk(db)) {
|
||||
ObjectId headId = db.resolve(Constants.HEAD);
|
||||
RevCommit headCommit = walk.parseCommit(headId);
|
||||
assertEquals("update file2 on master\nnew line",
|
||||
headCommit.getFullMessage());
|
||||
|
||||
ObjectId head1Id = db.resolve(Constants.HEAD + "^1");
|
||||
RevCommit head1Commit = walk.parseCommit(head1Id);
|
||||
assertEquals("Add file2\nnew line",
|
||||
head1Commit.getFullMessage());
|
||||
ObjectId head1Id = db.resolve(Constants.HEAD + "^1");
|
||||
RevCommit head1Commit = walk.parseCommit(head1Id);
|
||||
assertEquals("Add file2\nnew line",
|
||||
head1Commit.getFullMessage());
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
|
@ -2903,11 +2924,12 @@ public String modifyCommitMessage(String commit) {
|
|||
}
|
||||
}).call();
|
||||
|
||||
RevWalk walk = new RevWalk(db);
|
||||
ObjectId headId = db.resolve(Constants.HEAD);
|
||||
RevCommit headCommit = walk.parseCommit(headId);
|
||||
assertEquals("Add file2",
|
||||
headCommit.getFullMessage());
|
||||
try (RevWalk walk = new RevWalk(db)) {
|
||||
ObjectId headId = db.resolve(Constants.HEAD);
|
||||
RevCommit headCommit = walk.parseCommit(headId);
|
||||
assertEquals("Add file2",
|
||||
headCommit.getFullMessage());
|
||||
}
|
||||
}
|
||||
|
||||
@Test(expected = InvalidRebaseStepException.class)
|
||||
|
|
Loading…
Reference in New Issue