From 4e703b3695364e682cfb759ad6920543094ecf5c Mon Sep 17 00:00:00 2001 From: Nadya Zabrodina Date: Sat, 3 Aug 2013 02:59:59 +0400 Subject: [PATCH] EA-48340 - assert: HgVersion.parseVersion fixed for hg version 2.7-rc+5... --- plugins/hg4idea/src/org/zmlx/hg4idea/util/HgVersion.java | 4 ++-- .../hg4idea/testSrc/hg4idea/test/version/HgVersionTest.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/util/HgVersion.java b/plugins/hg4idea/src/org/zmlx/hg4idea/util/HgVersion.java index 554ab22cb32e..c025554d7375 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/util/HgVersion.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/util/HgVersion.java @@ -39,8 +39,8 @@ 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*version\\s+(\\d+)\\.(\\d+)[\\+\\.]?(\\d*)[\\d\\.]*\\s*\\)\\s*", Pattern.CASE_INSENSITIVE); - //f.e. Mercurial Distributed SCM (version 2.6+20130507) or Mercurial Distributed SCM (version 2.6.2) + Pattern.compile(".+\\(\\s*version\\s+(\\d+)\\.(\\d+)[\\+\\.-]?(\\d*)?.*\\s*\\)\\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 /** * The minimal supported version diff --git a/plugins/hg4idea/testSrc/hg4idea/test/version/HgVersionTest.java b/plugins/hg4idea/testSrc/hg4idea/test/version/HgVersionTest.java index 3b3e3a717982..cd7f701f0b7b 100644 --- a/plugins/hg4idea/testSrc/hg4idea/test/version/HgVersionTest.java +++ b/plugins/hg4idea/testSrc/hg4idea/test/version/HgVersionTest.java @@ -29,7 +29,8 @@ public class HgVersionTest extends HgPlatformTest { new TestHgVersion("Mercurial Distributed SCM (version 2.6.2)", 2, 6, 2), new TestHgVersion("Mercurial Distributed SCM (version 2.6+20130507)", 2, 6, 20130507), new TestHgVersion("Mercurial Distributed SCM (version 1.9.5)", 1, 9, 5), - new TestHgVersion("Mercurial Distributed SCM (version 2.6)", 2, 6, 0) + new TestHgVersion("Mercurial Distributed SCM (version 2.6)", 2, 6, 0), + new TestHgVersion("Mercurial Distributed SCM (version 2.7-rc+5-ca2dfc2f63eb)", 2, 7, 0) }; public void testParseSupported() throws Exception {