From d3d1d297f86017318c66e1468d8ea8567672f63e Mon Sep 17 00:00:00 2001
From: Julia Beliaeva <Julia.Beliaeva@jetbrains.com>
Date: Thu, 28 Jul 2016 21:55:48 +0300
Subject: [PATCH] [vcs-log] sort tags and show the first one, not the random
 one in the table

---
 .../log/ui/render/GraphCommitCellRenderer.java   | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/render/GraphCommitCellRenderer.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/render/GraphCommitCellRenderer.java
index 658c3c35e5c6..3077e5f88d43 100644
--- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/render/GraphCommitCellRenderer.java
+++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/render/GraphCommitCellRenderer.java
@@ -151,8 +151,16 @@ public class GraphCommitCellRenderer extends ColoredTableCellRenderer {
     }
     VirtualFile root = refs.iterator().next().getRoot(); // all refs are from the same commit => they have the same root
     refs = ContainerUtil.sorted(refs, myLogData.getLogProvider(root).getReferenceManager().getLabelsOrderComparator());
-    List<VcsRef> branches = getBranches(refs);
-    Collection<VcsRef> tags = ContainerUtil.subtract(refs, branches);
+    List<VcsRef> branches = ContainerUtil.newArrayList();
+    List<VcsRef> tags = ContainerUtil.newArrayList();
+    refs.forEach(ref -> {
+      if (ref.getType().isBranch()) {
+        branches.add(ref);
+      }
+      else {
+        tags.add(ref);
+      }
+    });
     return getLabelsForRefs(branches, tags);
   }
 
@@ -186,10 +194,6 @@ public class GraphCommitCellRenderer extends ColoredTableCellRenderer {
     return labels;
   }
 
-  private static List<VcsRef> getBranches(Collection<VcsRef> refs) {
-    return ContainerUtil.filter(refs, ref -> ref.getType().isBranch());
-  }
-
   private static class PaintInfo {
     private int myWidth;
     @NotNull private Image myImage;