Feature/dont reset count when version will be the same

GitVersionCore.Tests/GitVersionCore.Tests.csproj

@@ -127,7 +127,6 @@
     <Compile Include="VersionCalculation\NextVersionCalculatorTests.cs" />
     <Compile Include="VersionCalculation\Strategies\ConfigNextVersionBaseVersionStrategyTests.cs" />
     <Compile Include="GitVersionContextBuilder.cs" />
-    <Compile Include="VersionCalculation\Strategies\LastTagBaseVersionStrategyTests.cs" />
     <Compile Include="VersionCalculation\Strategies\MergeMessageBaseVersionStrategyTests.cs" />
     <Compile Include="VersionCalculation\Strategies\VersionInBranchBaseVersionStrategyTests.cs" />
     <Compile Include="VersionCalculation\TestBaseVersionCalculator.cs" />

GitVersionCore.Tests/IntegrationTests/HotfixBranchScenarios.cs

@@ -13,20 +13,20 @@ public void PatchLatestReleaseExample()
             // create hotfix
             fixture.Repository.CreateBranch("hotfix-1.2.1").Checkout();
 
-            fixture.AssertFullSemver("1.2.1-beta.1+0");
-            fixture.Repository.MakeACommit();
             fixture.AssertFullSemver("1.2.1-beta.1+1");
+            fixture.Repository.MakeACommit();
+            fixture.AssertFullSemver("1.2.1-beta.1+2");
             fixture.Repository.ApplyTag("1.2.1-beta.1");
             fixture.AssertFullSemver("1.2.1-beta.1");
             fixture.Repository.MakeACommit();
-            fixture.AssertFullSemver("1.2.1-beta.2+2");
+            fixture.AssertFullSemver("1.2.1-beta.2+3");
 
             // Merge hotfix branch to master
             fixture.Repository.Checkout("master");
 
 
             fixture.Repository.MergeNoFF("hotfix-1.2.1", Constants.SignatureNow());
-            fixture.AssertFullSemver("1.2.1+0");
+            fixture.AssertFullSemver("1.2.1+4");
 
             fixture.Repository.ApplyTag("1.2.1");
             fixture.AssertFullSemver("1.2.1");
@@ -36,7 +36,7 @@ public void PatchLatestReleaseExample()
             fixture.AssertFullSemver("1.3.0-unstable.1");
 
             fixture.Repository.MergeNoFF("hotfix-1.2.1", Constants.SignatureNow());
-            fixture.AssertFullSemver("1.3.0-unstable.0");
+            fixture.AssertFullSemver("1.3.0-unstable.4");
         }
     }
 
@@ -73,12 +73,12 @@ public void PatchOlderReleaseExample()
             fixture.AssertFullSemver("1.1.1-PullRequest.2+4");
             fixture.Repository.Checkout("hotfix-1.1.1");
             fixture.Repository.MergeNoFF("feature/fix", Constants.SignatureNow());
-            fixture.AssertFullSemver("1.1.1-beta.1+1");
+            fixture.AssertFullSemver("1.1.1-beta.1+4");
 
             // 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.AssertFullSemver("1.1.1+5");
             fixture.Repository.ApplyTag("1.1.1");
             fixture.AssertFullSemver("1.1.1");
 

GitVersionCore.Tests/IntegrationTests/ReleaseBranchScenarios.cs

@@ -47,11 +47,12 @@ public void NoMergeBacksToDevelopInCaseThereAreChangesInReleaseBranch()
             // Merge to develop
             fixture.Repository.Checkout("develop");
             fixture.Repository.MergeNoFF("release/1.0.0");
+            fixture.AssertFullSemver("1.1.0-unstable.1");
 
             fixture.Repository.MakeACommit();
             fixture.Repository.Branches.Remove(releaseBranch);
 
-            fixture.AssertFullSemver("1.1.0-unstable.1");
+            fixture.AssertFullSemver("1.1.0-unstable.2");
         }
     }
 

GitVersionCore.Tests/IntegrationTests/SupportBranchScenarios.cs

@@ -46,7 +46,7 @@ public void SupportIsCalculatedCorrectly()
             fixture.AssertFullSemver("1.2.1-beta.1+1");
             fixture.Repository.Checkout("support/1.0.0");
             fixture.Repository.MergeNoFF("hotfix/1.2.1");
-            fixture.AssertFullSemver("1.2.1+0");
+            fixture.AssertFullSemver("1.2.1+2");
         }
     }
 

GitVersionCore.Tests/IntegrationTests/WikiScenarios.cs

@@ -88,8 +88,10 @@ public void MinorReleaseExample()
 
             // Verify develop version
             fixture.Repository.Checkout("develop");
+            fixture.AssertFullSemver("1.3.0-unstable.4");
             fixture.Repository.MergeNoFF("release-1.3.0", Constants.SignatureNow());
-            fixture.AssertFullSemver("1.4.0-unstable.0");
+            // Not 0 for commit count as we can't know the increment rules of the merged branch
+            fixture.AssertFullSemver("1.4.0-unstable.2");
         }
     }
 }

