From 1a4c5b7462b9d040836ac010efbf12ca83156612 Mon Sep 17 00:00:00 2001 From: Nadya Zabrodina Date: Tue, 20 Aug 2013 16:17:46 +0400 Subject: [PATCH] hg version pattern modified for hg installed as internal part of external application *in this case hg return version in square brackets --- plugins/hg4idea/src/org/zmlx/hg4idea/util/HgVersion.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/util/HgVersion.java b/plugins/hg4idea/src/org/zmlx/hg4idea/util/HgVersion.java index 13b1cc94aa98..77b15ec773ee 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/util/HgVersion.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/util/HgVersion.java @@ -39,7 +39,7 @@ public final class HgVersion implements Comparable { private static final Logger LOGGER = Logger.getInstance(HgVersion.class); private static final Pattern HG_VERSION_PATTERN = - Pattern.compile(".+\\(\\s*\\S+\\s+(\\d+)\\.(\\d+)[\\+\\.-]?(\\d*)?.*\\s*\\)\\s*", Pattern.CASE_INSENSITIVE); + Pattern.compile(".+\\(\\s*\\S+\\s+(\\d+)\\.(\\d+)[\\+\\.-]?(\\d*)?.*\\s*\\).*", Pattern.CASE_INSENSITIVE); //f.e. Mercurial Distributed SCM (version 2.6+20130507) or Mercurial Distributed SCM (version 2.6.2), 2.7-rc+5-ca2dfc2f63eb /**