Support pluralized hotfix and release (hotfixes, releases)

Author: Oren Novotny

src/GitVersionCore.Tests/ConfigProviderTests.CanWriteOutEffectiveConfiguration.approved.txt

@@ -13,7 +13,7 @@ branches:
     increment: Patch
     prevent-increment-of-merged-branch-version: true
     track-merge-target: false
-  release[/-]:
+  releases?[/-]:
     mode: ContinuousDelivery
     tag: beta
     increment: Patch
@@ -32,7 +32,7 @@ branches:
     prevent-increment-of-merged-branch-version: false
     tag-number-pattern: '[/-](?<number>\d+)[-/]'
     track-merge-target: false
-  hotfix[/-]:
+  hotfix(es)?[/-]:
     mode: ContinuousDelivery
     tag: beta
     increment: Patch

src/GitVersionCore.Tests/ConfigProviderTests.cs

@@ -118,7 +118,7 @@ public void CanReadDefaultDocument()
         var config = ConfigurationProvider.Provide(repoPath, fileSystem);
         config.AssemblyVersioningScheme.ShouldBe(AssemblyVersioningScheme.MajorMinorPatch);
         config.Branches["dev(elop)?(ment)?$"].Tag.ShouldBe("unstable");
-        config.Branches["release[/-]"].Tag.ShouldBe("beta");
+        config.Branches["releases?[/-]"].Tag.ShouldBe("beta");
         config.TagPrefix.ShouldBe(ConfigurationProvider.DefaultTagPrefix);
         config.NextVersion.ShouldBe(null);
     }

src/GitVersionCore.Tests/IntegrationTests/HotfixBranchScenarios.cs

@@ -42,6 +42,33 @@ public void PatchLatestReleaseExample()
         }
     }
 
+    [Test]
+    public void CanTakeVersionFromHotfixesBranch()
+    {
+        using (var fixture = new BaseGitFlowRepositoryFixture(r =>
+        {
+            r.MakeATaggedCommit("1.0.0");
+            r.MakeATaggedCommit("1.1.0");
+            r.MakeATaggedCommit("2.0.0");
+        }))
+        {
+
+            // Merge hotfix branch to support
+            fixture.Repository.Checkout("master");
+            fixture.Repository.Checkout(fixture.Repository.CreateBranch("support-1.1", (Commit)fixture.Repository.Tags.Single(t => t.Name == "1.1.0").Target));
+            fixture.AssertFullSemver("1.1.0");
+
+            // create hotfix branch
+            fixture.Repository.Checkout(fixture.Repository.CreateBranch("hotfixes/1.1.1"));
+            fixture.AssertFullSemver("1.1.0"); // We are still on a tagged commit
+            fixture.Repository.MakeACommit();
+
+            fixture.AssertFullSemver("1.1.1-beta.1+1");
+            fixture.Repository.MakeACommit();
+            fixture.AssertFullSemver("1.1.1-beta.1+2");
+        }
+    }
+
     [Test]
     public void PatchOlderReleaseExample()
     {

src/GitVersionCore.Tests/IntegrationTests/ReleaseBranchScenarios.cs

@@ -71,6 +71,22 @@ public void CanTakeVersionFromReleaseBranch()
         }
     }
 
+    [Test]
+    public void CanTakeVersionFromReleasesBranch()
+    {
+        using (var fixture = new EmptyRepositoryFixture(new Config()))
+        {
+            fixture.Repository.MakeATaggedCommit("1.0.3");
+            fixture.Repository.MakeCommits(5);
+            fixture.Repository.CreateBranch("releases/2.0.0");
+            fixture.Repository.Checkout("releases/2.0.0");
+
+            fixture.AssertFullSemver("2.0.0-beta.1+0");
+            fixture.Repository.MakeCommits(2);
+            fixture.AssertFullSemver("2.0.0-beta.1+2");
+        }
+    }
+
     [Test]
     public void ReleaseBranchWithNextVersionSetInConfig()
     {
@@ -95,7 +111,7 @@ public void CanTakeVersionFromReleaseBranchWithTagOverridden()
         {
             Branches =
             {
-                { "release[/-]", new BranchConfig { Tag = "rc" } }
+                { "releases?[/-]", new BranchConfig { Tag = "rc" } }
             }
         };
         using (var fixture = new EmptyRepositoryFixture(config))

src/GitVersionCore/Configuration/ConfigurationProvider.cs

@@ -31,13 +31,13 @@ public static void ApplyDefaultsTo(Config config)
             var configBranches = config.Branches.ToList();
 
             ApplyBranchDefaults(config, GetOrCreateBranchDefaults(config, "master"), defaultTag: string.Empty, defaultPreventIncrement: true);
-            ApplyBranchDefaults(config, GetOrCreateBranchDefaults(config, "release[/-]"), defaultTag: "beta", defaultPreventIncrement: true);
+            ApplyBranchDefaults(config, GetOrCreateBranchDefaults(config, "releases?[/-]"), defaultTag: "beta", defaultPreventIncrement: true);
             ApplyBranchDefaults(config, GetOrCreateBranchDefaults(config, "features?[/-]"), defaultIncrementStrategy: IncrementStrategy.Inherit);
             ApplyBranchDefaults(config, GetOrCreateBranchDefaults(config, @"(pull|pull\-requests|pr)[/-]"),
                 defaultTag: "PullRequest",
                 defaultTagNumberPattern: @"[/-](?<number>\d+)[-/]",
                 defaultIncrementStrategy: IncrementStrategy.Inherit);
-            ApplyBranchDefaults(config, GetOrCreateBranchDefaults(config, "hotfix[/-]"), defaultTag: "beta");
+            ApplyBranchDefaults(config, GetOrCreateBranchDefaults(config, "hotfix(es)?[/-]"), defaultTag: "beta");
             ApplyBranchDefaults(config, GetOrCreateBranchDefaults(config, "support[/-]"), defaultTag: string.Empty, defaultPreventIncrement: true);
             ApplyBranchDefaults(config, GetOrCreateBranchDefaults(config, "dev(elop)?(ment)?$"), 
                 defaultTag: "unstable",