MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[git] GitPullDialog#getRemoteBranches: silently return on task cancelling

Browse Source
This commit is contained in:
Kirill Likhodedov
2015-09-24 18:33:49 +03:00
parent 41cabafcb8
commit fc0ecd251c
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/merge/GitPullDialog.java
+7 -7
View File
@@ -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<String> getRemoteBranches(@NotNull final GitRemote remote) {
final Ref<GitCommandResult> 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());
}