diff options
| author | Shawn Pearce <spearce@spearce.org> | 2010-11-08 18:32:45 -0500 |
|---|---|---|
| committer | Code Review <codereview-daemon@eclipse.org> | 2010-11-08 18:32:45 -0500 |
| commit | 6ed05013469cc24b7410496d99c65b507a45c632 (patch) | |
| tree | c7ca93a68150c459786c191ff258b61ebc35909c | |
| parent | 09555c98535655a8af3ff2b364250130395ecca3 (diff) | |
| parent | 2dc2dd8b1b4c98b255b3f2dec655a3f0b197ce07 (diff) | |
| download | jgit-6ed05013469cc24b7410496d99c65b507a45c632.tar.gz jgit-6ed05013469cc24b7410496d99c65b507a45c632.zip | |
Merge "IndexDiff: support state [removed, untracked]"
| -rw-r--r-- | org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/IndexDiffTest.java | 31 | ||||
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/lib/IndexDiff.java | 3 |
2 files changed, 34 insertions, 0 deletions
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/IndexDiffTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/IndexDiffTest.java index 3d19576758..c73764a990 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/IndexDiffTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/IndexDiffTest.java @@ -48,6 +48,9 @@ package org.eclipse.jgit.lib; import java.io.File; import java.io.IOException; +import org.eclipse.jgit.api.Git; +import org.eclipse.jgit.dircache.DirCache; +import org.eclipse.jgit.dircache.DirCacheEditor; import org.eclipse.jgit.treewalk.FileTreeIterator; public class IndexDiffTest extends RepositoryTestCase { @@ -210,4 +213,32 @@ public class IndexDiffTest extends RepositoryTestCase { oi.release(); } } + + /** + * A file is removed from the index but stays in the working directory. It + * is checked if IndexDiff detects this file as removed and untracked. + * + * @throws Exception + */ + public void testRemovedUntracked() throws Exception{ + Git git = new Git(db); + String path = "file"; + writeTrashFile(path, "content"); + git.add().addFilepattern(path).call(); + git.commit().setMessage("commit").call(); + removeFromIndex(path); + FileTreeIterator iterator = new FileTreeIterator(db); + IndexDiff diff = new IndexDiff(db, Constants.HEAD, iterator); + diff.diff(); + assertTrue(diff.getRemoved().contains(path)); + assertTrue(diff.getUntracked().contains(path)); + } + + private void removeFromIndex(String path) throws IOException { + final DirCache dirc = db.lockDirCache(); + final DirCacheEditor edit = dirc.editor(); + edit.add(new DirCacheEditor.DeletePath(path)); + if (!edit.commit()) + throw new IOException("could not commit"); + } } diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/IndexDiff.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/IndexDiff.java index 4319fedd63..f5aaa5e8f8 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/IndexDiff.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/IndexDiff.java @@ -203,6 +203,9 @@ public class IndexDiff { if (!fileModeTree.equals(FileMode.TYPE_TREE)) { removed.add(treeIterator.getEntryPathString()); changesExist = true; + if (workingTreeIterator != null) + untracked.add(workingTreeIterator + .getEntryPathString()); } } } else { |