|
|
@@ -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) { |