From 1d707f3a6363235ecbf64350fb6e226214cd8188 Mon Sep 17 00:00:00 2001
From: irengrig <Irina.Chernushina@jetbrains.com>
Date: Wed, 4 May 2011 14:19:08 +0400
Subject: [PATCH] Git log: 1) always load short form of skeleton; further load
 details 2) preload 15 instead of 5 commits with details in first step
 [review=kirill.safonov] (cherry picked from commit
 c521f078d40ce026242fa9ad8aaafea3e8579376)

---
 .../src/git4idea/history/wholeTree/LoadAlgorithm.java         | 2 +-
 .../git4idea/history/wholeTree/LoaderAndRefresherImpl.java    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/git4idea/src/git4idea/history/wholeTree/LoadAlgorithm.java b/plugins/git4idea/src/git4idea/history/wholeTree/LoadAlgorithm.java
index e275a048ba3d..9e3ff496e62e 100644
--- a/plugins/git4idea/src/git4idea/history/wholeTree/LoadAlgorithm.java
+++ b/plugins/git4idea/src/git4idea/history/wholeTree/LoadAlgorithm.java
@@ -114,7 +114,7 @@ public class LoadAlgorithm {
     protected void processResult(Result result) {
       assert LoadType.TEST.equals(myState.myValue);
 
-      myState.takeDecision(result.getTime() > ourTestTimeThreshold);
+      myState.takeDecision(false);
     }
   }
 
diff --git a/plugins/git4idea/src/git4idea/history/wholeTree/LoaderAndRefresherImpl.java b/plugins/git4idea/src/git4idea/history/wholeTree/LoaderAndRefresherImpl.java
index 499dd13e0584..5328e7b5525b 100644
--- a/plugins/git4idea/src/git4idea/history/wholeTree/LoaderAndRefresherImpl.java
+++ b/plugins/git4idea/src/git4idea/history/wholeTree/LoaderAndRefresherImpl.java
@@ -33,7 +33,7 @@ import java.util.*;
  * @author irengrig
  */
 public class LoaderAndRefresherImpl implements LoaderAndRefresher<CommitHashPlusParents> {
-  private final static int ourTestCount = 5;
+  private final static int ourFirstLoadCount = 15;
   private final static int ourPreload = (! parameterCheck(Integer.getInteger("git.log.preload.size"))) ? 100 : Integer.getInteger("git.log.preload.size");
 
   private final Collection<String> myStartingPoints;
@@ -144,7 +144,7 @@ public class LoaderAndRefresherImpl implements LoaderAndRefresher<CommitHashPlus
     int count = MediatorImpl.ourManyLoadedStep;
     boolean shouldFull = true;
     if (LoadAlgorithm.LoadType.TEST.equals(loadType)) {
-      count = ourTestCount;
+      count = ourFirstLoadCount;
     } else if (LoadAlgorithm.LoadType.SHORT.equals(loadType) || LoadAlgorithm.LoadType.SHORT_START.equals(loadType)) {
       shouldFull = false;
     } else if (LoadAlgorithm.LoadType.FULL_PREVIEW.equals(loadType)) {