From 4e2c8a90ddfd74f5e51f0622161264face1f58ca Mon Sep 17 00:00:00 2001
From: Aleksey Pivovarov <AMPivovarov@gmail.com>
Date: Tue, 14 Aug 2018 13:19:17 +0300
Subject: [PATCH] vcs: release action lock on error

---
 .../com/intellij/openapi/vcs/impl/AbstractVcsHelperImpl.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/AbstractVcsHelperImpl.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/AbstractVcsHelperImpl.java
index 43fff526bf88..a82e64a37362 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/AbstractVcsHelperImpl.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/AbstractVcsHelperImpl.java
@@ -78,8 +78,8 @@ import org.jetbrains.annotations.TestOnly;
 
 import java.awt.*;
 import java.text.MessageFormat;
-import java.util.*;
 import java.util.List;
+import java.util.*;
 
 import static com.intellij.openapi.ui.Messages.getQuestionIcon;
 import static com.intellij.util.ui.ConfirmationDialog.requestForConfirmation;
@@ -601,13 +601,12 @@ public class AbstractVcsHelperImpl extends AbstractVcsHelper {
       }
 
       @Override
-      public void onCancel() {
+      public void onFinished() {
         lock.unlock();
       }
 
       @Override
       public void onSuccess() {
-        lock.unlock();
         if (exc[0] != null) {
           showError(exc[0], failedText(virtualFile, revision));
         }