diff options
Diffstat (limited to 'platform/dvcs-api/src/com/intellij/dvcs/repo/Repository.java')
| -rw-r--r-- | platform/dvcs-api/src/com/intellij/dvcs/repo/Repository.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/platform/dvcs-api/src/com/intellij/dvcs/repo/Repository.java b/platform/dvcs-api/src/com/intellij/dvcs/repo/Repository.java index 47cc17866c08..a71df5c39307 100644 --- a/platform/dvcs-api/src/com/intellij/dvcs/repo/Repository.java +++ b/platform/dvcs-api/src/com/intellij/dvcs/repo/Repository.java @@ -48,12 +48,9 @@ import org.jetbrains.annotations.Nullable; * If one needs a really 100 % up-to-date value, one should call {@link #update()} and then get...(). * update() is a synchronous read from repository file (.git or .hg), so it is guaranteed to query the real value. * </p> - * - * @author Nadya Zabrodina */ public interface Repository extends Disposable { - /** * Current state of the repository. */ @@ -62,24 +59,29 @@ public interface Repository extends Disposable { * HEAD is on branch, no merge process is in progress (and no rebase as well). */ NORMAL, + /** * During merge (for instance, merge failed with conflicts that weren't immediately resolved). */ MERGING { + @NotNull @Override public String toString() { return "Merging"; } }, + /** * During rebase. */ REBASING { + @NotNull @Override public String toString() { return "Rebasing"; } }, + /** * Detached HEAD state, but not during rebase (for example, manual checkout of a commit hash). */ @@ -99,6 +101,9 @@ public interface Repository extends Disposable { State getState(); @Nullable + String getCurrentBranchName(); + + @Nullable AbstractVcs getVcs(); /** |