1 files changed, 12 insertions, 10 deletions
diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/util/HgUtil.java b/plugins/hg4idea/src/org/zmlx/hg4idea/util/HgUtil.java
index 3bb14721f0a8..fcf275f70703 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/util/HgUtil.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/util/HgUtil.java
@@ -41,6 +41,7 @@ import com.intellij.openapi.wm.StatusBar;
 import com.intellij.openapi.wm.WindowManager;
 import com.intellij.openapi.wm.impl.status.StatusBarUtil;
 import com.intellij.ui.GuiUtils;
+import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.vcsUtil.VcsUtil;
 import org.jetbrains.annotations.NotNull;
@@ -584,16 +585,7 @@ public abstract class HgUtil {
     if (state != HgRepository.State.NORMAL) {
       branchText += state.toString() + " ";
     }
-    return branchText + getActiveBranchName(repository);
-  }
-
-  @NotNull
-  public static String getActiveBranchName(@NotNull HgRepository repository) {
-    String branchOrBookMarkName = repository.getCurrentBookmark();
-    if (StringUtil.isEmptyOrSpaces(branchOrBookMarkName)) {
-      branchOrBookMarkName = repository.getCurrentBranch();
-    }
-    return branchOrBookMarkName;
+    return branchText + repository.getCurrentBranchName();
   }
 
   @NotNull
@@ -716,4 +708,14 @@ public abstract class HgUtil {
     }
     return Couple.of(userName, email);
   }
+
+  @NotNull
+  public static List<String> getTargetNames(@NotNull HgRepository repository) {
+    return ContainerUtil.sorted(ContainerUtil.map(repository.getRepositoryConfig().getPaths(), new Function<String, String>() {
+      @Override
+      public String fun(String s) {
+        return removePasswordIfNeeded(s);
+      }
+    }));
+  }
 }