MergeMessageParser inlined and removed duplicated tests

Author: JakeGinnivan

GitVersionCore.Tests/GitVersionCore.Tests.csproj

@@ -95,7 +95,6 @@
     <Compile Include="Helpers\Constants.cs" />
     <Compile Include="InformationalVersionBuilderTests.cs" />
     <Compile Include="JsonVersionBuilderTests.cs" />
-    <Compile Include="MergeMessageParserTests.cs" />
     <Compile Include="Mocks\MockBranch.cs" />
     <Compile Include="Mocks\MockBranchCollection.cs" />
     <Compile Include="Mocks\MockCommit.cs" />

GitVersionCore.Tests/MergeMessageParserTests.cs

@@ -38,6 +38,7 @@ public void ShouldNotAllowIncrementOfVersion()
         [TestCase("Merge branch 'hotfix-4.6.6' into support-4.6", true, "4.6.6")]
         [TestCase("Merge branch 'hotfix-10.10.50'", true, "10.10.50")]
         [TestCase("Merge branch 'hotfix-0.1.5'", true, "0.1.5")]
+        [TestCase("Merge branch 'hotfix-4.2.2' into support-4.2", true, "4.2.2")]
         [TestCase("Merge branch 'hotfix-0.1.5'\n\nRelates to: TicketId", true, "0.1.5")]
         [TestCase("Merge branch 'alpha-0.1.5'", true, "0.1.5")]
         [TestCase("Merge pull request #165 from Particular/release-1.0.0", true, "1.0.0")]

GitVersionCore.Tests/VersionCalculation/Strategies/MergeMessageBaseVersionStrategyTests.cs

@@ -108,7 +108,6 @@
     <Compile Include="Extensions\ExtensionMethods.cs" />
     <Compile Include="GitDirFinder.cs" />
     <Compile Include="GitFlow\BranchType.cs" />
-    <Compile Include="MergeMessageParser.cs" />
     <Compile Include="GitVersionContext.cs" />
     <Compile Include="GitVersionFinder.cs" />
     <Compile Include="Helpers\DeleteHelper.cs" />

GitVersionCore/GitVersionCore.csproj

@@ -1,6 +1,8 @@
 namespace GitVersion.VersionCalculation.BaseVersionCalculators
 {
+    using System;
     using System.Linq;
+    using LibGit2Sharp;
 
     public class MergeMessageBaseVersionStrategy : BaseVersionStrategy
     {
@@ -12,8 +14,7 @@ public override BaseVersion GetVersion(GitVersionContext context)
                 .SelectMany(c =>
                 {
                     SemanticVersion semanticVersion;
-                    // TODO when this approach works, inline the other class into here
-                    if (MergeMessageParser.TryParse(c, context.Configuration, out semanticVersion))
+                    if (TryParse(c, context.Configuration, out semanticVersion))
                     {
                         var shouldIncrement = !context.Configuration.PreventIncrementForMergedBranchVersion;
                         return new[]
@@ -27,5 +28,115 @@ public override BaseVersion GetVersion(GitVersionContext context)
 
             return baseVersions.Length > 1 ? baseVersions.Aggregate((x, y) => x.SemanticVersion > y.SemanticVersion ? x : y) : baseVersions.SingleOrDefault();
         }
+        public static bool TryParse(Commit mergeCommit, EffectiveConfiguration configuration, out SemanticVersion semanticVersion)
+        {
+            string versionPart;
+            if (Inner(mergeCommit, out versionPart))
+            {
+                return SemanticVersion.TryParse(versionPart, configuration.GitTagPrefix, out semanticVersion);
+            }
+            semanticVersion = null;
+            return false;
+        }
+
+        static bool Inner(Commit mergeCommit, out string versionPart)
+        {
+            if (mergeCommit.Parents.Count() < 2)
+            {
+                versionPart = null;
+                return false;
+            }
+
+            var message = mergeCommit.Message.TrimToFirstLine();
+
+
+            if (message.StartsWith("Merge branch 'hotfix-"))
+            {
+                var suffix = message.Replace("Merge branch 'hotfix-", "");
+                return TryGetPrefix(suffix, out versionPart, "'");
+            }
+
+            if (message.StartsWith("Merge branch 'hotfix/"))
+            {
+                var suffix = message.Replace("Merge branch 'hotfix/", "");
+                return TryGetPrefix(suffix, out versionPart, "'");
+            }
+
+            if (message.StartsWith("Merge branch 'release-"))
+            {
+                var suffix = message.Replace("Merge branch 'release-", "");
+                return TryGetPrefix(suffix, out versionPart, "'");
+            }
+
+            if (message.StartsWith("Merge branch 'release/"))
+            {
+                var suffix = message.Replace("Merge branch 'release/", "");
+                return TryGetPrefix(suffix, out versionPart, "'");
+            }
+
+            if (message.StartsWith("Merge branch '"))
+            {
+                var suffix = message.Replace("Merge branch '", "");
+
+                if (suffix.Contains("-"))
+                {
+                    suffix = suffix.Split('-')[1];
+                }
+                return TryGetPrefix(suffix, out versionPart, "'");
+            }
+
+            if (message.StartsWith("Merge pull request #"))
+            {
+                var split = message.Split(new[]
+                {
+                    "/"
+                }, StringSplitOptions.RemoveEmptyEntries);
+                if (split.Length != 2)
+                {
+                    versionPart = null;
+                    return false;
+                }
+                return TryGetSuffix(split[1], out versionPart, "-");
+            }
+
+            if (message.StartsWith("Finish Release-")) //Match Syntevo SmartGit client's GitFlow 'release' merge commit message formatting
+            {
+                versionPart = message.Replace("Finish Release-", "");
+                return true;
+            }
+
+            if (message.StartsWith("Finish ")) //Match Syntevo SmartGit client's GitFlow 'hotfix' merge commit message formatting
+            {
+                versionPart = message.Replace("Finish ", "");
+                return true;
+            }
+
+            versionPart = null;
+            return false;
+        }
+
+        static bool TryGetPrefix(string target, out string result, string splitter)
+        {
+            var indexOf = target.IndexOf(splitter);
+            if (indexOf == -1)
+            {
+                result = null;
+                return false;
+            }
+            result = target.Substring(0, indexOf);
+            return true;
+        }
+
+        static bool TryGetSuffix(string target, out string result, string splitter)
+        {
+            var indexOf = target.IndexOf(splitter);
+            if (indexOf == -1)
+            {
+                result = null;
+                return false;
+            }
+            result = target.Substring(indexOf + 1, target.Length - indexOf - 1);
+            return true;
+        }
     }
 }