Merge changes I6b2ce96b,I499f518f
* changes:
Fix order of deletion for files/dirs in ResolveMerger
Don't return success on failing paths in ResolveMerger
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java
index c6875b4..9effe60 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java
@@ -1038,6 +1038,51 @@ public void testMergeRemovingFolders() throws Exception {
}
@Test
+ public void testMergeRemovingFoldersWithoutFastForward() throws Exception {
+ File folder1 = new File(db.getWorkTree(), "folder1");
+ File folder2 = new File(db.getWorkTree(), "folder2");
+ FileUtils.mkdir(folder1);
+ FileUtils.mkdir(folder2);
+ File file = new File(folder1, "file1.txt");
+ write(file, "folder1--file1.txt");
+ file = new File(folder1, "file2.txt");
+ write(file, "folder1--file2.txt");
+ file = new File(folder2, "file1.txt");
+ write(file, "folder--file1.txt");
+ file = new File(folder2, "file2.txt");
+ write(file, "folder2--file2.txt");
+
+ Git git = new Git(db);
+ git.add().addFilepattern(folder1.getName())
+ .addFilepattern(folder2.getName()).call();
+ RevCommit base = git.commit().setMessage("adding folders").call();
+
+ recursiveDelete(folder1);
+ recursiveDelete(folder2);
+ git.rm().addFilepattern("folder1/file1.txt")
+ .addFilepattern("folder1/file2.txt")
+ .addFilepattern("folder2/file1.txt")
+ .addFilepattern("folder2/file2.txt").call();
+ RevCommit other = git.commit()
+ .setMessage("removing folders on 'branch'").call();
+
+ git.checkout().setName(base.name()).call();
+
+ file = new File(folder2, "file3.txt");
+ write(file, "folder2--file3.txt");
+
+ git.add().addFilepattern(folder2.getName()).call();
+ git.commit().setMessage("adding another file").call();
+
+ MergeResult result = git.merge().include(other.getId())
+ .setStrategy(MergeStrategy.RESOLVE).call();
+
+ assertEquals(MergeResult.MergeStatus.MERGED,
+ result.getMergeStatus());
+ assertFalse(folder1.exists());
+ }
+
+ @Test
public void testFileModeMerge() throws Exception {
if (!FS.DETECTED.supportsExecute())
return;
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/ResolveMergerTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/ResolveMergerTest.java
new file mode 100644
index 0000000..4cb0896
--- /dev/null
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/ResolveMergerTest.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright (C) 2012, Robin Stocker <robin@nibor.org>
+ * and other copyright owners as documented in the project's IP log.
+ *
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Distribution License v1.0 which
+ * accompanies this distribution, is reproduced below, and is
+ * available at http://www.eclipse.org/org/documents/edl-v10.php
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided
+ * with the distribution.
+ *
+ * - Neither the name of the Eclipse Foundation, Inc. nor the
+ * names of its contributors may be used to endorse or promote
+ * products derived from this software without specific prior
+ * written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+ * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.eclipse.jgit.merge;
+
+import static org.junit.Assert.assertFalse;
+
+import java.io.File;
+
+import org.eclipse.jgit.api.Git;
+import org.eclipse.jgit.lib.RepositoryTestCase;
+import org.eclipse.jgit.revwalk.RevCommit;
+import org.eclipse.jgit.treewalk.FileTreeIterator;
+import org.eclipse.jgit.util.FileUtils;
+import org.junit.Test;
+
+public class ResolveMergerTest extends RepositoryTestCase {
+
+ @Test
+ public void failingPathsShouldNotResultInOKReturnValue() throws Exception {
+ File folder1 = new File(db.getWorkTree(), "folder1");
+ FileUtils.mkdir(folder1);
+ File file = new File(folder1, "file1.txt");
+ write(file, "folder1--file1.txt");
+ file = new File(folder1, "file2.txt");
+ write(file, "folder1--file2.txt");
+
+ Git git = new Git(db);
+ git.add().addFilepattern(folder1.getName()).call();
+ RevCommit base = git.commit().setMessage("adding folder").call();
+
+ recursiveDelete(folder1);
+ git.rm().addFilepattern("folder1/file1.txt")
+ .addFilepattern("folder1/file2.txt").call();
+ RevCommit other = git.commit()
+ .setMessage("removing folders on 'other'").call();
+
+ git.checkout().setName(base.name()).call();
+
+ file = new File(db.getWorkTree(), "unrelated.txt");
+ write(file, "unrelated");
+
+ git.add().addFilepattern("unrelated").call();
+ RevCommit head = git.commit().setMessage("Adding another file").call();
+
+ // Untracked file to cause failing path for delete() of folder1
+ file = new File(folder1, "file3.txt");
+ write(file, "folder1--file3.txt");
+
+ ResolveMerger merger = new ResolveMerger(db, false);
+ merger.setCommitNames(new String[] { "BASE", "HEAD", "other" });
+ merger.setWorkingTreeIterator(new FileTreeIterator(db));
+ boolean ok = merger.merge(head.getId(), other.getId());
+
+ assertFalse(merger.getFailingPaths().isEmpty());
+ assertFalse(ok);
+ }
+
+}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java
index 7b1b36c..2410d6f 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java
@@ -126,6 +126,8 @@ public enum MergeFailureReason {
private Map<String, DirCacheEntry> toBeCheckedOut = new HashMap<String, DirCacheEntry>();
+ private List<String> toBeDeleted = new ArrayList<String>();
+
private Map<String, MergeResult<? extends Sequence>> mergeResults = new HashMap<String, MergeResult<? extends Sequence>>();
private Map<String, MergeFailureReason> failingPaths = new HashMap<String, MergeFailureReason>();
@@ -221,7 +223,7 @@ protected boolean mergeImpl() throws IOException {
builder = null;
}
- if (getUnmergedPaths().isEmpty()) {
+ if (getUnmergedPaths().isEmpty() && !failed()) {
resultTree = dircache.writeTree(getObjectInserter());
return true;
} else {
@@ -240,16 +242,21 @@ private void checkout() throws NoWorkTreeException, IOException {
for (Map.Entry<String, DirCacheEntry> entry : toBeCheckedOut
.entrySet()) {
File f = new File(db.getWorkTree(), entry.getKey());
- if (entry.getValue() != null) {
- createDir(f.getParentFile());
- DirCacheCheckout.checkoutEntry(db, f, entry.getValue(), r);
- } else {
- if (!f.delete())
- failingPaths.put(entry.getKey(),
- MergeFailureReason.COULD_NOT_DELETE);
- }
+ createDir(f.getParentFile());
+ DirCacheCheckout.checkoutEntry(db, f, entry.getValue(), r);
modifiedFiles.add(entry.getKey());
}
+ // Iterate in reverse so that "folder/file" is deleted before
+ // "folder". Otherwise this could result in a failing path because
+ // of a non-empty directory, for which delete() would fail.
+ for (int i = toBeDeleted.size() - 1; i >= 0; i--) {
+ String fileName = toBeDeleted.get(i);
+ File f = new File(db.getWorkTree(), fileName);
+ if (!f.delete())
+ failingPaths.put(fileName,
+ MergeFailureReason.COULD_NOT_DELETE);
+ modifiedFiles.add(fileName);
+ }
} finally {
r.release();
}
@@ -441,7 +448,7 @@ private boolean processEntry(CanonicalTreeParser base,
} else if (modeT == 0 && modeB != 0) {
// we want THEIRS ... but THEIRS contains the deletion of the
// file
- toBeCheckedOut.put(tw.getPathString(), null);
+ toBeDeleted.add(tw.getPathString());
return true;
}
}
