Make develop track tags on master

This removes the need for the TrackMergeTargetBaseVersionStrategy

Author: JakeGinnivan

src/GitVersionCore.Tests/IntegrationTests/DevelopScenarios.cs

@@ -178,7 +178,7 @@ public void InheritVersionFromReleaseBranch()
             fixture.AssertFullSemver("2.1.0-alpha.4");
             fixture.BranchTo("feature/MyFeature");
             fixture.MakeACommit();
-            fixture.AssertFullSemver("2.1.0-MyFeature.1+1");
+            fixture.AssertFullSemver("2.1.0-MyFeature.1+3");
         }
     }
 }

src/GitVersionCore.Tests/IntegrationTests/FeatureBranchScenarios.cs

@@ -199,4 +199,42 @@ public void ShouldUseConfiguredTag(string tag, string featureName, string preRel
             fixture.AssertFullSemver(config, expectedFullSemVer);
         }
     }
+
+    [Test]
+    public void BranchCreatedAfterFinishReleaseShouldInheritAndIncrementFromLastMasterCommitTag()
+    {
+        using (var fixture = new BaseGitFlowRepositoryFixture("0.1.0"))
+        {
+            //validate current version
+            fixture.AssertFullSemver("0.2.0-alpha.1");
+            fixture.Repository.CreateBranch("release/0.2.0");
+            fixture.Repository.Checkout("release/0.2.0");
+
+            //validate release version
+            fixture.AssertFullSemver("0.2.0-beta.1+0");
+
+            fixture.Checkout("master");
+            fixture.Repository.MergeNoFF("release/0.2.0");
+            fixture.Repository.ApplyTag("0.2.0");
+
+            //validate master branch version
+            fixture.AssertFullSemver("0.2.0");
+
+            fixture.Checkout("develop");
+            fixture.Repository.MergeNoFF("release/0.2.0");
+            fixture.Repository.Branches.Remove("release/2.0.0");
+                
+            fixture.Repository.MakeACommit();
+
+            //validate develop branch version after merging release 0.2.0 to master and develop (finish release)
+            fixture.AssertFullSemver("0.3.0-alpha.1");
+
+            //create a feature branch from develop
+            fixture.BranchTo("feature/TEST-1");
+            fixture.Repository.MakeACommit();
+
+            //I'm not entirely sure what the + value should be but I know the semvar major/minor/patch should be 0.3.0
+            fixture.AssertFullSemver("0.3.0-TEST-1.1+2");
+        }
+    }
 }

src/GitVersionCore/BranchConfigurationCalculator.cs

@@ -114,7 +114,9 @@ static KeyValuePair<string, BranchConfig> InheritBranchConfiguration(bool onlyEv
                         new BranchConfig(branchConfiguration)
                         {
                             Increment = branchConfig.Increment,
-                            PreventIncrementOfMergedBranchVersion = branchConfig.PreventIncrementOfMergedBranchVersion
+                            PreventIncrementOfMergedBranchVersion = branchConfig.PreventIncrementOfMergedBranchVersion,
+                            // If we are inheriting from develop then we should behave like develop
+                            IsDevelop = branchConfig.IsDevelop
                         });
                 }
 
@@ -134,13 +136,15 @@ static KeyValuePair<string, BranchConfig> InheritBranchConfiguration(bool onlyEv
                 var branchName = chosenBranch.FriendlyName;
                 Logger.WriteWarning(errorMessage + Environment.NewLine + Environment.NewLine + "Falling back to " + branchName + " branch config");
 
-                var value = GetBranchConfiguration(currentCommit, repository, onlyEvaluateTrackedBranches, config, chosenBranch).Value;
+                var inheritingBranchConfig = GetBranchConfiguration(currentCommit, repository, onlyEvaluateTrackedBranches, config, chosenBranch).Value;
                 return new KeyValuePair<string, BranchConfig>(
                     keyValuePair.Key,
                     new BranchConfig(branchConfiguration)
                     {
-                        Increment = value.Increment,
-                        PreventIncrementOfMergedBranchVersion = value.PreventIncrementOfMergedBranchVersion
+                        Increment = inheritingBranchConfig.Increment,
+                        PreventIncrementOfMergedBranchVersion = inheritingBranchConfig.PreventIncrementOfMergedBranchVersion,
+                        // If we are inheriting from develop then we should behave like develop
+                        IsDevelop = inheritingBranchConfig.IsDevelop
                     });
             }
         }

src/GitVersionCore/VersionCalculation/BaseVersionCalculators/TaggedCommitVersionStrategy.cs