GitVersionCore.Tests/Mocks/MockQueryableCommitLog.cs

@@ -29,12 +29,12 @@ public CommitSortStrategies SortedBy
 
     public ICommitLog QueryBy(CommitFilter filter)
     {
-        throw new NotImplementedException();
+        return this;
     }
 
     public Commit FindMergeBase(Commit first, Commit second)
     {
-        throw new NotImplementedException();
+        return null;
     }
 
     public Commit FindMergeBase(IEnumerable<Commit> commits, MergeBaseFindingStrategy strategy)

GitVersionCore.Tests/VersionCalculation/BaseVersionCalculatorTests.cs

@@ -1,6 +1,7 @@
 namespace GitVersionCore.Tests.VersionCalculation
 {
     using System;
+    using System.Collections.Generic;
     using GitVersion;
     using GitVersion.VersionCalculation;
     using GitVersion.VersionCalculation.BaseVersionCalculators;
@@ -62,9 +63,9 @@ public V1Strategy(DateTimeOffset? when)
                 this.when = when == null ? null : new MockCommit { CommitterEx = when.Value.ToSignature() };
             }
 
-            public override BaseVersion GetVersion(GitVersionContext context)
+            public override IEnumerable<BaseVersion> GetVersions(GitVersionContext context)
             {
-                return new BaseVersion("Source 1", false, new SemanticVersion(1), when, null);
+                yield return new BaseVersion("Source 1", false, new SemanticVersion(1), when, null);
             }
         }
 
@@ -77,9 +78,9 @@ public V2Strategy(DateTimeOffset? when)
                 this.when = when == null ? null : new MockCommit { CommitterEx = when.Value.ToSignature() };
             }
 
-            public override BaseVersion GetVersion(GitVersionContext context)
+            public override IEnumerable<BaseVersion> GetVersions(GitVersionContext context)
             {
-                return new BaseVersion("Source 2", true, new SemanticVersion(2), when, null);
+                yield return new BaseVersion("Source 2", true, new SemanticVersion(2), when, null);
             }
         }
     }

GitVersionCore.Tests/VersionCalculation/Strategies/ConfigNextVersionBaseVersionStrategyTests.cs

@@ -1,5 +1,6 @@
 namespace GitVersionCore.Tests.VersionCalculation.Strategies
 {
+    using System.Linq;
     using GitVersion;
     using GitVersion.VersionCalculation.BaseVersionCalculators;
     using NUnit.Framework;
@@ -18,7 +19,7 @@ public void ShouldNotBeIncremented()
                 });
             var sut = new ConfigNextVersionBaseVersionStrategy();
 
-            var baseVersion = sut.GetVersion(contextBuilder.Build());
+            var baseVersion = sut.GetVersions(contextBuilder.Build()).Single();
 
             baseVersion.ShouldIncrement.ShouldBe(false);
             baseVersion.SemanticVersion.ToString().ShouldBe("1.0.0");
@@ -30,7 +31,7 @@ public void ReturnsNullWhenNoNextVersionIsInConfig()
             var contextBuilder = new GitVersionContextBuilder();
             var sut = new ConfigNextVersionBaseVersionStrategy();
 
-            var baseVersion = sut.GetVersion(contextBuilder.Build());
+            var baseVersion = sut.GetVersions(contextBuilder.Build()).SingleOrDefault();
 
             baseVersion.ShouldBe(null);
         }

GitVersionCore.Tests/VersionCalculation/Strategies/MergeMessageBaseVersionStrategyTests.cs

@@ -1,6 +1,7 @@
 namespace GitVersionCore.Tests.VersionCalculation.Strategies
 {
     using System.Collections.Generic;
+    using System.Linq;
     using GitVersion.VersionCalculation.BaseVersionCalculators;
     using LibGit2Sharp;
     using NUnit.Framework;
@@ -24,7 +25,7 @@ public void ShouldNotAllowIncrementOfVersion()
             }).Build();
             var sut = new MergeMessageBaseVersionStrategy();
 
-            var baseVersion = sut.GetVersion(context);
+            var baseVersion = sut.GetVersions(context).Single();
 
             baseVersion.ShouldIncrement.ShouldBe(false);
         }
