From eb5911c688e6ca2eb2031978f7ef344da8ba053e Mon Sep 17 00:00:00 2001 From: Nadya Zabrodina Date: Thu, 14 Nov 2013 18:31:25 +0400 Subject: [PATCH] Show branch name only once in case of multiple heads ( in status bar widget and log branch filter). --- .../hg4idea/src/org/zmlx/hg4idea/util/HgUtil.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/util/HgUtil.java b/plugins/hg4idea/src/org/zmlx/hg4idea/util/HgUtil.java index bbc3ef4be06a..318125960c3e 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/util/HgUtil.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/util/HgUtil.java @@ -620,12 +620,14 @@ public abstract class HgUtil { } public static List getNamesWithoutHashes(Collection namesWithHashes) { - return ContainerUtil.map(namesWithHashes, new Function() { - @Override - public String fun(HgNameWithHashInfo info) { - return info.getName(); + //return names without duplication (actually for several heads in one branch) + List names = new ArrayList(); + for (HgNameWithHashInfo hash : namesWithHashes) { + if (!names.contains(hash.getName())) { + names.add(hash.getName()); } - }); + } + return names; } @NotNull