From 0d98e42d7463dfa93ae22252d39ac0aeaf6d6487 Mon Sep 17 00:00:00 2001 From: Nadya Zabrodina Date: Thu, 20 Nov 2014 19:35:07 +0300 Subject: [PATCH] only opened branches should be shown as common in branches widget --- .../src/org/zmlx/hg4idea/branch/HgBranchUtil.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/branch/HgBranchUtil.java b/plugins/hg4idea/src/org/zmlx/hg4idea/branch/HgBranchUtil.java index 5026cd4f600d..9378e05bb41f 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/branch/HgBranchUtil.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/branch/HgBranchUtil.java @@ -16,13 +16,15 @@ package org.zmlx.hg4idea.branch; import com.intellij.util.containers.ContainerUtil; -import com.intellij.vcs.log.Hash; import org.jetbrains.annotations.NotNull; import org.zmlx.hg4idea.HgNameWithHashInfo; import org.zmlx.hg4idea.repo.HgRepository; import org.zmlx.hg4idea.util.HgUtil; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; public class HgBranchUtil { @@ -33,8 +35,7 @@ public class HgBranchUtil { public static List getCommonBranches(@NotNull Collection repositories) { Collection commonBranches = null; for (HgRepository repository : repositories) { - Map> branchesWithHashes = repository.getBranches(); - Collection names = branchesWithHashes.keySet(); + Collection names = repository.getOpenedBranches(); if (commonBranches == null) { commonBranches = names; }