Merge pull request #766 from gusztavvargadr/feature/support-branch-name-variable-in-tag-configuration

Support branch name variable in tag configuration #664

Author: JakeGinnivan

src/GitVersionCore.Tests/IntegrationTests/FeatureBranchScenarios.cs

@@ -170,4 +170,30 @@ public void ShouldBePossibleToMergeDevelopForALongRunningBranchWhereDevelopAndMa
             fixture.AssertFullSemver("1.2.0-longrunning.2");
         }
     }
+
+    [TestCase("alpha", "JIRA-123", "alpha")]
+    [TestCase("useBranchName", "JIRA-123", "JIRA-123")]
+    [TestCase("alpha.{BranchName}", "JIRA-123", "alpha.JIRA-123")]
+    public void ShouldUseConfiguredTag(string tag, string featureName, string preReleaseTagName)
+    {
+        var config = new Config
+        {
+            Branches =
+            {
+                { "features?[/-]", new BranchConfig { Tag = tag } }
+            }
+        };
+
+        using (var fixture = new EmptyRepositoryFixture(config))
+        {
+            fixture.Repository.MakeATaggedCommit("1.0.0");
+            var featureBranchName = string.Format("feature/{0}", featureName);
+            fixture.Repository.CreateBranch(featureBranchName);
+            fixture.Repository.Checkout(featureBranchName);
+            fixture.Repository.MakeCommits(5);
+
+            var expectedFullSemVer = string.Format("1.0.1-{0}.1+5", preReleaseTagName);
+            fixture.AssertFullSemver(expectedFullSemVer);
+        }
+    }
 }

src/GitVersionCore.Tests/VersionCalculation/NextVersionCalculatorTests.cs

@@ -72,5 +72,27 @@ public void PreReleaseTagCanUseBranchName()
 
             version.ToString("f").ShouldBe("1.0.0-foo.1+2");
         }
+
+        [Test]
+        public void PreReleaseTagCanUseBranchNameVariable()
+        {
+            var baseCalculator = new TestBaseVersionCalculator(false, new SemanticVersion(1), new MockCommit());
+            var semanticVersionBuildMetaData = new SemanticVersionBuildMetaData(2, "develop", "b1a34e", DateTimeOffset.Now);
+            var sut = new NextVersionCalculator(baseCalculator, new TestMetaDataCalculator(semanticVersionBuildMetaData));
+            var config = new Config();
+            config.Branches.Add("custom/", new BranchConfig
+            {
+                Tag = "alpha.{BranchName}"
+            });
+            var context = new GitVersionContextBuilder()
+                .WithConfig(config)
+                .WithDevelopBranch()
+                .AddBranch("custom/foo")
+                .Build();
+
+            var version = sut.FindVersion(context);
+
+            version.ToString("f").ShouldBe("1.0.0-alpha.foo.1+2");
+        }
     }
 }

src/GitVersionCore/VersionCalculation/NextVersionCalculator.cs

@@ -70,15 +70,23 @@ void UpdatePreReleaseTag(GitVersionContext context, SemanticVersion semanticVers
         {
             var tagToUse = context.Configuration.Tag;
             if (tagToUse == "useBranchName")
+            {
+                tagToUse = "{BranchName}";
+            }
+            if (tagToUse.Contains("{BranchName}"))
             {
                 Logger.WriteInfo("Using branch name to calculate version tag");
-                tagToUse = branchNameOverride ?? context.CurrentBranch.Name;
+
+                var branchName = branchNameOverride ?? context.CurrentBranch.Name;
                 if (!string.IsNullOrWhiteSpace(context.Configuration.BranchPrefixToTrim))
                 {
-                    tagToUse = tagToUse.RegexReplace(context.Configuration.BranchPrefixToTrim, string.Empty, RegexOptions.IgnoreCase);
+                    branchName = branchName.RegexReplace(context.Configuration.BranchPrefixToTrim, string.Empty, RegexOptions.IgnoreCase);
                 }
-                tagToUse = tagToUse.RegexReplace("[^a-zA-Z0-9-]", "-");
+                branchName = branchName.RegexReplace("[^a-zA-Z0-9-]", "-");
+
+                tagToUse = tagToUse.Replace("{BranchName}", branchName);
             }
+
             int? number = null;
             if (!string.IsNullOrEmpty(context.Configuration.TagNumberPattern))
             {