Fixes #360 - was taking last tag, now taking highest tag on that branch

Author: JakeGinnivan

GitVersionCore.Tests/ConfigProviderTests.cs

@@ -2,6 +2,7 @@
 using System.IO;
 using System.Linq;
 using System.Reflection;
+using System.Runtime.CompilerServices;
 using ApprovalTests;
 using GitVersion;
 using GitVersion.Helpers;

GitVersionCore.Tests/GitVersionCore.Tests.csproj

@@ -87,7 +87,7 @@
     <Compile Include="IntegrationTests\DevelopScenarios.cs" />
     <Compile Include="IntegrationTests\FeatureBranchTests.cs" />
     <Compile Include="IntegrationTests\SupportBranchScenarios.cs" />
-    <Compile Include="IntegrationTests\PatchScenarios.cs" />
+    <Compile Include="IntegrationTests\HotfixBranchScenarios.cs" />
     <Compile Include="IntegrationTests\ReleaseBranchTests.cs" />
     <Compile Include="IntegrationTests\SwitchingToGitFlowScenarios.cs" />
     <Compile Include="IntegrationTests\WikiScenarios.cs" />

GitVersionCore.Tests/IntegrationTests/PatchScenarios.cs renamed to GitVersionCore.Tests/IntegrationTests/HotfixBranchScenarios.cs

@@ -3,7 +3,7 @@
 using NUnit.Framework;
 
 [TestFixture]
-public class PatchScenarios
+public class HotfixBranchScenarios
 {
     [Test]
     public void PatchLatestReleaseExample()
@@ -47,30 +47,42 @@ public void PatchOlderReleaseExample()
         {
             r.MakeATaggedCommit("1.0.0");
             r.MakeATaggedCommit("1.1.0");
-            r.MakeATaggedCommit("1.2.0");
+            r.MakeATaggedCommit("2.0.0");
         }))
         {
-            var targetCommit = ((Commit) fixture.Repository.Tags.Single(t => t.Name == "1.1.0").Target);
+            // Merge hotfix branch to support
+            fixture.Repository.CreateBranch("support-1.1", (Commit)fixture.Repository.Tags.Single(t => t.Name == "1.1.0").Target).Checkout();
+            fixture.AssertFullSemver("1.1.0+0");
+            fixture.DumpGraph();
+
             // create hotfix branch
-            fixture.Repository.CreateBranch("hotfix-1.1.1", targetCommit).Checkout();
+            fixture.Repository.CreateBranch("hotfix-1.1.1").Checkout();
 
             fixture.AssertFullSemver("1.1.1-beta.1+0");
             fixture.Repository.MakeACommit();
             fixture.AssertFullSemver("1.1.1-beta.1+1");
 
-            // Merge hotfix branch to support
-            fixture.Repository.CreateBranch("support-1.1", (Commit) fixture.Repository.Tags.Single(t => t.Name == "1.1.0").Target).Checkout();
-            fixture.AssertFullSemver("1.1.0+0");
+            // Create feature branch off hotfix branch and complete
+            fixture.Repository.CreateBranch("feature/fix").Checkout();
+            fixture.AssertFullSemver("1.1.1-fix.1+1");
+            fixture.Repository.MakeACommit();
+            fixture.AssertFullSemver("1.1.1-fix.1+2");
+            fixture.Repository.Checkout("hotfix-1.1.1");
+            fixture.Repository.MergeNoFF("feature/fix", Constants.SignatureNow());
+            fixture.AssertFullSemver("1.1.1-beta.1+1");
 
+            // Merge hotfix into support branch to complete hotfix
+            fixture.Repository.Checkout("support-1.1");
             fixture.Repository.MergeNoFF("hotfix-1.1.1", Constants.SignatureNow());
             fixture.AssertFullSemver("1.1.1+0");
-
             fixture.Repository.ApplyTag("1.1.1");
             fixture.AssertFullSemver("1.1.1+0");
 
             // Verify develop version
             fixture.Repository.Checkout("develop");
-            fixture.AssertFullSemver("1.3.0-unstable.1+1");
+            fixture.AssertFullSemver("2.1.0-unstable.1+1");
+            fixture.Repository.MergeNoFF("support-1.1", Constants.SignatureNow());
+            fixture.AssertFullSemver("2.1.0-unstable.1+6");
         }
     }
 }

GitVersionCore.Tests/VersionCalculation/Strategies/LastTagBaseVersionStrategyTests.cs

