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

IDEA-77414 Fix Git pull hang: don't fire new Task under the Task.Modal, just execute synchronously.

Browse Source
This commit is contained in:
Kirill Likhodedov
2011-11-23 13:18:11 +03:00
parent 9b7b005241
commit b9b477c1ba
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/src/git4idea/actions/GitPull.java
+3 -2
View File
@@ -68,7 +68,7 @@ public class GitPull extends GitRepositoryAction {
final Label beforeLabel = LocalHistory.getInstance().putSystemLabel(project, "Before update");
final AtomicReference<GitLineHandler> handlerReference = new AtomicReference<GitLineHandler>();
new Task.Modal(project, GitBundle.message("pulling.title", dialog.getRemote()), false) {
new Task.Modal(project, GitBundle.message("pulling.title", dialog.getRemote()), true) {
@Override
public void run(@NotNull ProgressIndicator indicator) {
GitRepository repository = GitRepositoryManager.getInstance(project).getRepositoryForRoot(dialog.gitRoot());
@@ -103,8 +103,9 @@ public class GitPull extends GitRepositoryAction {
final GitRevisionNumber currentRev = new GitRevisionNumber(revision);
GitTask pullTask = new GitTask(project, handlerReference.get(), GitBundle.message("pulling.title", dialog.getRemote()));
pullTask.setProgressIndicator(indicator);
pullTask.setProgressAnalyzer(new GitStandardProgressAnalyzer());
pullTask.executeModal(new GitTaskResultHandlerAdapter() {
pullTask.execute(true, false, new GitTaskResultHandlerAdapter() {
@Override
protected void onSuccess() {
GitMergeUtil.showUpdates(GitPull.this, project, exceptions, root, currentRev, beforeLabel, getActionName(), ActionInfo.UPDATE);