From d00ddfcd8f90f747adb842ebb7be68ba2972fa38 Mon Sep 17 00:00:00 2001
From: Aleksey Pivovarov <AMPivovarov@gmail.com>
Date: Sun, 13 May 2018 00:21:26 +0300
Subject: [PATCH] vcs: do not allow to cancel Rollback operation

---
 .../openapi/vcs/changes/ui/RollbackWorker.java         | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/RollbackWorker.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/RollbackWorker.java
index 96d7a5037b83..dddb66bf8f82 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/RollbackWorker.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/RollbackWorker.java
@@ -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);
     }