diff options
| author | Robin Rosenberg <robin.rosenberg@dewire.com> | 2013-04-25 17:45:35 -0400 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> | 2013-04-25 17:45:35 -0400 |
| commit | 2af9a4c7b1b2581fd55722d69185d5be114f84e2 (patch) | |
| tree | f54462bd088efd058e5418fedc01942b4e6aad71 /org.eclipse.jgit | |
| parent | 3699ea648ef900ce845af61ab29f8225c530b60b (diff) | |
| parent | a50ed5666ff41b2b08d09adffad5368b33871e45 (diff) | |
| download | jgit-2af9a4c7b1b2581fd55722d69185d5be114f84e2.tar.gz jgit-2af9a4c7b1b2581fd55722d69185d5be114f84e2.zip | |
Merge "status: Print conflict description for unmerged paths"
Diffstat (limited to 'org.eclipse.jgit')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/api/Status.java | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/Status.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/Status.java index cb2ae6bf01..e840c2f608 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/Status.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/Status.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011, Christian Halstrick <christian.halstrick@sap.com> + * Copyright (C) 2011, 2013 Christian Halstrick <christian.halstrick@sap.com> * and other copyright owners as documented in the project's IP log. * * This program and the accompanying materials are made available @@ -43,9 +43,11 @@ package org.eclipse.jgit.api; import java.util.Collections; +import java.util.Map; import java.util.Set; import org.eclipse.jgit.lib.IndexDiff; +import org.eclipse.jgit.lib.IndexDiff.StageState; /** * A class telling where the working-tree, the index and the current HEAD differ @@ -153,6 +155,14 @@ public class Status { } /** + * @return a map from conflicting path to its {@link StageState}. + * @since 3.0 + */ + public Map<String, StageState> getConflictingStageState() { + return Collections.unmodifiableMap(diff.getConflictingStageStates()); + } + + /** * @return set of files and folders that are ignored and not in the index. */ public Set<String> getIgnoredNotInIndex() { |