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
This commit is contained in:
Kirill Likhodedov
2016-06-25 18:01:03 +03:00
parent 3031ab0227
commit 6646f04e53
@@ -23,6 +23,7 @@ import com.intellij.openapi.project.Project;
import com.intellij.openapi.project.ex.ProjectManagerEx; import com.intellij.openapi.project.ex.ProjectManagerEx;
import com.intellij.openapi.vcs.changes.ChangeListManager; import com.intellij.openapi.vcs.changes.ChangeListManager;
import com.intellij.openapi.vcs.changes.ChangeListManagerEx; import com.intellij.openapi.vcs.changes.ChangeListManagerEx;
import com.intellij.util.continuation.SemaphoreContinuationContext;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import static com.intellij.openapi.application.ModalityState.defaultModalityState; import static com.intellij.openapi.application.ModalityState.defaultModalityState;
@@ -93,7 +94,8 @@ public class GitFreezingProcess {
} }
private void freeze() { 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() { private void unfreeze() {