summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorRobin Stocker2012-10-28 10:57:43 (EDT)
committer Chris Aniszczyk2012-11-01 13:47:10 (EDT)
commitde2455af678b5c9d0111336daed1ca0e0958ca01 (patch)
treef608f31deba41a70e512ec6459c515f1d307dfdd
parent3f1d56d6b7105eec88eea59730a5d78f668df179 (diff)
downloadjgit-de2455af678b5c9d0111336daed1ca0e0958ca01.zip
jgit-de2455af678b5c9d0111336daed1ca0e0958ca01.tar.gz
jgit-de2455af678b5c9d0111336daed1ca0e0958ca01.tar.bz2
ResetCommand: Use DirCacheBuilder in resetIndexrefs/changes/88/8388/2
With bug 391855, DirCacheEditor's PathEdit will be applied for each stage. For an unmerged path, this would result in 3 equal entries for the same path. By using a DirCacheBuilder, the code is simpler and does not have the above problem with unmerged paths. Bug: 391860 Change-Id: I785deeaeb8474f8c7a7fbc9ef00d3131fac87e41 Signed-off-by: Chris Aniszczyk <zx@twitter.com>
-rw-r--r--org.eclipse.jgit.test/tst/org/eclipse/jgit/api/ResetCommandTest.java30
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/api/ResetCommand.java17
2 files changed, 34 insertions, 13 deletions
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/ResetCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/ResetCommandTest.java
index 3b0e7bd..dd6fc67 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/ResetCommandTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/ResetCommandTest.java
@@ -257,6 +257,36 @@ public class ResetCommandTest extends RepositoryTestCase {
}
@Test
+ public void testMixedResetWithUnmerged() throws Exception {
+ git = new Git(db);
+
+ String file = "a.txt";
+ writeTrashFile(file, "data");
+ String file2 = "b.txt";
+ writeTrashFile(file2, "data");
+
+ git.add().addFilepattern(file).addFilepattern(file2).call();
+ git.commit().setMessage("commit").call();
+
+ DirCache index = db.lockDirCache();
+ DirCacheBuilder builder = index.builder();
+ builder.add(createEntry(file, FileMode.REGULAR_FILE, 1, ""));
+ builder.add(createEntry(file, FileMode.REGULAR_FILE, 2, ""));
+ builder.add(createEntry(file, FileMode.REGULAR_FILE, 3, ""));
+ assertTrue(builder.commit());
+
+ assertEquals("[a.txt, mode:100644, stage:1]"
+ + "[a.txt, mode:100644, stage:2]"
+ + "[a.txt, mode:100644, stage:3]",
+ indexState(0));
+
+ git.reset().setMode(ResetType.MIXED).call();
+
+ assertEquals("[a.txt, mode:100644]" + "[b.txt, mode:100644]",
+ indexState(0));
+ }
+
+ @Test
public void testPathsReset() throws Exception {
setupRepository();
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/ResetCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/ResetCommand.java
index 7f5eb02..36c3334 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/ResetCommand.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/ResetCommand.java
@@ -54,9 +54,6 @@ import org.eclipse.jgit.dircache.DirCache;
import org.eclipse.jgit.dircache.DirCacheBuildIterator;
import org.eclipse.jgit.dircache.DirCacheBuilder;
import org.eclipse.jgit.dircache.DirCacheCheckout;
-import org.eclipse.jgit.dircache.DirCacheEditor;
-import org.eclipse.jgit.dircache.DirCacheEditor.DeletePath;
-import org.eclipse.jgit.dircache.DirCacheEditor.PathEdit;
import org.eclipse.jgit.dircache.DirCacheEntry;
import org.eclipse.jgit.dircache.DirCacheIterator;
import org.eclipse.jgit.internal.JGitText;
@@ -313,7 +310,7 @@ public class ResetCommand extends GitCommand<Ref> {
DirCache dc = repo.lockDirCache();
TreeWalk walk = null;
try {
- DirCacheEditor editor = dc.editor();
+ DirCacheBuilder builder = dc.builder();
walk = new TreeWalk(repo);
walk.addTree(commit.getTree());
@@ -324,7 +321,7 @@ public class ResetCommand extends GitCommand<Ref> {
AbstractTreeIterator cIter = walk.getTree(0,
AbstractTreeIterator.class);
if (cIter == null) {
- editor.add(new DeletePath(walk.getPathString()));
+ // Not in commit, don't add to new index
continue;
}
@@ -340,16 +337,10 @@ public class ResetCommand extends GitCommand<Ref> {
entry.setLength(indexEntry.getLength());
}
- editor.add(new PathEdit(entry) {
-
- @Override
- public void apply(DirCacheEntry ent) {
- ent.copyMetaData(entry);
- }
- });
+ builder.add(entry);
}
- editor.commit();
+ builder.commit();
} finally {
dc.unlock();
if (walk != null)