Added support to IndexDiff to return information on conflicts

Change-Id: I43c13eb72a44f80135c93525fce0c0280b0e64a2
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>

1 files changed, 17 insertions, 0 deletions

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/IndexDiff.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/IndexDiff.java
index 73bda08581..b2c05ae5f7 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/IndexDiff.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/IndexDiff.java
@@ -52,6 +52,7 @@ import java.util.HashSet;
 import java.util.Set;
 
 import org.eclipse.jgit.dircache.DirCache;
+import org.eclipse.jgit.dircache.DirCacheEntry;
 import org.eclipse.jgit.dircache.DirCacheIterator;
 import org.eclipse.jgit.errors.IncorrectObjectTypeException;
 import org.eclipse.jgit.errors.MissingObjectException;
@@ -76,6 +77,7 @@ import org.eclipse.jgit.treewalk.filter.TreeFilter;
  * <li>removed files</li>
  * <li>missing files</li>
  * <li>modified files</li>
+ * <li>conflicting files</li>
  * <li>untracked files</li>
  * <li>files with assume-unchanged flag</li>
  * </ul>
@@ -153,6 +155,8 @@ public class IndexDiff {
 
 	private Set<String> untracked = new HashSet<String>();
 
+	private Set<String> conflicts = new HashSet<String>();
+
 	private Set<String> assumeUnchanged;
 
 	private DirCache dirCache;
@@ -320,6 +324,12 @@ public class IndexDiff {
 						modified.add(treeWalk.getPathString());
 					}
 				}
+
+				final DirCacheEntry dirCacheEntry = dirCacheIterator
+						.getDirCacheEntry();
+				if (dirCacheEntry != null && dirCacheEntry.getStage() > 0) {
+					conflicts.add(treeWalk.getPathString());
+				}
 			}
 		}
 
@@ -378,6 +388,13 @@ public class IndexDiff {
 	}
 
 	/**
+	 * @return list of files that are in conflict
+	 */
+	public Set<String> getConflicting() {
+		return conflicts;
+	}
+
+	/**
 	 * @return list of files with the flag assume-unchanged
 	 */
 	public Set<String> getAssumeUnchanged() {