Make ApplyCommand create missing parent directories for new files

Otherwise applying will fail with a FileNotFoundException, because
File.createNewFile() fails with missing parents.

Contains change & according test.

Change-Id: I970522b549b8bb260ca6720da11f12c57ee8a492
Signed-off-by: Chris Aniszczyk <zx@twitter.com>

diff --git a/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/A1_sub.patch b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/A1_sub.patch
new file mode 100644 (file)
index 0000000..09867f3
--- /dev/null
+++ b/org.eclipse.jgit.test/tst-rsrc/org/eclipse/jgit/diff/A1_sub.patch
@@ -0,0 +1,9 @@
+diff --git a/sub/A1 b/sub/A1
+new file mode 100644
+index 0000000..de98044
+--- /dev/null
++++ b/sub/A1
+@@ -0,0 +1,3 @@
++a
++b
++c

diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/ApplyCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/ApplyCommandTest.java
index 16c0a9b4477c20f31296978f609f4201c318888e..3c38edb86e5c0f63e6f0d04251997994691c7d4a 100644 (file)
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/ApplyCommandTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/ApplyCommandTest.java
@@ -111,6 +111,14 @@ public class ApplyCommandTest extends RepositoryTestCase {
                                b.getString(0, b.size(), false));
        }
 
+       @Test
+       public void testAddA1Sub() throws Exception {
+               ApplyResult result = init("A1_sub", false, false);
+               assertEquals(1, result.getUpdatedFiles().size());
+               assertEquals(new File(db.getWorkTree(), "sub/A1"), result
+                               .getUpdatedFiles().get(0));
+       }
+
        @Test
        public void testDeleteD() throws Exception {
                ApplyResult result = init("D", true, false);

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/ApplyCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/ApplyCommand.java
index 32abf86edc4636261ca42d43b6ee596dcffafec6..e6070eccf83bd73e801f3b5ad4c9a6d67d283637 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/ApplyCommand.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/ApplyCommand.java
@@ -167,6 +167,8 @@ public class ApplyCommand extends GitCommand<ApplyResult> {
                File f = new File(getRepository().getWorkTree(), path);
                if (create)
                        try {
+                               File parent = f.getParentFile();
+                               FileUtils.mkdirs(parent, true);
                                FileUtils.createNewFile(f);
                        } catch (IOException e) {
                                throw new PatchApplyException(MessageFormat.format(