From fc0ecd251c4984f4a35dd1b0ebaf7ad7dea5cc97 Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Thu, 24 Sep 2015 18:03:07 +0300 Subject: [PATCH] [git] GitPullDialog#getRemoteBranches: silently return on task cancelling --- .../git4idea/src/git4idea/merge/GitPullDialog.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/plugins/git4idea/src/git4idea/merge/GitPullDialog.java b/plugins/git4idea/src/git4idea/merge/GitPullDialog.java index 734255ab6811..62bb9284150a 100644 --- a/plugins/git4idea/src/git4idea/merge/GitPullDialog.java +++ b/plugins/git4idea/src/git4idea/merge/GitPullDialog.java @@ -19,9 +19,7 @@ import com.intellij.icons.AllIcons; import com.intellij.ide.util.ElementsChooser; import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.diagnostic.Logger; -import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.progress.ProgressManager; -import com.intellij.openapi.progress.Task; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.Messages; @@ -131,15 +129,17 @@ public class GitPullDialog extends DialogWrapper { @Nullable private Collection getRemoteBranches(@NotNull final GitRemote remote) { final Ref result = Ref.create(); - ProgressManager.getInstance().run(new Task.Modal(myProject, GitBundle.getString("pull.getting.remote.branches"), true) { + boolean completed = ProgressManager.getInstance().runProcessWithProgressSynchronously(new Runnable() { @Override - public void run(@NotNull ProgressIndicator indicator) { - indicator.setIndeterminate(true); + public void run() { result.set(myGit.lsRemote(GitPullDialog.this.myProject, gitRoot(), remote, "--heads")); } - }); + }, GitBundle.getString("pull.getting.remote.branches"), true, myProject); - if (!result.isNull() && result.get().success()) { + if (!completed) { + return null; + } + else if (!result.isNull() && result.get().success()) { try { return parseRemoteBranches(remote, result.get().getOutput()); }