Expose conflicting files in CheckoutConflictException

Change-Id: I5b3b7b0633354d5ccf0c6c320c0df9c93fdf8eeb
Signed-off-by: Ned Twigg <ned.twigg@diffplug.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/DirCacheCheckoutTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/DirCacheCheckoutTest.java
index 5578c03d4a656286b8b8157217ee6bcd33d7c91a..fbe7dd04178945c2750c63ddc05eb099e738bf89 100644 (file)
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/DirCacheCheckoutTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/DirCacheCheckoutTest.java
@@ -798,6 +798,7 @@ public class DirCacheCheckoutTest extends RepositoryTestCase {
                        fail("didn't get the expected exception");
                } catch (CheckoutConflictException e) {
                        assertConflict("foo");
+                       assertEquals("foo", e.getConflictingFiles()[0]);
                        assertWorkDir(mkmap("foo", "bar", "other", "other"));
                        assertIndex(mk("other"));
                }
@@ -885,6 +886,7 @@ public class DirCacheCheckoutTest extends RepositoryTestCase {
                        assertWorkDir(mkmap("a", "a", "b/c", "b/c", "d", "d", "e/f",
                                        "e/f", "e/g", "e/g3"));
                        assertConflict("e/g");
+                       assertEquals("e/g", e.getConflictingFiles()[0]);
                }
        }
 

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/errors/CheckoutConflictException.java b/org.eclipse.jgit/src/org/eclipse/jgit/errors/CheckoutConflictException.java
index db29f3f15b2a167de9f0f785ad02dd024dd82d9d..b6010b6983565202d641ed44f917a84214f23333 100644 (file)
--- a/org.eclipse.jgit/src/org/eclipse/jgit/errors/CheckoutConflictException.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/errors/CheckoutConflictException.java
@@ -56,6 +56,8 @@ import org.eclipse.jgit.internal.JGitText;
 public class CheckoutConflictException extends IOException {
        private static final long serialVersionUID = 1L;
 
+       private final String[] conflicting;
+
        /**
         * Construct a CheckoutConflictException for the specified file
         *
@@ -63,6 +65,7 @@ public class CheckoutConflictException extends IOException {
         */
        public CheckoutConflictException(String file) {
                super(MessageFormat.format(JGitText.get().checkoutConflictWithFile, file));
+               conflicting = new String[] { file };
        }
 
        /**
@@ -72,6 +75,16 @@ public class CheckoutConflictException extends IOException {
         */
        public CheckoutConflictException(String[] files) {
                super(MessageFormat.format(JGitText.get().checkoutConflictWithFiles, buildList(files)));
+               conflicting = files;
+       }
+
+       /**
+        * @return the relative paths of the conflicting files (relative to the
+        *         working directory root).
+        * @since 4.4
+        */
+       public String[] getConflictingFiles() {
+               return conflicting;
        }
 
        private static String buildList(String[] files) {