From bc0ad5a1e707d2f0fff82f338614db89b19bca98 Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Mon, 5 Dec 2011 18:01:36 +0300 Subject: [PATCH] HgCommandExecutor: disable assertion on calling hg from ShowDiff in awt. --- .../src/org/zmlx/hg4idea/execution/HgCommandExecutor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/execution/HgCommandExecutor.java b/plugins/hg4idea/src/org/zmlx/hg4idea/execution/HgCommandExecutor.java index dbb5d360e5ee..66343393556c 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/execution/HgCommandExecutor.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/execution/HgCommandExecutor.java @@ -98,7 +98,7 @@ public final class HgCommandExecutor { @Nullable public HgCommandResult executeInCurrentThread(@Nullable final VirtualFile repo, final String operation, final List arguments) { - LOG.assertTrue(!ApplicationManager.getApplication().isDispatchThread()); + //LOG.assertTrue(!ApplicationManager.getApplication().isDispatchThread()); disabled for release if (myProject == null || myProject.isDisposed() || myVcs == null) { return null; }