Ability to merge release back to develop

This preserves the correct version when merging a release back into develop.
This also changes the semantics of the 0+1 part of the semantic version so that it represents the number of changes since the previous tagged release (e.g. version 1.0.0-beta.1+5 gets reset to 1.0.0-beta.2+0)

Author: dtabuenc

AcceptanceTests/GitFlow/PatchScenarios.cs

@@ -20,7 +20,7 @@ public void PatchLatestReleaseExample()
                 fixture.Repository.MakeACommit();
                 fixture.AssertFullSemver("1.2.1-beta.1+1");
                 fixture.Repository.ApplyTag("1.2.1-beta.1");
-                fixture.AssertFullSemver("1.2.1-beta.2+1");
+                fixture.AssertFullSemver("1.2.1-beta.1+1");
 
                 // Merge hotfix branch to master
                 fixture.Repository.Checkout("master");

AcceptanceTests/GitFlow/UncycloScenarios.cs

@@ -76,7 +76,7 @@ public void MinorReleaseExample()
 
                 // Apply beta.0 tag
                 fixture.Repository.ApplyTag("1.3.0-beta.1");
-                fixture.ExecuteGitVersion().OutputVariables[VariableProvider.FullSemVer].ShouldBe("1.3.0-beta.2+1");
+                fixture.ExecuteGitVersion().OutputVariables[VariableProvider.FullSemVer].ShouldBe("1.3.0-beta.1+1");
 
                 // Merge release branch to master
                 fixture.Repository.Checkout("master");

AcceptanceTests/GitHubFlow/ReleaseBranchTests.cs

@@ -48,7 +48,7 @@ public void WhenReleaseBranchIsMergedIntoMasterVersionIsTakenWithIt()
             }
         }
 
-        [Fact(Skip = "Not supported yet")]
+        [Fact]
         public void WhenMergingReleaseBackToDevShouldNotResetBetaVersion()
         {
             using (var fixture = new EmptyRepositoryFixture())
@@ -71,7 +71,7 @@ public void WhenMergingReleaseBackToDevShouldNotResetBetaVersion()
 
                 fixture.Repository.MakeCommits(1);
 
-                VerifyVersion(fixture, "2.0.0-beta.2+2");
+                VerifyVersion(fixture, "2.0.0-beta.2+0");
 
                 //merge down to develop
                 fixture.Repository.Checkout("develop");
@@ -80,7 +80,7 @@ public void WhenMergingReleaseBackToDevShouldNotResetBetaVersion()
                 //but keep working on the release
                 fixture.Repository.Checkout("release-2.0.0");
 
-                VerifyVersion(fixture, "2.0.0-beta.2+2");
+                VerifyVersion(fixture, "2.0.0-beta.2+0");
             }
         }
 

GitVersionCore/GitFlow/BranchFinders/OptionallyTaggedBranchVersionFinderBase.cs

@@ -12,7 +12,6 @@ protected SemanticVersion FindVersion(
             BranchType branchType,
             string baseBranchName)
         {
-            var nbHotfixCommits = NumberOfCommitsInBranchNotKnownFromBaseBranch(context.Repository, context.CurrentBranch, branchType, baseBranchName);
 
             var versionString = context.CurrentBranch.GetSuffix(branchType);
             if (!versionString.Contains("."))
@@ -28,7 +27,12 @@ protected SemanticVersion FindVersion(
             if (branchType == BranchType.Unknown)
                 version.PreReleaseTag = context.CurrentBranch.Name.Replace("-" + versionString, string.Empty) + ".1";
 
-            var tagVersion = RetrieveMostRecentOptionalTagVersion(context.Repository, version, context.CurrentBranch.Commits.Take(nbHotfixCommits + 1));
+            var tagsApplicableToBranchVersion = context.Repository.SemVerTagsRelatedToVersion(version).OrderByDescending(tag => SemanticVersion.Parse(tag.Name)).ToList();
+            var latestTaggedCommit = tagsApplicableToBranchVersion.Select(tag => tag.Target).FirstOrDefault();
+
+            var numberOfCommitsSinceLastTagOrBranchPoint = NumberOfCommitsSinceLastTagOrBranchPoint(context, tagsApplicableToBranchVersion, branchType, baseBranchName);
+
+            var tagVersion = RetrieveMostRecentOptionalTagVersion(tagsApplicableToBranchVersion);
 
             var sha = context.CurrentCommit.Sha;
             var releaseDate = ReleaseDateFinder.Execute(context.Repository, sha, version.Patch);
@@ -39,63 +43,57 @@ protected SemanticVersion FindVersion(
                 Patch = version.Patch,
                 PreReleaseTag = version.PreReleaseTag,
                 BuildMetaData = new SemanticVersionBuildMetaData(
-                    nbHotfixCommits, context.CurrentBranch.Name, releaseDate)
+                    numberOfCommitsSinceLastTagOrBranchPoint, context.CurrentBranch.Name, releaseDate)
             };
 
             if (tagVersion != null)
             {
-                tagVersion.PreReleaseTag.Number++;
+                if (latestTaggedCommit != context.CurrentCommit)
+                {
+                    tagVersion.PreReleaseTag.Number++;
+                }
                 semanticVersion.PreReleaseTag = tagVersion.PreReleaseTag;
             }
 
             return semanticVersion;
+
         }
 
