From d0891b3ae564f7ada67df8e4ff7917fb6e38e205 Mon Sep 17 00:00:00 2001
From: Michael Golubev <michael.golubev@jetbrains.com>
Date: Mon, 26 May 2014 16:23:38 +0200
Subject: [PATCH] IDEA-125580 - OpenShift: cloning application hangs if switch
 to another process

---
 .../util/CloudGitDeploymentRuntime.java       | 29 ++++++++++++++-----
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/plugins/git4idea/remote-servers-git/src/com/intellij/remoteServer/util/CloudGitDeploymentRuntime.java b/plugins/git4idea/remote-servers-git/src/com/intellij/remoteServer/util/CloudGitDeploymentRuntime.java
index f5b55cdf767c..74c023241847 100644
--- a/plugins/git4idea/remote-servers-git/src/com/intellij/remoteServer/util/CloudGitDeploymentRuntime.java
+++ b/plugins/git4idea/remote-servers-git/src/com/intellij/remoteServer/util/CloudGitDeploymentRuntime.java
@@ -144,13 +144,7 @@ public class CloudGitDeploymentRuntime extends CloudDeploymentRuntime {
   }
 
   public void downloadExistingApplication() throws ServerRuntimeException {
-    CloudGitApplication application = findApplication();
-    if (application == null) {
-      throw new ServerRuntimeException("Can't find the application: " + getApplicationName());
-    }
-
-    new CloneJobWithRemote().cloneToModule(application.getGitUrl());
-
+    new CloneJobWithRemote().cloneToModule(getApplication().getGitUrl());
     getRepository().update();
     refreshContentRoot();
   }
@@ -232,8 +226,13 @@ public class CloudGitDeploymentRuntime extends CloudDeploymentRuntime {
   }
 
   protected void pushApplication(@NotNull CloudGitApplication application) throws ServerRuntimeException {
+    push(application, getRepository(), getRemoteName());
+  }
+
+  protected void push(@NotNull CloudGitApplication application, @NotNull GitRepository repository, @NotNull String remote)
+    throws ServerRuntimeException {
     GitCommandResult gitPushResult
-      = getGit().push(getRepository(), getRemoteName(), application.getGitUrl(), "master:master", createGitLineHandlerListener());
+      = getGit().push(repository, remote, application.getGitUrl(), "master:master", createGitLineHandlerListener());
     checkGitResult(gitPushResult);
   }
 
@@ -250,6 +249,7 @@ public class CloudGitDeploymentRuntime extends CloudDeploymentRuntime {
     final VirtualFile contentRoot = getRepositoryRoot();
     GitRepository repository = getRepository();
     final GitLineHandler fetchHandler = new GitLineHandler(getProject(), contentRoot, GitCommand.FETCH);
+    fetchHandler.setUrl(getApplication().getGitUrl());
     fetchHandler.setSilent(false);
     fetchHandler.addParameters(getRemoteName());
     fetchHandler.addLineListener(createGitLineHandlerListener());
@@ -333,6 +333,11 @@ public class CloudGitDeploymentRuntime extends CloudDeploymentRuntime {
     });
   }
 
+  public void fetchAndRefresh() throws ServerRuntimeException {
+    fetch();
+    refreshContentRoot();
+  }
+
   private String getRemoteName() {
     if (myRemoteName == null) {
       myRemoteName = myDefaultRemoteName;
@@ -354,6 +359,14 @@ public class CloudGitDeploymentRuntime extends CloudDeploymentRuntime {
     });
   }
 
+  protected CloudGitApplication getApplication() throws ServerRuntimeException {
+    CloudGitApplication application = findApplication();
+    if (application == null) {
+      throw new ServerRuntimeException("Can't find the application: " + getApplicationName());
+    }
+    return application;
+  }
+
   protected CloudGitApplication createApplication() throws ServerRuntimeException {
     return getAgentTaskExecutor().execute(new Computable<CloudGitApplication>() {