@@ -10,13 +10,11 @@ public class LastTagBaseVersionStrategyTests
         [Test]
         public void ShouldAllowVersionIncrement()
         {
-            // TODO Looks like our MockRepostory stuff doesn't work properly. commits are added to end of list, but Tip is first.
-            // Changing behaviour breaks a bunch of tests
             var context = new GitVersionContextBuilder()
                 .WithTaggedMaster()
                 .AddCommit()
                 .Build();
-            var sut = new LastTagBaseVersionStrategy();
+            var sut = new HighestTagBaseVersionStrategy();
 
             var baseVersion = sut.GetVersion(context);
 
@@ -29,7 +27,7 @@ public void ShouldNotAllowVersionIncrementWhenTagComesFromCurrentCommit()
             var context = new GitVersionContextBuilder()
                 .WithTaggedMaster()
                 .Build();
-            var sut = new LastTagBaseVersionStrategy();
+            var sut = new HighestTagBaseVersionStrategy();
 
             var baseVersion = sut.GetVersion(context);
 

GitVersionCore/GitVersionCore.csproj

@@ -90,7 +90,7 @@
     <Compile Include="VersionCalculation\BaseVersionCalculator.cs" />
     <Compile Include="VersionCalculation\BaseVersionCalculators\BaseVersion.cs" />
     <Compile Include="VersionCalculation\BaseVersionCalculators\ConfigNextVersionBaseVersionStrategy.cs" />
-    <Compile Include="VersionCalculation\BaseVersionCalculators\LastTagBaseVersionStrategy.cs" />
+    <Compile Include="VersionCalculation\BaseVersionCalculators\HighestTagBaseVersionStrategy.cs" />
     <Compile Include="VersionCalculation\BaseVersionCalculators\MergeMessageBaseVersionStrategy.cs" />
     <Compile Include="VersionCalculation\BaseVersionCalculators\VersionInBranchBaseVersionStrategy.cs" />
     <Compile Include="VersionCalculation\BaseVersionStrategy.cs" />

GitVersionCore/VersionCalculation/BaseVersionCalculators/LastTagBaseVersionStrategy.cs renamed to GitVersionCore/VersionCalculation/BaseVersionCalculators/HighestTagBaseVersionStrategy.cs

@@ -3,7 +3,7 @@
     using System.Linq;
     using LibGit2Sharp;
 
-    public class LastTagBaseVersionStrategy : BaseVersionStrategy
+    public class HighestTagBaseVersionStrategy : BaseVersionStrategy
     {
         public override BaseVersion GetVersion(GitVersionContext context)
         {
@@ -19,29 +19,41 @@ public override BaseVersion GetVersion(GitVersionContext context)
 
         bool GetVersion(GitVersionContext context, out VersionTaggedCommit versionTaggedCommit)
         {
-            var tags = context.Repository.Tags.Select(t =>
-            {
-                SemanticVersion version;
-                if (SemanticVersion.TryParse(t.Name, context.Configuration.GitTagPrefix, out version))
+            var olderThan = context.CurrentCommit.When();
+            var allTags = context.Repository.Tags
+                .Where(tag => ((Commit) tag.PeeledTarget()).When() <= olderThan)
+                .ToList();
+            var tagsOnBranch = context.CurrentBranch
+                .Commits
+                .SelectMany(commit =>
+                {
+                    return allTags.Where(t => t.PeeledTarget() == commit);
+                })
+                .Select(t =>
                 {
-                    return new VersionTaggedCommit((Commit)t.Target, version, t.Name);
-                }
-                return null;
-            })
+                    SemanticVersion version;
+                    if (SemanticVersion.TryParse(t.Name, context.Configuration.GitTagPrefix, out version))
+                    {
+                        return new VersionTaggedCommit((Commit)t.Target, version, t.Name);
+                    }
+                    return null;
+                })
                 .Where(a => a != null)
-                .ToArray();
-            var olderThan = context.CurrentCommit.When();
-            var lastTaggedCommit =
-                context.CurrentBranch.Commits.FirstOrDefault(c => c.When() <= olderThan && tags.Any(a => a.Commit == c));
+                .ToList();
 
-            if (lastTaggedCommit != null)
+            if (tagsOnBranch.Count == 0)
+            {
+                versionTaggedCommit = null;
+                return false;
+            }
+            if (tagsOnBranch.Count == 1)
             {
-                versionTaggedCommit = tags.Last(a => a.Commit.Sha == lastTaggedCommit.Sha);
+                versionTaggedCommit = tagsOnBranch[0];
                 return true;
             }
 
-            versionTaggedCommit = null;
-            return false;
+            versionTaggedCommit = tagsOnBranch.Skip(1).Aggregate(tagsOnBranch[0], (t, t1) => t.SemVer > t1.SemVer ? t : t1);
+            return true;
         }
 
         class VersionTaggedCommit

GitVersionCore/VersionCalculation/NewNextVersionCalculator.cs

@@ -8,17 +8,17 @@ public class NewNextVersionCalculator
     {
         IBaseVersionCalculator baseVersionFinder;
         IMetaDataCalculator metaDataCalculator;
-        LastTagBaseVersionStrategy lastTagBaseVersionStrategy;
+        HighestTagBaseVersionStrategy highestTagBaseVersionStrategy;
 
         public NewNextVersionCalculator(IBaseVersionCalculator baseVersionCalculator = null, IMetaDataCalculator metaDataCalculator = null)
         {
             this.metaDataCalculator = metaDataCalculator ?? new MetaDataCalculator();
-            lastTagBaseVersionStrategy = new LastTagBaseVersionStrategy();
+            highestTagBaseVersionStrategy = new HighestTagBaseVersionStrategy();
             baseVersionFinder = baseVersionCalculator ??
                 new BaseVersionCalculator(
                     new FallbackBaseVersionStrategy(),
                 new ConfigNextVersionBaseVersionStrategy(),
-                lastTagBaseVersionStrategy,
+                highestTagBaseVersionStrategy,
                 new MergeMessageBaseVersionStrategy(),
                 new VersionInBranchBaseVersionStrategy());
         }
@@ -48,7 +48,7 @@ public SemanticVersion FindVersion(GitVersionContext context)
                         number = int.Parse(numberGroup.Value);
                 }
 
-                var lastTag = lastTagBaseVersionStrategy.GetVersion(context);
+                var lastTag = highestTagBaseVersionStrategy.GetVersion(context);
                 if (number == null &&
                     lastTag != null &&
                     !context.IsCurrentCommitTagged &&