@@ -7,17 +7,19 @@
     public class TaggedCommitVersionStrategy : BaseVersionStrategy
     {
         public override IEnumerable<BaseVersion> GetVersions(GitVersionContext context)
+        {
+            return GetTaggedVersions(context, context.CurrentBranch);
+        }
+
+        public IEnumerable<BaseVersion> GetTaggedVersions(GitVersionContext context, Branch currentBranch)
         {
             var olderThan = context.CurrentCommit.When();
             var allTags = context.Repository.Tags
-                .Where(tag => ((Commit)tag.PeeledTarget()).When() <= olderThan)
+                .Where(tag => ((Commit) tag.PeeledTarget()).When() <= olderThan)
                 .ToList();
-            var tagsOnBranch = context.CurrentBranch
+            var tagsOnBranch = currentBranch
                 .Commits
-                .SelectMany(commit =>
-                {
-                    return allTags.Where(t => IsValidTag(t, commit));
-                })
+                .SelectMany(commit => { return allTags.Where(t => IsValidTag(t, commit)); })
                 .Select(t =>
                 {
                     SemanticVersion version;

src/GitVersionCore/VersionCalculation/BaseVersionCalculators/TrackMergeTargetBaseVersionStrategy.cs

@@ -3,36 +3,67 @@ namespace GitVersion.VersionCalculation
     using System.Collections.Generic;
     using System.Linq;
     using System.Text.RegularExpressions;
-    using GitVersion.VersionCalculation.BaseVersionCalculators;
+    using BaseVersionCalculators;
+    using GitTools;
     using LibGit2Sharp;
 
     /// <summary>
-    /// Inherit version from release branch
+    /// Inherit version from release branch and tags on master
     /// </summary>
     public class DevelopVersionStrategy : BaseVersionStrategy
     {
         VersionInBranchBaseVersionStrategy releaseVersionStrategy = new VersionInBranchBaseVersionStrategy();
+        TaggedCommitVersionStrategy taggedCommitVersionStrategy = new TaggedCommitVersionStrategy();
 
         public override IEnumerable<BaseVersion> GetVersions(GitVersionContext context)
         {
             if (context.Configuration.IsCurrentBranchDevelop)
             {
-                var releaseBranchConfig = context.FullConfiguration.Branches
-                    .Where(b => b.Value.IsReleaseBranch == true)
-                    .ToList();
-                if (releaseBranchConfig.Any())
-                {
-                    var releaseBranches = context.Repository.Branches
-                        .Where(b => releaseBranchConfig.Any(c => Regex.IsMatch(b.FriendlyName, c.Key)));
-
-                    var baseVersions = releaseBranches.SelectMany(b => GetReleaseVersion(context, b)).ToList();
-                    return baseVersions;
-                }
+                return ReleaseBranchBaseVersions(context).Union(MasterTagsVersions(context));
+            }
+
+            return new BaseVersion[0];
+        }
+
+        private IEnumerable<BaseVersion> MasterTagsVersions(GitVersionContext context)
+        {
+            var master = context.Repository.FindBranch("master");
+            if (master != null)
+            {
+                return taggedCommitVersionStrategy.GetTaggedVersions(context, master);
             }
 
             return new BaseVersion[0];
         }
 
+        private IEnumerable<BaseVersion> ReleaseBranchBaseVersions(GitVersionContext context)
+        {
+            var releaseBranchConfig = context.FullConfiguration.Branches
+                .Where(b => b.Value.IsReleaseBranch == true)
+                .ToList();
+            if (releaseBranchConfig.Any())
+            {
+                var releaseBranches = context.Repository.Branches
+                    .Where(b => releaseBranchConfig.Any(c => Regex.IsMatch(b.FriendlyName, c.Key)));
+
+                return releaseBranches
+                    .SelectMany(b => GetReleaseVersion(context, b))
+                    .Select(baseVersion =>
+                    {
+                        // Need to drop branch overrides and give a bit more context about
+                        // where this version came from
+                        var source1 = "Release branch exists -> " + baseVersion.Source;
+                        return new BaseVersion(source1,
+                            baseVersion.ShouldIncrement,
+                            baseVersion.SemanticVersion,
+                            baseVersion.BaseVersionSource,
+                            null);
+                    })
+                    .ToList();
+            }
+            return new BaseVersion[0];
+        }
+
         IEnumerable<BaseVersion> GetReleaseVersion(GitVersionContext context, Branch releaseBranch)
         {
             var tagPrefixRegex = context.Configuration.GitTagPrefix;

src/GitVersionCore/VersionCalculation/DevelopVersionStrategy.cs

@@ -17,7 +17,6 @@ public NextVersionCalculator(IBaseVersionCalculator baseVersionCalculator = null
                     new FallbackBaseVersionStrategy(),
                     new ConfigNextVersionBaseVersionStrategy(),
                     new TaggedCommitVersionStrategy(),
-                    new TrackMergeTargetBaseVersionStrategy(),
                     new MergeMessageBaseVersionStrategy(),
                     new VersionInBranchBaseVersionStrategy(),
                     new DevelopVersionStrategy());