motiejus
/
jgit
1
Fork 0
Code Releases Activity

CherryPickCommandTest: Create Git instances in try-with-resource 

Change-Id: I9d49258bdf12f3221013c37cfb8a21ea27f28860
Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
This commit is contained in:
David Pursehouse 2016-01-21 18:07:54 +09:00
parent 1257cfc262
commit 776030f198
1 changed files with 182 additions and 176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

358
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/CherryPickCommandTest.java
View File

@ -88,136 +88,139 @@ public void testCherryPickNoCommit() throws IOException,
private void doTestCherryPick(boolean noCommit) throws IOException, private void doTestCherryPick(boolean noCommit) throws IOException,
JGitInternalException, JGitInternalException,
GitAPIException { GitAPIException {
Git git = new Git(db); try (Git git = new Git(db)) {
writeTrashFile("a", "first line\nsec. line\nthird line\n");
git.add().addFilepattern("a").call();
RevCommit firstCommit = git.commit().setMessage("create a").call();
writeTrashFile("a", "first line\nsec. line\nthird line\n"); writeTrashFile("b", "content\n");
git.add().addFilepattern("a").call(); git.add().addFilepattern("b").call();
RevCommit firstCommit = git.commit().setMessage("create a").call(); git.commit().setMessage("create b").call();
writeTrashFile("b", "content\n"); writeTrashFile("a", "first line\nsec. line\nthird line\nfourth line\n");
git.add().addFilepattern("b").call(); git.add().addFilepattern("a").call();
git.commit().setMessage("create b").call(); git.commit().setMessage("enlarged a").call();
writeTrashFile("a", "first line\nsec. line\nthird line\nfourth line\n"); writeTrashFile("a",
git.add().addFilepattern("a").call(); "first line\nsecond line\nthird line\nfourth line\n");
git.commit().setMessage("enlarged a").call(); git.add().addFilepattern("a").call();
RevCommit fixingA = git.commit().setMessage("fixed a").call();
writeTrashFile("a", git.branchCreate().setName("side").setStartPoint(firstCommit).call();
"first line\nsecond line\nthird line\nfourth line\n"); checkoutBranch("refs/heads/side");
git.add().addFilepattern("a").call();
RevCommit fixingA = git.commit().setMessage("fixed a").call();
git.branchCreate().setName("side").setStartPoint(firstCommit).call(); writeTrashFile("a", "first line\nsec. line\nthird line\nfeature++\n");
checkoutBranch("refs/heads/side"); git.add().addFilepattern("a").call();
git.commit().setMessage("enhanced a").call();
writeTrashFile("a", "first line\nsec. line\nthird line\nfeature++\n"); CherryPickResult pickResult = git.cherryPick().include(fixingA)
git.add().addFilepattern("a").call(); .setNoCommit(noCommit).call();
git.commit().setMessage("enhanced a").call();
CherryPickResult pickResult = git.cherryPick().include(fixingA) assertEquals(CherryPickStatus.OK, pickResult.getStatus());
.setNoCommit(noCommit).call(); assertFalse(new File(db.getWorkTree(), "b").exists());
checkFile(new File(db.getWorkTree(), "a"),
assertEquals(CherryPickStatus.OK, pickResult.getStatus()); "first line\nsecond line\nthird line\nfeature++\n");
assertFalse(new File(db.getWorkTree(), "b").exists()); Iterator<RevCommit> history = git.log().call().iterator();
checkFile(new File(db.getWorkTree(), "a"), if (!noCommit)
"first line\nsecond line\nthird line\nfeature++\n"); assertEquals("fixed a", history.next().getFullMessage());
Iterator<RevCommit> history = git.log().call().iterator(); assertEquals("enhanced a", history.next().getFullMessage());
if (!noCommit) assertEquals("create a", history.next().getFullMessage());
assertEquals("fixed a", history.next().getFullMessage()); assertFalse(history.hasNext());
assertEquals("enhanced a", history.next().getFullMessage()); }
assertEquals("create a", history.next().getFullMessage());
assertFalse(history.hasNext());
} }
@Test @Test
public void testSequentialCherryPick() throws IOException, JGitInternalException, public void testSequentialCherryPick() throws IOException, JGitInternalException,
GitAPIException { GitAPIException {
Git git = new Git(db); try (Git git = new Git(db)) {
writeTrashFile("a", "first line\nsec. line\nthird line\n");
git.add().addFilepattern("a").call();
RevCommit firstCommit = git.commit().setMessage("create a").call();
writeTrashFile("a", "first line\nsec. line\nthird line\n"); writeTrashFile("a", "first line\nsec. line\nthird line\nfourth line\n");
git.add().addFilepattern("a").call(); git.add().addFilepattern("a").call();
RevCommit firstCommit = git.commit().setMessage("create a").call(); RevCommit enlargingA = git.commit().setMessage("enlarged a").call();
writeTrashFile("a", "first line\nsec. line\nthird line\nfourth line\n"); writeTrashFile("a",
git.add().addFilepattern("a").call(); "first line\nsecond line\nthird line\nfourth line\n");
RevCommit enlargingA = git.commit().setMessage("enlarged a").call(); git.add().addFilepattern("a").call();
RevCommit fixingA = git.commit().setMessage("fixed a").call();
writeTrashFile("a", git.branchCreate().setName("side").setStartPoint(firstCommit).call();
"first line\nsecond line\nthird line\nfourth line\n"); checkoutBranch("refs/heads/side");
git.add().addFilepattern("a").call();
RevCommit fixingA = git.commit().setMessage("fixed a").call();
git.branchCreate().setName("side").setStartPoint(firstCommit).call(); writeTrashFile("b", "nothing to do with a");
checkoutBranch("refs/heads/side"); git.add().addFilepattern("b").call();
git.commit().setMessage("create b").call();
writeTrashFile("b", "nothing to do with a"); CherryPickResult result = git.cherryPick().include(enlargingA).include(fixingA).call();
git.add().addFilepattern("b").call(); assertEquals(CherryPickResult.CherryPickStatus.OK, result.getStatus());
git.commit().setMessage("create b").call();
CherryPickResult result = git.cherryPick().include(enlargingA).include(fixingA).call(); Iterator<RevCommit> history = git.log().call().iterator();
assertEquals(CherryPickResult.CherryPickStatus.OK, result.getStatus()); assertEquals("fixed a", history.next().getFullMessage());
assertEquals("enlarged a", history.next().getFullMessage());
Iterator<RevCommit> history = git.log().call().iterator(); assertEquals("create b", history.next().getFullMessage());
assertEquals("fixed a", history.next().getFullMessage()); assertEquals("create a", history.next().getFullMessage());
assertEquals("enlarged a", history.next().getFullMessage()); assertFalse(history.hasNext());
assertEquals("create b", history.next().getFullMessage()); }
assertEquals("create a", history.next().getFullMessage());
assertFalse(history.hasNext());
} }
@Test @Test
public void testCherryPickDirtyIndex() throws Exception { public void testCherryPickDirtyIndex() throws Exception {
Git git = new Git(db); try (Git git = new Git(db)) {
RevCommit sideCommit = prepareCherryPick(git); RevCommit sideCommit = prepareCherryPick(git);
// modify and add file a // modify and add file a
writeTrashFile("a", "a(modified)"); writeTrashFile("a", "a(modified)");
git.add().addFilepattern("a").call(); git.add().addFilepattern("a").call();
// do not commit // do not commit
doCherryPickAndCheckResult(git, sideCommit, doCherryPickAndCheckResult(git, sideCommit,
MergeFailureReason.DIRTY_INDEX); MergeFailureReason.DIRTY_INDEX);
}
} }
@Test @Test
public void testCherryPickDirtyWorktree() throws Exception { public void testCherryPickDirtyWorktree() throws Exception {
Git git = new Git(db); try (Git git = new Git(db)) {
RevCommit sideCommit = prepareCherryPick(git); RevCommit sideCommit = prepareCherryPick(git);
// modify file a // modify file a
writeTrashFile("a", "a(modified)"); writeTrashFile("a", "a(modified)");
// do not add and commit // do not add and commit
doCherryPickAndCheckResult(git, sideCommit, doCherryPickAndCheckResult(git, sideCommit,
MergeFailureReason.DIRTY_WORKTREE); MergeFailureReason.DIRTY_WORKTREE);
}
} }
@Test @Test
public void testCherryPickConflictResolution() throws Exception { public void testCherryPickConflictResolution() throws Exception {
Git git = new Git(db); try (Git git = new Git(db)) {
RevCommit sideCommit = prepareCherryPick(git); RevCommit sideCommit = prepareCherryPick(git);
CherryPickResult result = git.cherryPick().include(sideCommit.getId()) CherryPickResult result = git.cherryPick().include(sideCommit.getId())
.call(); .call();
assertEquals(CherryPickStatus.CONFLICTING, result.getStatus()); assertEquals(CherryPickStatus.CONFLICTING, result.getStatus());
assertTrue(new File(db.getDirectory(), Constants.MERGE_MSG).exists()); assertTrue(new File(db.getDirectory(), Constants.MERGE_MSG).exists());
assertEquals("side\n\nConflicts:\n\ta\n", db.readMergeCommitMsg()); assertEquals("side\n\nConflicts:\n\ta\n", db.readMergeCommitMsg());
assertTrue(new File(db.getDirectory(), Constants.CHERRY_PICK_HEAD) assertTrue(new File(db.getDirectory(), Constants.CHERRY_PICK_HEAD)
.exists()); .exists());
assertEquals(sideCommit.getId(), db.readCherryPickHead()); assertEquals(sideCommit.getId(), db.readCherryPickHead());
assertEquals(RepositoryState.CHERRY_PICKING, db.getRepositoryState()); assertEquals(RepositoryState.CHERRY_PICKING, db.getRepositoryState());
// Resolve // Resolve
writeTrashFile("a", "a"); writeTrashFile("a", "a");
git.add().addFilepattern("a").call(); git.add().addFilepattern("a").call();
assertEquals(RepositoryState.CHERRY_PICKING_RESOLVED, assertEquals(RepositoryState.CHERRY_PICKING_RESOLVED,
db.getRepositoryState()); db.getRepositoryState());
git.commit().setOnly("a").setMessage("resolve").call(); git.commit().setOnly("a").setMessage("resolve").call();
assertEquals(RepositoryState.SAFE, db.getRepositoryState()); assertEquals(RepositoryState.SAFE, db.getRepositoryState());
}
} }
@Test @Test
@ -251,85 +254,88 @@ public void testCherryPickConflictResolutionNoCOmmit() throws Exception {
@Test @Test
public void testCherryPickConflictReset() throws Exception { public void testCherryPickConflictReset() throws Exception {
Git git = new Git(db); try (Git git = new Git(db)) {
RevCommit sideCommit = prepareCherryPick(git);
RevCommit sideCommit = prepareCherryPick(git); CherryPickResult result = git.cherryPick().include(sideCommit.getId())
.call();
CherryPickResult result = git.cherryPick().include(sideCommit.getId()) assertEquals(CherryPickStatus.CONFLICTING, result.getStatus());
.call(); assertEquals(RepositoryState.CHERRY_PICKING, db.getRepositoryState());
assertTrue(new File(db.getDirectory(), Constants.CHERRY_PICK_HEAD)
.exists());
assertEquals(CherryPickStatus.CONFLICTING, result.getStatus()); git.reset().setMode(ResetType.MIXED).setRef("HEAD").call();
assertEquals(RepositoryState.CHERRY_PICKING, db.getRepositoryState());
assertTrue(new File(db.getDirectory(), Constants.CHERRY_PICK_HEAD)
.exists());
git.reset().setMode(ResetType.MIXED).setRef("HEAD").call(); assertEquals(RepositoryState.SAFE, db.getRepositoryState());
assertFalse(new File(db.getDirectory(), Constants.CHERRY_PICK_HEAD)
assertEquals(RepositoryState.SAFE, db.getRepositoryState()); .exists());
assertFalse(new File(db.getDirectory(), Constants.CHERRY_PICK_HEAD) }
.exists());
} }
@Test @Test
public void testCherryPickOverExecutableChangeOnNonExectuableFileSystem() public void testCherryPickOverExecutableChangeOnNonExectuableFileSystem()
throws Exception { throws Exception {
Git git = new Git(db); try (Git git = new Git(db)) {
File file = writeTrashFile("test.txt", "a"); File file = writeTrashFile("test.txt", "a");
assertNotNull(git.add().addFilepattern("test.txt").call()); assertNotNull(git.add().addFilepattern("test.txt").call());
assertNotNull(git.commit().setMessage("commit1").call()); assertNotNull(git.commit().setMessage("commit1").call());
assertNotNull(git.checkout().setCreateBranch(true).setName("a").call()); assertNotNull(git.checkout().setCreateBranch(true).setName("a").call());
writeTrashFile("test.txt", "b"); writeTrashFile("test.txt", "b");
assertNotNull(git.add().addFilepattern("test.txt").call()); assertNotNull(git.add().addFilepattern("test.txt").call());
RevCommit commit2 = git.commit().setMessage("commit2").call(); RevCommit commit2 = git.commit().setMessage("commit2").call();
assertNotNull(commit2); assertNotNull(commit2);
assertNotNull(git.checkout().setName(Constants.MASTER).call()); assertNotNull(git.checkout().setName(Constants.MASTER).call());
DirCache cache = db.lockDirCache(); DirCache cache = db.lockDirCache();
cache.getEntry("test.txt").setFileMode(FileMode.EXECUTABLE_FILE); cache.getEntry("test.txt").setFileMode(FileMode.EXECUTABLE_FILE);
cache.write(); cache.write();
assertTrue(cache.commit()); assertTrue(cache.commit());
cache.unlock(); cache.unlock();
assertNotNull(git.commit().setMessage("commit3").call()); assertNotNull(git.commit().setMessage("commit3").call());
db.getFS().setExecute(file, false); db.getFS().setExecute(file, false);
git.getRepository() git.getRepository()
.getConfig() .getConfig()
.setBoolean(ConfigConstants.CONFIG_CORE_SECTION, null, .setBoolean(ConfigConstants.CONFIG_CORE_SECTION, null,
ConfigConstants.CONFIG_KEY_FILEMODE, false); ConfigConstants.CONFIG_KEY_FILEMODE, false);
CherryPickResult result = git.cherryPick().include(commit2).call(); CherryPickResult result = git.cherryPick().include(commit2).call();
assertNotNull(result); assertNotNull(result);
assertEquals(CherryPickStatus.OK, result.getStatus()); assertEquals(CherryPickStatus.OK, result.getStatus());
}
} }
@Test @Test
public void testCherryPickConflictMarkers() throws Exception { public void testCherryPickConflictMarkers() throws Exception {
Git git = new Git(db); try (Git git = new Git(db)) {
RevCommit sideCommit = prepareCherryPick(git); RevCommit sideCommit = prepareCherryPick(git);
CherryPickResult result = git.cherryPick().include(sideCommit.getId()) CherryPickResult result = git.cherryPick().include(sideCommit.getId())
.call(); .call();
assertEquals(CherryPickStatus.CONFLICTING, result.getStatus()); assertEquals(CherryPickStatus.CONFLICTING, result.getStatus());
String expected = "<<<<<<< master\na(master)\n=======\na(side)\n>>>>>>> 527460a side\n"; String expected = "<<<<<<< master\na(master)\n=======\na(side)\n>>>>>>> 527460a side\n";
checkFile(new File(db.getWorkTree(), "a"), expected); checkFile(new File(db.getWorkTree(), "a"), expected);
}
} }
@Test @Test
public void testCherryPickOurCommitName() throws Exception { public void testCherryPickOurCommitName() throws Exception {
Git git = new Git(db); try (Git git = new Git(db)) {
RevCommit sideCommit = prepareCherryPick(git); RevCommit sideCommit = prepareCherryPick(git);
CherryPickResult result = git.cherryPick().include(sideCommit.getId()) CherryPickResult result = git.cherryPick().include(sideCommit.getId())
.setOurCommitName("custom name").call(); .setOurCommitName("custom name").call();
assertEquals(CherryPickStatus.CONFLICTING, result.getStatus()); assertEquals(CherryPickStatus.CONFLICTING, result.getStatus());
String expected = "<<<<<<< custom name\na(master)\n=======\na(side)\n>>>>>>> 527460a side\n"; String expected = "<<<<<<< custom name\na(master)\n=======\na(side)\n>>>>>>> 527460a side\n";
checkFile(new File(db.getWorkTree(), "a"), expected); checkFile(new File(db.getWorkTree(), "a"), expected);
}
} }
private RevCommit prepareCherryPick(final Git git) throws Exception { private RevCommit prepareCherryPick(final Git git) throws Exception {
@ -399,43 +405,43 @@ private void doCherryPickAndCheckResult(final Git git,
*/ */
@Test @Test
public void testCherryPickMerge() throws Exception { public void testCherryPickMerge() throws Exception {
Git git = new Git(db); try (Git git = new Git(db)) {
commitFile("file", "1\n2\n3\n", "master");
commitFile("file", "1\n2\n3\n", "side");
checkoutBranch("refs/heads/side");
RevCommit commitD = commitFile("file", "1\n2\n3\n4\n5\n", "side2");
commitFile("file", "a\n2\n3\n", "side");
MergeResult mergeResult = git.merge().include(commitD).call();
ObjectId commitM = mergeResult.getNewHead();
checkoutBranch("refs/heads/master");
RevCommit commitT = commitFile("another", "t", "master");
commitFile("file", "1\n2\n3\n", "master"); try {
commitFile("file", "1\n2\n3\n", "side"); git.cherryPick().include(commitM).call();
checkoutBranch("refs/heads/side"); fail("merges should not be cherry-picked by default");
RevCommit commitD = commitFile("file", "1\n2\n3\n4\n5\n", "side2"); } catch (MultipleParentsNotAllowedException e) {
commitFile("file", "a\n2\n3\n", "side"); // expected
MergeResult mergeResult = git.merge().include(commitD).call(); }
ObjectId commitM = mergeResult.getNewHead(); try {
checkoutBranch("refs/heads/master"); git.cherryPick().include(commitM).setMainlineParentNumber(3).call();
RevCommit commitT = commitFile("another", "t", "master"); fail("specifying a non-existent parent should fail");
} catch (JGitInternalException e) {
// expected
assertTrue(e.getMessage().endsWith(
"does not have a parent number 3."));
}
try { CherryPickResult result = git.cherryPick().include(commitM)
git.cherryPick().include(commitM).call(); .setMainlineParentNumber(1).call();
fail("merges should not be cherry-picked by default"); assertEquals(CherryPickStatus.OK, result.getStatus());
} catch (MultipleParentsNotAllowedException e) { checkFile(new File(db.getWorkTree(), "file"), "1\n2\n3\n4\n5\n");
// expected
git.reset().setMode(ResetType.HARD).setRef(commitT.getName()).call();
CherryPickResult result2 = git.cherryPick().include(commitM)
.setMainlineParentNumber(2).call();
assertEquals(CherryPickStatus.OK, result2.getStatus());
checkFile(new File(db.getWorkTree(), "file"), "a\n2\n3\n");
} }
try {
git.cherryPick().include(commitM).setMainlineParentNumber(3).call();
fail("specifying a non-existent parent should fail");
} catch (JGitInternalException e) {
// expected
assertTrue(e.getMessage().endsWith(
"does not have a parent number 3."));
}
CherryPickResult result = git.cherryPick().include(commitM)
.setMainlineParentNumber(1).call();
assertEquals(CherryPickStatus.OK, result.getStatus());
checkFile(new File(db.getWorkTree(), "file"), "1\n2\n3\n4\n5\n");
git.reset().setMode(ResetType.HARD).setRef(commitT.getName()).call();
CherryPickResult result2 = git.cherryPick().include(commitM)
.setMainlineParentNumber(2).call();
assertEquals(CherryPickStatus.OK, result2.getStatus());
checkFile(new File(db.getWorkTree(), "file"), "a\n2\n3\n");
} }
} }