github
/
jgit
mirror of https://gitee.com/github-mirror-repo/jgit.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

IndexDiffTest: Open Git instances in try-with-resources 

Change-Id: I7fa2d16561982ddfde053f2fe78135c114b66b1d
Signed-off-by: David Pursehouse <david.pursehouse@sonymobile.com>
stable-4.2
David Pursehouse 9 years ago
parent
4d3dc41f2f
commit
f23b0fd7e6
1 changed files with 340 additions and 334 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 674
      org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/IndexDiffTest.java

674
org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/IndexDiffTest.java
Unescape View File

@ -148,8 +148,9 @@ public class IndexDiffTest extends RepositoryTestCase {
writeTrashFile("file2", "file2"); writeTrashFile("file2", "file2");
writeTrashFile("dir/file3", "dir/file3"); writeTrashFile("dir/file3", "dir/file3");
Git git = new Git(db); try (Git git = new Git(db)) {
git.add().addFilepattern("file2").addFilepattern("dir/file3").call(); git.add().addFilepattern("file2").addFilepattern("dir/file3").call();
}
writeTrashFile("dir/file3", "changed"); writeTrashFile("dir/file3", "changed");
@ -177,31 +178,31 @@ public class IndexDiffTest extends RepositoryTestCase {
@Test @Test
public void testConflicting() throws Exception { public void testConflicting() throws Exception {
Git git = new Git(db); try (Git git = new Git(db)) {
writeTrashFile("a", "1\na\n3\n");
writeTrashFile("a", "1\na\n3\n"); writeTrashFile("b", "1\nb\n3\n");
writeTrashFile("b", "1\nb\n3\n"); git.add().addFilepattern("a").addFilepattern("b").call();
git.add().addFilepattern("a").addFilepattern("b").call(); RevCommit initialCommit = git.commit().setMessage("initial").call();
RevCommit initialCommit = git.commit().setMessage("initial").call();
// create side branch with two modifications
// create side branch with two modifications createBranch(initialCommit, "refs/heads/side");
createBranch(initialCommit, "refs/heads/side"); checkoutBranch("refs/heads/side");
checkoutBranch("refs/heads/side"); writeTrashFile("a", "1\na(side)\n3\n");
writeTrashFile("a", "1\na(side)\n3\n"); writeTrashFile("b", "1\nb\n3\n(side)");
writeTrashFile("b", "1\nb\n3\n(side)"); git.add().addFilepattern("a").addFilepattern("b").call();
git.add().addFilepattern("a").addFilepattern("b").call(); RevCommit secondCommit = git.commit().setMessage("side").call();
RevCommit secondCommit = git.commit().setMessage("side").call();
// update a on master to generate conflict
// update a on master to generate conflict checkoutBranch("refs/heads/master");
checkoutBranch("refs/heads/master"); writeTrashFile("a", "1\na(main)\n3\n");
writeTrashFile("a", "1\na(main)\n3\n"); git.add().addFilepattern("a").call();
git.add().addFilepattern("a").call(); git.commit().setMessage("main").call();
git.commit().setMessage("main").call();
// merge side with master
// merge side with master MergeResult result = git.merge().include(secondCommit.getId())
MergeResult result = git.merge().include(secondCommit.getId()) .setStrategy(MergeStrategy.RESOLVE).call();
.setStrategy(MergeStrategy.RESOLVE).call(); assertEquals(MergeStatus.CONFLICTING, result.getMergeStatus());
assertEquals(MergeStatus.CONFLICTING, result.getMergeStatus()); }
FileTreeIterator iterator = new FileTreeIterator(db); FileTreeIterator iterator = new FileTreeIterator(db);
IndexDiff diff = new IndexDiff(db, Constants.HEAD, iterator); IndexDiff diff = new IndexDiff(db, Constants.HEAD, iterator);
@ -221,29 +222,29 @@ public class IndexDiffTest extends RepositoryTestCase {
@Test @Test
public void testConflictingDeletedAndModified() throws Exception { public void testConflictingDeletedAndModified() throws Exception {
Git git = new Git(db); try (Git git = new Git(db)) {
writeTrashFile("a", "1\na\n3\n");
writeTrashFile("a", "1\na\n3\n"); writeTrashFile("b", "1\nb\n3\n");
writeTrashFile("b", "1\nb\n3\n"); git.add().addFilepattern("a").addFilepattern("b").call();
git.add().addFilepattern("a").addFilepattern("b").call(); RevCommit initialCommit = git.commit().setMessage("initial").call();
RevCommit initialCommit = git.commit().setMessage("initial").call();
// create side branch and delete "a"
// create side branch and delete "a" createBranch(initialCommit, "refs/heads/side");
createBranch(initialCommit, "refs/heads/side"); checkoutBranch("refs/heads/side");
checkoutBranch("refs/heads/side"); git.rm().addFilepattern("a").call();
git.rm().addFilepattern("a").call(); RevCommit secondCommit = git.commit().setMessage("side").call();
RevCommit secondCommit = git.commit().setMessage("side").call();
// update a on master to generate conflict
// update a on master to generate conflict checkoutBranch("refs/heads/master");
checkoutBranch("refs/heads/master"); writeTrashFile("a", "1\na(main)\n3\n");
writeTrashFile("a", "1\na(main)\n3\n"); git.add().addFilepattern("a").call();
git.add().addFilepattern("a").call(); git.commit().setMessage("main").call();
git.commit().setMessage("main").call();
// merge side with master
// merge side with master MergeResult result = git.merge().include(secondCommit.getId())
MergeResult result = git.merge().include(secondCommit.getId()) .setStrategy(MergeStrategy.RESOLVE).call();
.setStrategy(MergeStrategy.RESOLVE).call(); assertEquals(MergeStatus.CONFLICTING, result.getMergeStatus());
assertEquals(MergeStatus.CONFLICTING, result.getMergeStatus()); }
FileTreeIterator iterator = new FileTreeIterator(db); FileTreeIterator iterator = new FileTreeIterator(db);
IndexDiff diff = new IndexDiff(db, Constants.HEAD, iterator); IndexDiff diff = new IndexDiff(db, Constants.HEAD, iterator);
@ -262,28 +263,28 @@ public class IndexDiffTest extends RepositoryTestCase {
@Test @Test
public void testConflictingFromMultipleCreations() throws Exception { public void testConflictingFromMultipleCreations() throws Exception {
Git git = new Git(db); try (Git git = new Git(db)) {
writeTrashFile("a", "1\na\n3\n");
git.add().addFilepattern("a").call();
RevCommit initialCommit = git.commit().setMessage("initial").call();
writeTrashFile("a", "1\na\n3\n"); createBranch(initialCommit, "refs/heads/side");
git.add().addFilepattern("a").call(); checkoutBranch("refs/heads/side");
RevCommit initialCommit = git.commit().setMessage("initial").call();
createBranch(initialCommit, "refs/heads/side"); writeTrashFile("b", "1\nb(side)\n3\n");
checkoutBranch("refs/heads/side"); git.add().addFilepattern("b").call();
RevCommit secondCommit = git.commit().setMessage("side").call();
writeTrashFile("b", "1\nb(side)\n3\n"); checkoutBranch("refs/heads/master");
git.add().addFilepattern("b").call();
RevCommit secondCommit = git.commit().setMessage("side").call();
checkoutBranch("refs/heads/master"); writeTrashFile("b", "1\nb(main)\n3\n");
git.add().addFilepattern("b").call();
git.commit().setMessage("main").call();
writeTrashFile("b", "1\nb(main)\n3\n"); MergeResult result = git.merge().include(secondCommit.getId())
git.add().addFilepattern("b").call(); .setStrategy(MergeStrategy.RESOLVE).call();
git.commit().setMessage("main").call(); assertEquals(MergeStatus.CONFLICTING, result.getMergeStatus());
}
MergeResult result = git.merge().include(secondCommit.getId())
.setStrategy(MergeStrategy.RESOLVE).call();
assertEquals(MergeStatus.CONFLICTING, result.getMergeStatus());
FileTreeIterator iterator = new FileTreeIterator(db); FileTreeIterator iterator = new FileTreeIterator(db);
IndexDiff diff = new IndexDiff(db, Constants.HEAD, iterator); IndexDiff diff = new IndexDiff(db, Constants.HEAD, iterator);
@ -304,11 +305,12 @@ public class IndexDiffTest extends RepositoryTestCase {
writeTrashFile("a.c", "a.c"); writeTrashFile("a.c", "a.c");
writeTrashFile("a=c", "a=c"); writeTrashFile("a=c", "a=c");
writeTrashFile("a=d", "a=d"); writeTrashFile("a=d", "a=d");
Git git = new Git(db); try (Git git = new Git(db)) {
git.add().addFilepattern("a.b").call(); git.add().addFilepattern("a.b").call();
git.add().addFilepattern("a.c").call(); git.add().addFilepattern("a.c").call();
git.add().addFilepattern("a=c").call(); git.add().addFilepattern("a=c").call();
git.add().addFilepattern("a=d").call(); git.add().addFilepattern("a=d").call();
}
TreeFormatter tree = new TreeFormatter(); TreeFormatter tree = new TreeFormatter();
// got the hash id'd from the data using echo -n a.b|git hash-object -t blob --stdin // got the hash id'd from the data using echo -n a.b|git hash-object -t blob --stdin
@ -338,7 +340,6 @@ public class IndexDiffTest extends RepositoryTestCase {
*/ */
@Test @Test
public void testUnchangedComplex() throws IOException, GitAPIException { public void testUnchangedComplex() throws IOException, GitAPIException {
Git git = new Git(db);
writeTrashFile("a.b", "a.b"); writeTrashFile("a.b", "a.b");
writeTrashFile("a.c", "a.c"); writeTrashFile("a.c", "a.c");
writeTrashFile("a/b.b/b", "a/b.b/b"); writeTrashFile("a/b.b/b", "a/b.b/b");
@ -346,10 +347,12 @@ public class IndexDiffTest extends RepositoryTestCase {
writeTrashFile("a/c", "a/c"); writeTrashFile("a/c", "a/c");
writeTrashFile("a=c", "a=c"); writeTrashFile("a=c", "a=c");
writeTrashFile("a=d", "a=d"); writeTrashFile("a=d", "a=d");
git.add().addFilepattern("a.b").addFilepattern("a.c") try (Git git = new Git(db)) {
.addFilepattern("a/b.b/b").addFilepattern("a/b") git.add().addFilepattern("a.b").addFilepattern("a.c")
.addFilepattern("a/c").addFilepattern("a=c") .addFilepattern("a/b.b/b").addFilepattern("a/b")
.addFilepattern("a=d").call(); .addFilepattern("a/c").addFilepattern("a=c")
.addFilepattern("a=d").call();
}
// got the hash id'd from the data using echo -n a.b|git hash-object -t blob --stdin // got the hash id'd from the data using echo -n a.b|git hash-object -t blob --stdin
@ -397,11 +400,12 @@ public class IndexDiffTest extends RepositoryTestCase {
*/ */
@Test @Test
public void testRemovedUntracked() throws Exception{ public void testRemovedUntracked() throws Exception{
Git git = new Git(db);
String path = "file"; String path = "file";
writeTrashFile(path, "content"); try (Git git = new Git(db)) {
git.add().addFilepattern(path).call(); writeTrashFile(path, "content");
git.commit().setMessage("commit").call(); git.add().addFilepattern(path).call();
git.commit().setMessage("commit").call();
}
removeFromIndex(path); removeFromIndex(path);
FileTreeIterator iterator = new FileTreeIterator(db); FileTreeIterator iterator = new FileTreeIterator(db);
IndexDiff diff = new IndexDiff(db, Constants.HEAD, iterator); IndexDiff diff = new IndexDiff(db, Constants.HEAD, iterator);
@ -417,51 +421,51 @@ public class IndexDiffTest extends RepositoryTestCase {
*/ */
@Test @Test
public void testUntrackedFolders() throws Exception { public void testUntrackedFolders() throws Exception {
Git git = new Git(db); try (Git git = new Git(db)) {
IndexDiff diff = new IndexDiff(db, Constants.HEAD,
IndexDiff diff = new IndexDiff(db, Constants.HEAD, new FileTreeIterator(db));
new FileTreeIterator(db)); diff.diff();
diff.diff(); assertEquals(Collections.EMPTY_SET, diff.getUntrackedFolders());
assertEquals(Collections.EMPTY_SET, diff.getUntrackedFolders());
writeTrashFile("readme", "");
writeTrashFile("readme", ""); writeTrashFile("src/com/A.java", "");
writeTrashFile("src/com/A.java", ""); writeTrashFile("src/com/B.java", "");
writeTrashFile("src/com/B.java", ""); writeTrashFile("src/org/A.java", "");
writeTrashFile("src/org/A.java", ""); writeTrashFile("src/org/B.java", "");
writeTrashFile("src/org/B.java", ""); writeTrashFile("target/com/A.java", "");
writeTrashFile("target/com/A.java", ""); writeTrashFile("target/com/B.java", "");
writeTrashFile("target/com/B.java", ""); writeTrashFile("target/org/A.java", "");
writeTrashFile("target/org/A.java", ""); writeTrashFile("target/org/B.java", "");
writeTrashFile("target/org/B.java", "");
git.add().addFilepattern("src").addFilepattern("readme").call();
git.add().addFilepattern("src").addFilepattern("readme").call(); git.commit().setMessage("initial").call();
git.commit().setMessage("initial").call();
diff = new IndexDiff(db, Constants.HEAD,
diff = new IndexDiff(db, Constants.HEAD, new FileTreeIterator(db));
new FileTreeIterator(db)); diff.diff();
diff.diff(); assertEquals(new HashSet<String>(Arrays.asList("target")),
assertEquals(new HashSet<String>(Arrays.asList("target")), diff.getUntrackedFolders());
diff.getUntrackedFolders());
writeTrashFile("src/tst/A.java", "");
writeTrashFile("src/tst/A.java", ""); writeTrashFile("src/tst/B.java", "");
writeTrashFile("src/tst/B.java", "");
diff = new IndexDiff(db, Constants.HEAD, new FileTreeIterator(db));
diff = new IndexDiff(db, Constants.HEAD, new FileTreeIterator(db)); diff.diff();
diff.diff(); assertEquals(new HashSet<String>(Arrays.asList("target", "src/tst")),
assertEquals(new HashSet<String>(Arrays.asList("target", "src/tst")), diff.getUntrackedFolders());
diff.getUntrackedFolders());
git.rm().addFilepattern("src/com/B.java").addFilepattern("src/org")
git.rm().addFilepattern("src/com/B.java").addFilepattern("src/org") .call();
.call(); git.commit().setMessage("second").call();
git.commit().setMessage("second").call(); writeTrashFile("src/org/C.java", "");
writeTrashFile("src/org/C.java", "");
diff = new IndexDiff(db, Constants.HEAD, new FileTreeIterator(db));
diff = new IndexDiff(db, Constants.HEAD, new FileTreeIterator(db)); diff.diff();
diff.diff(); assertEquals(
assertEquals( new HashSet<String>(Arrays.asList("src/org", "src/tst",
new HashSet<String>(Arrays.asList("src/org", "src/tst", "target")),
"target")), diff.getUntrackedFolders());
diff.getUntrackedFolders()); }
} }
/** /**
@ -471,85 +475,86 @@ public class IndexDiffTest extends RepositoryTestCase {
*/ */
@Test @Test
public void testUntrackedNotIgnoredFolders() throws Exception { public void testUntrackedNotIgnoredFolders() throws Exception {
Git git = new Git(db); try (Git git = new Git(db)) {
IndexDiff diff = new IndexDiff(db, Constants.HEAD,
IndexDiff diff = new IndexDiff(db, Constants.HEAD, new FileTreeIterator(db));
new FileTreeIterator(db)); diff.diff();
diff.diff(); assertEquals(Collections.EMPTY_SET, diff.getUntrackedFolders());
assertEquals(Collections.EMPTY_SET, diff.getUntrackedFolders());
writeTrashFile("readme", "");
writeTrashFile("readme", ""); writeTrashFile("sr/com/X.java", "");
writeTrashFile("sr/com/X.java", ""); writeTrashFile("src/com/A.java", "");
writeTrashFile("src/com/A.java", ""); writeTrashFile("src/org/B.java", "");
writeTrashFile("src/org/B.java", ""); writeTrashFile("srcs/org/Y.java", "");
writeTrashFile("srcs/org/Y.java", ""); writeTrashFile("target/com/A.java", "");
writeTrashFile("target/com/A.java", ""); writeTrashFile("target/org/B.java", "");
writeTrashFile("target/org/B.java", ""); writeTrashFile(".gitignore", "/target\n/sr");
writeTrashFile(".gitignore", "/target\n/sr");
git.add().addFilepattern("readme").addFilepattern(".gitignore")
git.add().addFilepattern("readme").addFilepattern(".gitignore") .addFilepattern("srcs/").call();
.addFilepattern("srcs/").call(); git.commit().setMessage("initial").call();
git.commit().setMessage("initial").call();
diff = new IndexDiff(db, Constants.HEAD, new FileTreeIterator(db));
diff = new IndexDiff(db, Constants.HEAD, new FileTreeIterator(db)); diff.diff();
diff.diff(); assertEquals(new HashSet<String>(Arrays.asList("src")),
assertEquals(new HashSet<String>(Arrays.asList("src")), diff.getUntrackedFolders());
diff.getUntrackedFolders());
git.add().addFilepattern("src").call();
git.add().addFilepattern("src").call(); writeTrashFile("sr/com/X1.java", "");
writeTrashFile("sr/com/X1.java", ""); writeTrashFile("src/tst/A.java", "");
writeTrashFile("src/tst/A.java", ""); writeTrashFile("src/tst/B.java", "");
writeTrashFile("src/tst/B.java", ""); writeTrashFile("srcs/com/Y1.java", "");
writeTrashFile("srcs/com/Y1.java", ""); deleteTrashFile(".gitignore");
deleteTrashFile(".gitignore");
diff = new IndexDiff(db, Constants.HEAD, new FileTreeIterator(db));
diff = new IndexDiff(db, Constants.HEAD, new FileTreeIterator(db)); diff.diff();
diff.diff(); assertEquals(
assertEquals( new HashSet<String>(Arrays.asList("srcs/com", "sr", "src/tst",
new HashSet<String>(Arrays.asList("srcs/com", "sr", "src/tst", "target")),
"target")), diff.getUntrackedFolders());
diff.getUntrackedFolders()); }
} }
@Test @Test
public void testAssumeUnchanged() throws Exception { public void testAssumeUnchanged() throws Exception {
Git git = new Git(db); try (Git git = new Git(db)) {
String path = "file"; String path = "file";
writeTrashFile(path, "content"); writeTrashFile(path, "content");
git.add().addFilepattern(path).call(); git.add().addFilepattern(path).call();
String path2 = "file2"; String path2 = "file2";
writeTrashFile(path2, "content"); writeTrashFile(path2, "content");
String path3 = "file3"; String path3 = "file3";
writeTrashFile(path3, "some content"); writeTrashFile(path3, "some content");
git.add().addFilepattern(path2).addFilepattern(path3).call(); git.add().addFilepattern(path2).addFilepattern(path3).call();
git.commit().setMessage("commit").call(); git.commit().setMessage("commit").call();
assumeUnchanged(path2); assumeUnchanged(path2);
assumeUnchanged(path3); assumeUnchanged(path3);
writeTrashFile(path, "more content"); writeTrashFile(path, "more content");
deleteTrashFile(path3); deleteTrashFile(path3);
FileTreeIterator iterator = new FileTreeIterator(db); FileTreeIterator iterator = new FileTreeIterator(db);
IndexDiff diff = new IndexDiff(db, Constants.HEAD, iterator); IndexDiff diff = new IndexDiff(db, Constants.HEAD, iterator);
diff.diff(); diff.diff();
assertEquals(2, diff.getAssumeUnchanged().size()); assertEquals(2, diff.getAssumeUnchanged().size());
assertEquals(1, diff.getModified().size()); assertEquals(1, diff.getModified().size());
assertEquals(0, diff.getChanged().size()); assertEquals(0, diff.getChanged().size());
assertTrue(diff.getAssumeUnchanged().contains("file2")); assertTrue(diff.getAssumeUnchanged().contains("file2"));
assertTrue(diff.getAssumeUnchanged().contains("file3")); assertTrue(diff.getAssumeUnchanged().contains("file3"));
assertTrue(diff.getModified().contains("file")); assertTrue(diff.getModified().contains("file"));
git.add().addFilepattern(".").call(); git.add().addFilepattern(".").call();
iterator = new FileTreeIterator(db); iterator = new FileTreeIterator(db);
diff = new IndexDiff(db, Constants.HEAD, iterator); diff = new IndexDiff(db, Constants.HEAD, iterator);
diff.diff(); diff.diff();
assertEquals(2, diff.getAssumeUnchanged().size()); assertEquals(2, diff.getAssumeUnchanged().size());
assertEquals(0, diff.getModified().size()); assertEquals(0, diff.getModified().size());
assertEquals(1, diff.getChanged().size()); assertEquals(1, diff.getChanged().size());
assertTrue(diff.getAssumeUnchanged().contains("file2")); assertTrue(diff.getAssumeUnchanged().contains("file2"));
assertTrue(diff.getAssumeUnchanged().contains("file3")); assertTrue(diff.getAssumeUnchanged().contains("file3"));
assertTrue(diff.getChanged().contains("file")); assertTrue(diff.getChanged().contains("file"));
assertEquals(Collections.EMPTY_SET, diff.getUntrackedFolders()); assertEquals(Collections.EMPTY_SET, diff.getUntrackedFolders());
}
} }
@Test @Test
@ -575,147 +580,148 @@ public class IndexDiffTest extends RepositoryTestCase {
@Test @Test
public void testStageState_mergeAndReset_bug() throws Exception { public void testStageState_mergeAndReset_bug() throws Exception {
Git git = new Git(db); try (Git git = new Git(db)) {
writeTrashFile("a", "content");
writeTrashFile("a", "content"); git.add().addFilepattern("a").call();
git.add().addFilepattern("a").call(); RevCommit initialCommit = git.commit().setMessage("initial commit")
RevCommit initialCommit = git.commit().setMessage("initial commit") .call();
.call();
// create branch and add a new file
// create branch and add a new file final String branchName = Constants.R_HEADS + "branch";
final String branchName = Constants.R_HEADS + "branch"; createBranch(initialCommit, branchName);
createBranch(initialCommit, branchName); checkoutBranch(branchName);
checkoutBranch(branchName); writeTrashFile("b", "second file content - branch");
writeTrashFile("b", "second file content - branch"); git.add().addFilepattern("b").call();
git.add().addFilepattern("b").call(); RevCommit branchCommit = git.commit().setMessage("branch commit")
RevCommit branchCommit = git.commit().setMessage("branch commit") .call();
.call();
// checkout master and add the same new file
// checkout master and add the same new file checkoutBranch(Constants.R_HEADS + Constants.MASTER);
checkoutBranch(Constants.R_HEADS + Constants.MASTER); writeTrashFile("b", "second file content - master");
writeTrashFile("b", "second file content - master"); git.add().addFilepattern("b").call();
git.add().addFilepattern("b").call(); git.commit().setMessage("master commit").call();
git.commit().setMessage("master commit").call();
// try and merge
// try and merge MergeResult result = git.merge().include(branchCommit).call();
MergeResult result = git.merge().include(branchCommit).call(); assertEquals(MergeStatus.CONFLICTING, result.getMergeStatus());
assertEquals(MergeStatus.CONFLICTING, result.getMergeStatus());
FileTreeIterator iterator = new FileTreeIterator(db);
FileTreeIterator iterator = new FileTreeIterator(db); IndexDiff diff = new IndexDiff(db, Constants.HEAD, iterator);
IndexDiff diff = new IndexDiff(db, Constants.HEAD, iterator); diff.diff();
diff.diff();
assertTrue(diff.getChanged().isEmpty());
assertTrue(diff.getChanged().isEmpty()); assertTrue(diff.getAdded().isEmpty());
assertTrue(diff.getAdded().isEmpty()); assertTrue(diff.getRemoved().isEmpty());
assertTrue(diff.getRemoved().isEmpty()); assertTrue(diff.getMissing().isEmpty());
assertTrue(diff.getMissing().isEmpty()); assertTrue(diff.getModified().isEmpty());
assertTrue(diff.getModified().isEmpty()); assertEquals(1, diff.getConflicting().size());
assertEquals(1, diff.getConflicting().size()); assertTrue(diff.getConflicting().contains("b"));
assertTrue(diff.getConflicting().contains("b")); assertEquals(StageState.BOTH_ADDED, diff.getConflictingStageStates()
assertEquals(StageState.BOTH_ADDED, diff.getConflictingStageStates() .get("b"));
.get("b")); assertTrue(diff.getUntrackedFolders().isEmpty());
assertTrue(diff.getUntrackedFolders().isEmpty());
// reset file b to its master state without altering the index
// reset file b to its master state without altering the index writeTrashFile("b", "second file content - master");
writeTrashFile("b", "second file content - master");
// we should have the same result
// we should have the same result iterator = new FileTreeIterator(db);
iterator = new FileTreeIterator(db); diff = new IndexDiff(db, Constants.HEAD, iterator);
diff = new IndexDiff(db, Constants.HEAD, iterator); diff.diff();
diff.diff();
assertTrue(diff.getChanged().isEmpty());
assertTrue(diff.getChanged().isEmpty()); assertTrue(diff.getAdded().isEmpty());
assertTrue(diff.getAdded().isEmpty()); assertTrue(diff.getRemoved().isEmpty());
assertTrue(diff.getRemoved().isEmpty()); assertTrue(diff.getMissing().isEmpty());
assertTrue(diff.getMissing().isEmpty()); assertTrue(diff.getModified().isEmpty());
assertTrue(diff.getModified().isEmpty()); assertEquals(1, diff.getConflicting().size());
assertEquals(1, diff.getConflicting().size()); assertTrue(diff.getConflicting().contains("b"));
assertTrue(diff.getConflicting().contains("b")); assertEquals(StageState.BOTH_ADDED, diff.getConflictingStageStates()
assertEquals(StageState.BOTH_ADDED, diff.getConflictingStageStates() .get("b"));
.get("b")); assertTrue(diff.getUntrackedFolders().isEmpty());
assertTrue(diff.getUntrackedFolders().isEmpty()); }
} }
@Test @Test
public void testStageState_simulated_bug() throws Exception { public void testStageState_simulated_bug() throws Exception {
Git git = new Git(db); try (Git git = new Git(db)) {
writeTrashFile("a", "content");
writeTrashFile("a", "content"); git.add().addFilepattern("a").call();
git.add().addFilepattern("a").call(); RevCommit initialCommit = git.commit().setMessage("initial commit")
RevCommit initialCommit = git.commit().setMessage("initial commit") .call();
.call();
// create branch and add a new file
// create branch and add a new file final String branchName = Constants.R_HEADS + "branch";
final String branchName = Constants.R_HEADS + "branch"; createBranch(initialCommit, branchName);
createBranch(initialCommit, branchName); checkoutBranch(branchName);
checkoutBranch(branchName); writeTrashFile("b", "second file content - branch");
writeTrashFile("b", "second file content - branch"); git.add().addFilepattern("b").call();
git.add().addFilepattern("b").call(); git.commit().setMessage("branch commit")
git.commit().setMessage("branch commit") .call();
.call();
// checkout master and add the same new file
// checkout master and add the same new file checkoutBranch(Constants.R_HEADS + Constants.MASTER);
checkoutBranch(Constants.R_HEADS + Constants.MASTER); writeTrashFile("b", "second file content - master");
writeTrashFile("b", "second file content - master"); git.add().addFilepattern("b").call();
git.add().addFilepattern("b").call(); git.commit().setMessage("master commit").call();
git.commit().setMessage("master commit").call();
// Simulate a failed merge of branch into master
// Simulate a failed merge of branch into master DirCacheBuilder builder = db.lockDirCache().builder();
DirCacheBuilder builder = db.lockDirCache().builder(); DirCacheEntry entry = createEntry("a", FileMode.REGULAR_FILE, 0,
DirCacheEntry entry = createEntry("a", FileMode.REGULAR_FILE, 0, "content");
"content"); builder.add(entry);
builder.add(entry); entry = createEntry("b", FileMode.REGULAR_FILE, 2,
entry = createEntry("b", FileMode.REGULAR_FILE, 2, "second file content - master");
"second file content - master"); builder.add(entry);
builder.add(entry); entry = createEntry("b", FileMode.REGULAR_FILE, 3,
entry = createEntry("b", FileMode.REGULAR_FILE, 3, "second file content - branch");
"second file content - branch"); builder.add(entry);
builder.add(entry); builder.commit();
builder.commit();
FileTreeIterator iterator = new FileTreeIterator(db);
FileTreeIterator iterator = new FileTreeIterator(db); IndexDiff diff = new IndexDiff(db, Constants.HEAD, iterator);
IndexDiff diff = new IndexDiff(db, Constants.HEAD, iterator); diff.diff();
diff.diff();
assertTrue(diff.getChanged().isEmpty());
assertTrue(diff.getChanged().isEmpty()); assertTrue(diff.getAdded().isEmpty());
assertTrue(diff.getAdded().isEmpty()); assertTrue(diff.getRemoved().isEmpty());
assertTrue(diff.getRemoved().isEmpty()); assertTrue(diff.getMissing().isEmpty());
assertTrue(diff.getMissing().isEmpty()); assertTrue(diff.getModified().isEmpty());
assertTrue(diff.getModified().isEmpty()); assertEquals(1, diff.getConflicting().size());
assertEquals(1, diff.getConflicting().size()); assertTrue(diff.getConflicting().contains("b"));
assertTrue(diff.getConflicting().contains("b")); assertEquals(StageState.BOTH_ADDED, diff.getConflictingStageStates()
assertEquals(StageState.BOTH_ADDED, diff.getConflictingStageStates() .get("b"));
.get("b")); assertTrue(diff.getUntrackedFolders().isEmpty());
assertTrue(diff.getUntrackedFolders().isEmpty()); }
} }
@Test @Test
public void testAutoCRLFInput() throws Exception { public void testAutoCRLFInput() throws Exception {
Git git = new Git(db); try (Git git = new Git(db)) {
FileBasedConfig config = db.getConfig(); FileBasedConfig config = db.getConfig();
// Make sure core.autocrlf is false before adding // Make sure core.autocrlf is false before adding
config.setEnum(ConfigConstants.CONFIG_CORE_SECTION, null, config.setEnum(ConfigConstants.CONFIG_CORE_SECTION, null,
ConfigConstants.CONFIG_KEY_AUTOCRLF, AutoCRLF.FALSE); ConfigConstants.CONFIG_KEY_AUTOCRLF, AutoCRLF.FALSE);
config.save(); config.save();
// File is already in repository with CRLF // File is already in repository with CRLF
writeTrashFile("crlf.txt", "this\r\ncontains\r\ncrlf\r\n"); writeTrashFile("crlf.txt", "this\r\ncontains\r\ncrlf\r\n");
git.add().addFilepattern("crlf.txt").call(); git.add().addFilepattern("crlf.txt").call();
git.commit().setMessage("Add crlf.txt").call(); git.commit().setMessage("Add crlf.txt").call();
// Now set core.autocrlf to input // Now set core.autocrlf to input
config.setEnum(ConfigConstants.CONFIG_CORE_SECTION, null, config.setEnum(ConfigConstants.CONFIG_CORE_SECTION, null,
ConfigConstants.CONFIG_KEY_AUTOCRLF, AutoCRLF.INPUT); ConfigConstants.CONFIG_KEY_AUTOCRLF, AutoCRLF.INPUT);
config.save(); config.save();
FileTreeIterator iterator = new FileTreeIterator(db); FileTreeIterator iterator = new FileTreeIterator(db);
IndexDiff diff = new IndexDiff(db, Constants.HEAD, iterator); IndexDiff diff = new IndexDiff(db, Constants.HEAD, iterator);
diff.diff(); diff.diff();
assertTrue( assertTrue(
"Expected no modified files, but there were: " "Expected no modified files, but there were: "
+ diff.getModified(), diff.getModified().isEmpty()); + diff.getModified(), diff.getModified().isEmpty());
}
} }
private void verifyStageState(StageState expected, int... stages) private void verifyStageState(StageState expected, int... stages)

Write Preview
Loading…
Cancel
Save