@@ -109,7 +110,7 @@ static void AssertMergeMessage(string message, string expectedVersion, List<Comm
                 .Build();
             var sut = new MergeMessageBaseVersionStrategy();
 
-            var baseVersion = sut.GetVersion(context);
+            var baseVersion = sut.GetVersions(context).SingleOrDefault();
 
             if (expectedVersion == null)
             {

GitVersionCore.Tests/VersionCalculation/Strategies/VersionInBranchBaseVersionStrategyTests.cs

@@ -1,5 +1,6 @@
 namespace GitVersionCore.Tests.VersionCalculation.Strategies
 {
+    using System.Linq;
     using GitVersion;
     using GitVersion.VersionCalculation.BaseVersionCalculators;
     using LibGit2Sharp;
@@ -25,7 +26,7 @@ public void CanTakeVersionFromBranchName(string branchName, string expectedBaseV
                 var branch = fixture.Repository.CreateBranch(branchName);
                 var sut = new VersionInBranchBaseVersionStrategy();
 
-                var baseVersion = sut.GetVersion(new GitVersionContext(fixture.Repository, branch, configuration));
+                var baseVersion = sut.GetVersions(new GitVersionContext(fixture.Repository, branch, configuration)).SingleOrDefault();
 
                 if (expectedBaseVersion == null)
                     baseVersion.ShouldBe(null);

GitVersionCore/LibGitExtensions.cs

@@ -24,20 +24,43 @@ public static Branch FindBranch(this IRepository repository, string branchName)
             return repository.Branches.FirstOrDefault(x => x.Name == "origin/" + branchName);
         }
 
+        public static SemanticVersion LastVersionTagOnBranch(this Branch branch, IRepository repository, string tagPrefixRegex)
+        {
+            var tags = repository.Tags.Select(t => t).ToList();
+            var until = FindCommitBranchWasBranchedFrom(branch, repository);
+
+            return repository.Commits.QueryBy(new CommitFilter
+            {
+                Since = branch.Tip,
+                Until = until
+            })
+            .SelectMany(c => tags.Where(t => c.Sha == t.Target.Sha).SelectMany(t =>
+            {
+                SemanticVersion semver;
+                if (SemanticVersion.TryParse(t.Name, tagPrefixRegex, out semver))
+                    return new [] { semver };
+                return new SemanticVersion[0];
+            }))
+            .FirstOrDefault();
+        }
+
         public static Commit FindCommitBranchWasBranchedFrom(this Branch branch, IRepository repository, params Branch[] excludedBranches)
         {
-            var otherBranches = repository.Branches.Except(excludedBranches).Where(b => IsSameBranch(branch, b)).ToList();
-            var mergeBases = otherBranches.Select(b =>
+            using (Logger.IndentLog("Finding branch source"))
             {
-                var otherCommit = b.Tip;
-                if (b.Tip.Parents.Contains(branch.Tip))
+                var otherBranches = repository.Branches.Except(excludedBranches).Where(b => IsSameBranch(branch, b)).ToList();
+                var mergeBases = otherBranches.Select(b =>
                 {
-                    otherCommit = b.Tip.Parents.First();
-                }
-                var mergeBase = repository.Commits.FindMergeBase(otherCommit, branch.Tip);
-                return mergeBase;
-            }).Where(b => b != null).ToList();
-            return mergeBases.OrderByDescending(b => b.Committer.When).FirstOrDefault();
+                    var otherCommit = b.Tip;
+                    if (b.Tip.Parents.Contains(branch.Tip))
+                    {
+                        otherCommit = b.Tip.Parents.First();
+                    }
+                    var mergeBase = repository.Commits.FindMergeBase(otherCommit, branch.Tip);
+                    return mergeBase;
+                }).Where(b => b != null).ToList();
+                return mergeBases.OrderByDescending(b => b.Committer.When).FirstOrDefault();
+            }
         }
 
         static bool IsSameBranch(Branch branch, Branch b)

GitVersionCore/Logger.cs

@@ -19,8 +19,8 @@ static Logger()
         public static IDisposable IndentLog(string operationDescription)
         {
             var start = DateTime.Now;
-            indent = indent + "  ";
             WriteInfo("Begin: " + operationDescription);
+            indent = indent + "  ";
             return new ActionDisposable(() =>
             {
                 indent = indent.Substring(0, indent.Length - 2);

GitVersionCore/SemanticVersion.cs

@@ -280,22 +280,18 @@ public SemanticVersion IncrementVersion(IncrementStrategy incrementStrategy)
                 switch (incrementStrategy)
                 {
                     case IncrementStrategy.None:
-                        Logger.WriteInfo("Skipping version increment");
                         break;
                     case IncrementStrategy.Major:
-                        Logger.WriteInfo("Incrementing Major Version");
                         incremented.Major++;
                         incremented.Minor = 0;
                         incremented.Patch = 0;
                         break;
                     case IncrementStrategy.Minor:
                         incremented.Minor++;
                         incremented.Patch = 0;
-                        Logger.WriteInfo("Incrementing Minor Version");
                         break;
                     case IncrementStrategy.Patch:
                         incremented.Patch++;
-                        Logger.WriteInfo("Incrementing Patch Version");
                         break;
                     default:
                         throw new ArgumentOutOfRangeException();
@@ -305,7 +301,6 @@ public SemanticVersion IncrementVersion(IncrementStrategy incrementStrategy)
             {
                 if (incremented.PreReleaseTag.Number != null)
                 {
-                    Logger.WriteInfo("Incrementing prerelease");
                     incremented.PreReleaseTag.Number = incremented.PreReleaseTag.Number;
                     incremented.PreReleaseTag.Number++;
                 }