From 6646f04e53d94d498238df0a2af0d771dea15a53 Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Sat, 25 Jun 2016 17:57:14 +0300 Subject: [PATCH] IDEA-156339 Use freeze instead of freezeImmediately freezeImmediately doesn't work as it was expected: although it freezes current update procedure, it doesn't affect pre-processing of changelists which is done in LocalChangeListImpl#startProcessingChanges --- plugins/git4idea/src/git4idea/util/GitFreezingProcess.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/git4idea/src/git4idea/util/GitFreezingProcess.java b/plugins/git4idea/src/git4idea/util/GitFreezingProcess.java index b3b1a26ce3d9..96f6bb246df3 100644 --- a/plugins/git4idea/src/git4idea/util/GitFreezingProcess.java +++ b/plugins/git4idea/src/git4idea/util/GitFreezingProcess.java @@ -23,6 +23,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.project.ex.ProjectManagerEx; import com.intellij.openapi.vcs.changes.ChangeListManager; import com.intellij.openapi.vcs.changes.ChangeListManagerEx; +import com.intellij.util.continuation.SemaphoreContinuationContext; import org.jetbrains.annotations.NotNull; import static com.intellij.openapi.application.ModalityState.defaultModalityState; @@ -93,7 +94,8 @@ public class GitFreezingProcess { } private void freeze() { - myChangeListManager.freezeImmediately("Local changes are not available until Git " + myOperationTitle + " is finished."); + myChangeListManager.freeze(new SemaphoreContinuationContext(), + "Local changes are not available until Git " + myOperationTitle + " is finished."); } private void unfreeze() {