From d4e2a395eb052036c8d30ce8c6e72c2a0f17df77 Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Thu, 6 Dec 2012 16:53:31 +0400
Subject: [PATCH] [git] Fix tests on cherry-pick

Process customResultHandler in MockVcsHelper#commit.
---
 .../com/intellij/dvcs/test/MockVcsHelper.java      | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/platform/dvcs/testFramework/com/intellij/dvcs/test/MockVcsHelper.java b/platform/dvcs/testFramework/com/intellij/dvcs/test/MockVcsHelper.java
index e14bd69fe468..da3acfb17603 100644
--- a/platform/dvcs/testFramework/com/intellij/dvcs/test/MockVcsHelper.java
+++ b/platform/dvcs/testFramework/com/intellij/dvcs/test/MockVcsHelper.java
@@ -188,7 +188,19 @@ public class MockVcsHelper extends AbstractVcsHelper {
   public boolean commitChanges(@NotNull Collection<Change> changes, @NotNull LocalChangeList initialChangeList,
                                @NotNull String commitMessage, @Nullable CommitResultHandler customResultHandler) {
     if (myCommitHandler != null) {
-      return myCommitHandler.commit(commitMessage);
+      boolean success = myCommitHandler.commit(commitMessage);
+      if (customResultHandler != null) {
+        if (success) {
+          customResultHandler.onSuccess(commitMessage);
+        }
+        else {
+          customResultHandler.onFailure();
+        }
+      }
+      return success;
+    }
+    if (customResultHandler != null) {
+      customResultHandler.onFailure();
     }
     return false;
   }