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

vcs: do not allow to cancel Rollback operation

Browse Source
This commit is contained in:
Aleksey Pivovarov
2018-05-13 00:26:06 +03:00
parent 67123829cd
commit d00ddfcd8f
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/RollbackWorker.java
+4 -6
View File
@@ -110,7 +110,7 @@ public class RollbackWorker {
final Runnable rollbackAction = new MyRollbackRunnable(otherChanges, deleteLocallyAddedFiles, afterRefresh);
if (ApplicationManager.getApplication().isDispatchThread() && !myInvokedFromModalContext) {
ProgressManager.getInstance().run(new Task.Backgroundable(myProject, myOperationName, true,
ProgressManager.getInstance().run(new Task.Backgroundable(myProject, myOperationName, false,
new PerformInBackgroundOption() {
@Override
public boolean shouldStartInBackground() {
@@ -128,7 +128,7 @@ public class RollbackWorker {
});
}
else if (myInvokedFromModalContext) {
ProgressManager.getInstance().run(new Task.Modal(myProject, myOperationName, true) {
ProgressManager.getInstance().run(new Task.Modal(myProject, myOperationName, false) {
@Override
public void run(@NotNull ProgressIndicator indicator) {
rollbackAction.run();
@@ -180,7 +180,7 @@ public class RollbackWorker {
doRun();
}
finally {
ChangesUtil.markInternalOperation(myChanges, false);
ChangesUtil.markInternalOperation(myChanges, false);
}
}
@@ -221,9 +221,7 @@ public class RollbackWorker {
myIndicator.setText(VcsBundle.message("progress.text.synchronizing.files"));
}
ProgressManager.getInstance().executeNonCancelableSection(()->{
doRefresh(myProject, changesToRefresh);
});
doRefresh(myProject, changesToRefresh);
AbstractVcsHelper.getInstance(myProject).showErrors(myExceptions, myOperationName);
}