From 740b6b193732e6ef8fe240376e4bdcdf17571e95 Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Mon, 26 May 2014 18:59:33 +0400
Subject: [PATCH] [log] IDEA-125578 Handle empty permanent graph

---
 .../com/intellij/vcs/log/data/DataPack.java   | 21 +++++++------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/DataPack.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/DataPack.java
index a3cb610d42d6..48b25be01ab9 100644
--- a/platform/vcs-log/impl/src/com/intellij/vcs/log/data/DataPack.java
+++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/data/DataPack.java
@@ -26,20 +26,10 @@ public class DataPack implements VcsLogDataPack {
   private boolean myFull;
 
   @NotNull
-  static DataPack build(@NotNull List<? extends GraphCommit<Integer>> commits,
-                               @NotNull RefsModel refsModel,
-                               @NotNull NotNullFunction<Hash, Integer> indexGetter,
-                               @NotNull NotNullFunction<Integer, Hash> hashGetter, 
-                               @NotNull Map<VirtualFile, VcsLogProvider> providers,
-                               boolean full) {
-    PermanentGraph<Integer> permanentGraph;
-    if (!commits.isEmpty()) {
-      permanentGraph = buildPermanentGraph(commits, refsModel, indexGetter, hashGetter, providers);
-    }
-    else {
-      permanentGraph = EmptyPermanentGraph.getInstance();
-    }
-    return build(permanentGraph, providers, refsModel, full);
+  static DataPack build(@NotNull List<? extends GraphCommit<Integer>> commits, @NotNull RefsModel refsModel,
+                        @NotNull NotNullFunction<Hash, Integer> indexGetter, @NotNull NotNullFunction<Integer, Hash> hashGetter,
+                        @NotNull Map<VirtualFile, VcsLogProvider> providers, boolean full) {
+    return build(buildPermanentGraph(commits, refsModel, indexGetter, hashGetter, providers), providers, refsModel, full);
   }
 
   @NotNull
@@ -72,6 +62,9 @@ public class DataPack implements VcsLogDataPack {
                                                      @NotNull NotNullFunction<Hash, Integer> indexGetter,
                                                      @NotNull NotNullFunction<Integer, Hash> hashGetter,
                                                      @NotNull Map<VirtualFile, VcsLogProvider> providers) {
+    if (commits.isEmpty()) {
+      return EmptyPermanentGraph.getInstance();
+    }
     GraphColorManagerImpl colorManager = new GraphColorManagerImpl(refsModel, hashGetter, getRefManagerMap(providers));
     Set<Integer> branches = getBranchCommitHashIndexes(refsModel.getAllRefs(), indexGetter);
     StopWatch sw = StopWatch.start("building graph");