From 4764046b1eb93a7a53931dbe72ccd09d71ab2ddf Mon Sep 17 00:00:00 2001
From: Aleksey Pivovarov <AMPivovarov@gmail.com>
Date: Thu, 1 Mar 2018 16:27:06 +0300
Subject: [PATCH] git: do not use mediator while preparing repository in tests

* this speeds up tests on windows agents
---
 .../src/git4idea/commands/GitLineHandler.java | 19 ++++++-------------
 .../src/git4idea/history/GitLogUtil.java      |  4 +++-
 .../tests/git4idea/test/GitExecutor.kt        |  1 +
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/plugins/git4idea/src/git4idea/commands/GitLineHandler.java b/plugins/git4idea/src/git4idea/commands/GitLineHandler.java
index f6dc3e648e24..5b172ee1763a 100644
--- a/plugins/git4idea/src/git4idea/commands/GitLineHandler.java
+++ b/plugins/git4idea/src/git4idea/commands/GitLineHandler.java
@@ -48,7 +48,7 @@ public class GitLineHandler extends GitTextHandler {
    * Line listeners
    */
   private final EventDispatcher<GitLineHandlerListener> myLineListeners = EventDispatcher.create(GitLineHandlerListener.class);
-  private final boolean myWithMediator;
+  private boolean myWithMediator = true;
 
   /**
    * Remote url which require authentication
@@ -58,29 +58,19 @@ public class GitLineHandler extends GitTextHandler {
 
   public GitLineHandler(@NotNull Project project, @NotNull File directory, @NotNull GitCommand command) {
     super(project, directory, command);
-    myWithMediator = true;
   }
 
   public GitLineHandler(@NotNull Project project,
                         @NotNull VirtualFile vcsRoot,
                         @NotNull GitCommand command) {
-    this(project, vcsRoot, command, Collections.emptyList());
+    super(project, vcsRoot, command);
   }
 
   public GitLineHandler(@NotNull Project project,
                         @NotNull VirtualFile vcsRoot,
                         @NotNull GitCommand command,
                         @NotNull List<String> configParameters) {
-    this(project, vcsRoot, command, configParameters, true);
-  }
-
-  public GitLineHandler(@NotNull Project project,
-                        @NotNull VirtualFile vcsRoot,
-                        @NotNull GitCommand command,
-                        @NotNull List<String> configParameters,
-                        boolean withMediator) {
     super(project, vcsRoot, command, configParameters);
-    myWithMediator = withMediator;
   }
 
   public GitLineHandler(@Nullable Project project,
@@ -89,7 +79,6 @@ public class GitLineHandler extends GitTextHandler {
                         @NotNull GitCommand command,
                         @NotNull List<String> configParameters) {
     super(project, directory, pathToExecutable, command, configParameters);
-    myWithMediator = true;
   }
 
   public void setUrl(@NotNull String url) {
@@ -117,6 +106,10 @@ public class GitLineHandler extends GitTextHandler {
     myIgnoreAuthenticationRequest = ignoreAuthenticationRequest;
   }
 
+  public void setWithMediator(boolean value) {
+    myWithMediator = value;
+  }
+
   protected void processTerminated(final int exitCode) {}
 
   public void addLineListener(GitLineHandlerListener listener) {
diff --git a/plugins/git4idea/src/git4idea/history/GitLogUtil.java b/plugins/git4idea/src/git4idea/history/GitLogUtil.java
index 5c0402bef542..2fa450eb0728 100644
--- a/plugins/git4idea/src/git4idea/history/GitLogUtil.java
+++ b/plugins/git4idea/src/git4idea/history/GitLogUtil.java
@@ -386,7 +386,9 @@ public class GitLogUtil {
 
   @NotNull
   private static GitLineHandler createGitHandler(@NotNull Project project, @NotNull VirtualFile root, @NotNull List<String> configParameters) {
-    return new GitLineHandler(project, root, GitCommand.LOG, configParameters, false);
+    GitLineHandler handler = new GitLineHandler(project, root, GitCommand.LOG, configParameters);
+    handler.setWithMediator(false);
+    return handler;
   }
 
   @NotNull
diff --git a/plugins/git4idea/tests/git4idea/test/GitExecutor.kt b/plugins/git4idea/tests/git4idea/test/GitExecutor.kt
index f11768b4c316..5191efc5b6e7 100644
--- a/plugins/git4idea/tests/git4idea/test/GitExecutor.kt
+++ b/plugins/git4idea/tests/git4idea/test/GitExecutor.kt
@@ -40,6 +40,7 @@ fun git(project: Project, command: String, ignoreNonZeroExitCode: Boolean = fals
   val workingDir = ourCurrentDir()
   val split = splitCommandInParameters(command)
   val handler = GitLineHandler(project, workingDir, getGitCommandInstance(split[0]))
+  handler.setWithMediator(false)
   handler.addParameters(split.subList(1, split.size))
 
   val result = Git.getInstance().runCommand(handler)