-        bool IsMostRecentCommitTagged(GitVersionContext context, out SemanticVersion version)
+        SemanticVersion RetrieveMostRecentOptionalTagVersion(IEnumerable<Tag> tagsApplicableToBranchVersion)
         {
-            var currentCommit = context.CurrentBranch.Commits.First();
+            return tagsApplicableToBranchVersion.Select(tag => SemanticVersion.Parse(tag.Name)).OrderByDescending(version => version).FirstOrDefault();
+        }
 
-            var tags = context.Repository.Tags
-                .Where(tag => tag.PeeledTarget() == currentCommit)
-                .ToList();
 
-            foreach (var tag in tags)
+        int NumberOfCommitsSinceLastTagOrBranchPoint(GitVersionContext context, ICollection<Tag> tagsInDescVersionOrder, BranchType branchType, string baseBranchName)
+        {
+            if (!tagsInDescVersionOrder.Any())
             {
-                if (SemanticVersion.TryParse(tag.Name, out version))
-                {
-                    return true;
-                }
+                return NumberOfCommitsInBranchNotKnownFromBaseBranch(context.Repository, context.CurrentBranch, branchType, baseBranchName);
             }
-
-            version = null;
-            return false;
-        }
-
-        SemanticVersion RetrieveMostRecentOptionalTagVersion(
-            IRepository repository, SemanticVersion branchVersion, IEnumerable<Commit> take)
-        {
-            foreach (var commit in take)
+            
+            var mostRecentTag = tagsInDescVersionOrder.First();
+            var ancestor = mostRecentTag;
+            if (mostRecentTag.Target == context.CurrentCommit)
             {
-                foreach (var tag in repository.TagsByDate(commit))
+                var previousTag = tagsInDescVersionOrder.Skip(1).FirstOrDefault();
+                if (previousTag != null)
                 {
-                    SemanticVersion version;
-                    if (!SemanticVersion.TryParse(tag.Name, out version))
-                    {
-                        continue;
-                    }
-
-                    if (branchVersion.Major != version.Major ||
-                        branchVersion.Minor != version.Minor ||
-                        branchVersion.Patch != version.Patch)
-                    {
-                        continue;
-                    }
-
-                    return version;
+                    ancestor = previousTag;
+                }
+                else
+                {
+                    return NumberOfCommitsInBranchNotKnownFromBaseBranch(context.Repository, context.CurrentBranch, branchType, baseBranchName);
                 }
             }
+            var filter = new CommitFilter
+                         {
+                             Since = context.CurrentCommit,
+                             Until = ancestor.Target,
+                             SortBy = CommitSortStrategies.Topological | CommitSortStrategies.Time
+                         };
 
-            return null;
+            return context.Repository.Commits.QueryBy(filter).Count() - 1;
         }
 
         void EnsureVersionIsValid(SemanticVersion version, Branch branch, BranchType branchType)

GitVersionCore/LibGitExtensions.cs

@@ -37,6 +37,23 @@ public static SemanticVersion NewestSemVerTag(this IRepository repository, Commi
             return null;
         }
 
+        public static IEnumerable<Tag> SemVerTagsRelatedToVersion(this IRepository repository, SemanticVersion version)
+        {
+            foreach (var tag in repository.Tags)
+            {
+                SemanticVersion tagVersion = null;
+                if (SemanticVersion.TryParse(tag.Name, out tagVersion))
+                {
+                    if (version.Major == tagVersion.Major &&
+                        version.Minor == tagVersion.Minor &&
+                        version.Patch == tagVersion.Patch)
+                    {
+                        yield return tag;
+                    }
+                }
+            }
+        }
+
         public static IEnumerable<Tag> TagsByDate(this IRepository repository, Commit commit)
         {
             return repository.Tags