Merge pull request #622 from onovotny/default-branch-config-updates

JakeGinnivan · JakeGinnivan · commit 07e0be40cd09 · 2015-09-07T18:41:51.000+08:00
Default config updates to recognize more defaults
diff --git a/src/GitVersionCore.Tests/ConfigProviderTests.CanWriteOutEffectiveConfiguration.approved.txt b/src/GitVersionCore.Tests/ConfigProviderTests.CanWriteOutEffectiveConfiguration.approved.txt
@@ -13,13 +13,13 @@ branches:
     increment: Patch
     prevent-increment-of-merged-branch-version: true
     track-merge-target: false
-  release[/-]:
+  releases?[/-]:
     mode: ContinuousDelivery
     tag: beta
     increment: Patch
     prevent-increment-of-merged-branch-version: true
     track-merge-target: false
-  feature[/-]:
+  features?[/-]:
     mode: ContinuousDelivery
     tag: useBranchName
     increment: Inherit
@@ -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
@@ -44,7 +44,7 @@ branches:
     increment: Patch
     prevent-increment-of-merged-branch-version: true
     track-merge-target: false
-  develop:
+  dev(elop)?(ment)?$:
     mode: ContinuousDeployment
     tag: unstable
     increment: Minor
diff --git a/src/GitVersionCore.Tests/ConfigProviderTests.cs b/src/GitVersionCore.Tests/ConfigProviderTests.cs
@@ -24,7 +24,7 @@ public void Setup()
     }
 
     [Test]
-    public void CanReadDocument()
+    public void CanReadDocumentAndMigrate()
     {
         const string text = @"
 assembly-versioning-scheme: MajorMinor
@@ -46,10 +46,10 @@ public void CanReadDocument()
         config.NextVersion.ShouldBe("2.0.0");
         config.TagPrefix.ShouldBe("[vV|version-]");
         config.VersioningMode.ShouldBe(VersioningMode.ContinuousDelivery);
-        config.Branches["develop"].Tag.ShouldBe("dev");
-        config.Branches["release[/-]"].Tag.ShouldBe("rc");
-        config.Branches["release[/-]"].VersioningMode.ShouldBe(VersioningMode.ContinuousDeployment);
-        config.Branches["develop"].VersioningMode.ShouldBe(VersioningMode.ContinuousDeployment);
+        config.Branches["dev(elop)?(ment)?$"].Tag.ShouldBe("dev");
+        config.Branches["releases?[/-]"].Tag.ShouldBe("rc");
+        config.Branches["releases?[/-]"].VersioningMode.ShouldBe(VersioningMode.ContinuousDeployment);
+        config.Branches["dev(elop)?(ment)?$"].VersioningMode.ShouldBe(VersioningMode.ContinuousDeployment);
     }
 
     [Test]
@@ -75,16 +75,16 @@ public void OverwritesDefaultsWithProvidedConfig()
         const string text = @"
 next-version: 2.0.0
 branches:
-    develop:
+    dev(elop)?(ment)?$:
         mode: ContinuousDeployment
         tag: dev";
         SetupConfigFileContent(text);
         var config = ConfigurationProvider.Provide(repoPath, fileSystem);
 
         config.NextVersion.ShouldBe("2.0.0");
-        config.Branches["develop"].Increment.ShouldBe(defaultConfig.Branches["develop"].Increment);
-        config.Branches["develop"].VersioningMode.ShouldBe(defaultConfig.Branches["develop"].VersioningMode);
-        config.Branches["develop"].Tag.ShouldBe("dev");
+        config.Branches["dev(elop)?(ment)?$"].Increment.ShouldBe(defaultConfig.Branches["dev(elop)?(ment)?$"].Increment);
+        config.Branches["dev(elop)?(ment)?$"].VersioningMode.ShouldBe(defaultConfig.Branches["dev(elop)?(ment)?$"].VersioningMode);
+        config.Branches["dev(elop)?(ment)?$"].Tag.ShouldBe("dev");
     }
 
     [Test]
@@ -117,8 +117,8 @@ public void CanReadDefaultDocument()
         SetupConfigFileContent(text);
         var config = ConfigurationProvider.Provide(repoPath, fileSystem);
         config.AssemblyVersioningScheme.ShouldBe(AssemblyVersioningScheme.MajorMinorPatch);
-        config.Branches["develop"].Tag.ShouldBe("unstable");
-        config.Branches["release[/-]"].Tag.ShouldBe("beta");
+        config.Branches["dev(elop)?(ment)?$"].Tag.ShouldBe("unstable");
+        config.Branches["releases?[/-]"].Tag.ShouldBe("beta");
         config.TagPrefix.ShouldBe(ConfigurationProvider.DefaultTagPrefix);
         config.NextVersion.ShouldBe(null);
     }
diff --git a/src/GitVersionCore.Tests/GitVersionContextTests.cs b/src/GitVersionCore.Tests/GitVersionContextTests.cs
@@ -39,7 +39,7 @@ public void UsesBranchSpecificConfigOverTopLevelDefaults()
                 Branches =
                 {
                     {
-                        "develop", new BranchConfig
+                        "dev(elop)?(ment)?$", new BranchConfig
                         {
                             VersioningMode = VersioningMode.ContinuousDeployment,
                             Tag = "alpha"
@@ -68,8 +68,8 @@ public void CanFindParentBranchForInheritingIncrementStrategy()
             {
                 Branches =
                 {
-                    { "develop", new BranchConfig { Increment = IncrementStrategy.Major} },
-                    { "feature[/-]", new BranchConfig { Increment = IncrementStrategy.Inherit} }
+                    { "dev(elop)?(ment)?$", new BranchConfig { Increment = IncrementStrategy.Major} },
+                    { "features?[/-]", new BranchConfig { Increment = IncrementStrategy.Inherit} }
                 }
             };
 
diff --git a/src/GitVersionCore.Tests/IntegrationTests/DevelopScenarios.cs b/src/GitVersionCore.Tests/IntegrationTests/DevelopScenarios.cs
@@ -59,7 +59,7 @@ public void CanChangeDevelopTagViaConfig()
         {
             Branches =
             {
-                {"develop", new BranchConfig
+                {"dev(elop)?(ment)?$", new BranchConfig
                 {
                     Tag = "alpha"
                 }
@@ -75,6 +75,18 @@ public void CanChangeDevelopTagViaConfig()
         }
     }
 
+    [Test]
+    public void WhenDeveloperBranchExistsDontTreatAsDevelop()
+    {
+        using (var fixture = new EmptyRepositoryFixture(new Config()))
+        {
+            fixture.Repository.MakeATaggedCommit("1.0.0");
+            fixture.Repository.Checkout(fixture.Repository.CreateBranch("developer"));
+            fixture.Repository.MakeACommit();
+            fixture.AssertFullSemver("1.0.1-developer.1+1"); // this tag should be the branch name by default, not unstable
+        }
+    }
+
     [Test]
     public void WhenDevelopBranchedFromMaster_MinorIsIncreased()
     {
@@ -113,7 +125,7 @@ public void CanHandleContinuousDelivery()
         {
             Branches =
             {
-                {"develop", new BranchConfig
+                {"dev(elop)?(ment)?$", new BranchConfig
                 {
                     VersioningMode = VersioningMode.ContinuousDelivery
                 }
diff --git a/src/GitVersionCore.Tests/IntegrationTests/FeatureBranchScenarios.cs b/src/GitVersionCore.Tests/IntegrationTests/FeatureBranchScenarios.cs
@@ -111,6 +111,20 @@ public void TestFeatureBranch()
         }
     }
 
+    [Test]
+    public void TestFeaturesBranch()
+    {
+        using (var fixture = new EmptyRepositoryFixture(new Config()))
+        {
+            fixture.Repository.MakeATaggedCommit("1.0.0");
+            fixture.Repository.CreateBranch("features/test");
+            fixture.Repository.Checkout("features/test");
+            fixture.Repository.MakeCommits(5);
+
+            fixture.AssertFullSemver("1.0.1-test.1+5");
+        }
+    }
+
     [Test]
     public void WhenTwoFeatureBranchPointToTheSameCommit()
     {
diff --git a/src/GitVersionCore.Tests/IntegrationTests/HotfixBranchScenarios.cs b/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()
     {
diff --git a/src/GitVersionCore.Tests/IntegrationTests/ReleaseBranchScenarios.cs b/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))
diff --git a/src/GitVersionCore/Configuration/ConfigurationProvider.cs b/src/GitVersionCore/Configuration/ConfigurationProvider.cs
@@ -1,5 +1,6 @@
 namespace GitVersion
 {
+    using System.Collections.Generic;
     using System.IO;
     using System.Linq;
     using System.Text;
@@ -20,6 +21,8 @@ public static Config Provide(string workingDirectory, IFileSystem fileSystem, bo
 
         public static void ApplyDefaultsTo(Config config)
         {
+            MigrateBranches(config);
+
             config.AssemblyVersioningScheme = config.AssemblyVersioningScheme ?? AssemblyVersioningScheme.MajorMinorPatch;
             config.TagPrefix = config.TagPrefix ?? DefaultTagPrefix;
             config.VersioningMode = config.VersioningMode ?? VersioningMode.ContinuousDelivery;
@@ -31,15 +34,15 @@ 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, "feature[/-]"), defaultIncrementStrategy: IncrementStrategy.Inherit);
+            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, "develop"), 
+            ApplyBranchDefaults(config, GetOrCreateBranchDefaults(config, "dev(elop)?(ment)?$"), 
                 defaultTag: "unstable",
                 defaultIncrementStrategy: IncrementStrategy.Minor,
                 defaultVersioningMode: VersioningMode.ContinuousDeployment,
@@ -53,6 +56,33 @@ public static void ApplyDefaultsTo(Config config)
             }
         }
 
+        static void MigrateBranches(Config config)
+        {
+            // Map of current names and previous names
+            var dict = new Dictionary<string, string[]>
+            {
+                { "hotfix(es)?[/-]", new []{"hotfix[/-]"}},
+                { "features?[/-]", new []{"feature[/-]"}},
+                { "releases?[/-]", new []{"release[/-]"}},
+                { "dev(elop)?(ment)?$", new []{"develop"}}
+            };
+
+            foreach (var mapping in dict)
+            {
+                foreach (var source in mapping.Value)
+                {
+                    if (config.Branches.ContainsKey(source))
+                    {
+                        // found one, rename
+                        var bc = config.Branches[source];
+                        config.Branches.Remove(source);
+                        config.Branches[mapping.Key] = bc; // re-add with new name
+                    }
+                }
+            }
+        }
+
+
         static BranchConfig GetOrCreateBranchDefaults(Config config, string branch)
         {
             if (!config.Branches.ContainsKey(branch))

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public void UsesBranchSpecificConfigOverTopLevelDefaults()`
`39`	`39`	`Branches =`
`40`	`40`	`{`
`41`	`41`	`{`
`42`		`- "develop", new BranchConfig`
	`42`	`+ "dev(elop)?(ment)?$", new BranchConfig`
`43`	`43`	`{`
`44`	`44`	`VersioningMode = VersioningMode.ContinuousDeployment,`
`45`	`45`	`Tag = "alpha"`
`@@ -68,8 +68,8 @@ public void CanFindParentBranchForInheritingIncrementStrategy()`
`68`	`68`	`{`
`69`	`69`	`Branches =`
`70`	`70`	`{`
`71`		`- { "develop", new BranchConfig { Increment = IncrementStrategy.Major} },`
`72`		`- { "feature[/-]", new BranchConfig { Increment = IncrementStrategy.Inherit} }`
	`71`	`+ { "dev(elop)?(ment)?$", new BranchConfig { Increment = IncrementStrategy.Major} },`
	`72`	`+ { "features?[/-]", new BranchConfig { Increment = IncrementStrategy.Inherit} }`
`73`	`73`	`}`
`74`	`74`	`};`
`75`	`75`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public void CanChangeDevelopTagViaConfig()`
`59`	`59`	`{`
`60`	`60`	`Branches =`
`61`	`61`	`{`
`62`		`- {"develop", new BranchConfig`
	`62`	`+ {"dev(elop)?(ment)?$", new BranchConfig`
`63`	`63`	`{`
`64`	`64`	`Tag = "alpha"`
`65`	`65`	`}`
`@@ -75,6 +75,18 @@ public void CanChangeDevelopTagViaConfig()`
`75`	`75`	`}`
`76`	`76`	`}`
`77`	`77`
	`78`	`+ [Test]`
	`79`	`+ public void WhenDeveloperBranchExistsDontTreatAsDevelop()`
	`80`	`+ {`
	`81`	`+ using (var fixture = new EmptyRepositoryFixture(new Config()))`
	`82`	`+ {`
	`83`	`+ fixture.Repository.MakeATaggedCommit("1.0.0");`
	`84`	`+ fixture.Repository.Checkout(fixture.Repository.CreateBranch("developer"));`
	`85`	`+ fixture.Repository.MakeACommit();`
	`86`	`+ fixture.AssertFullSemver("1.0.1-developer.1+1"); // this tag should be the branch name by default, not unstable`
	`87`	`+ }`
	`88`	`+ }`
	`89`	`+`
`78`	`90`	`[Test]`
`79`	`91`	`public void WhenDevelopBranchedFromMaster_MinorIsIncreased()`
`80`	`92`	`{`
`@@ -113,7 +125,7 @@ public void CanHandleContinuousDelivery()`
`113`	`125`	`{`
`114`	`126`	`Branches =`
`115`	`127`	`{`
`116`		`- {"develop", new BranchConfig`
	`128`	`+ {"dev(elop)?(ment)?$", new BranchConfig`
`117`	`129`	`{`
`118`	`130`	`VersioningMode = VersioningMode.ContinuousDelivery`
`119`	`131`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,22 @@ public void CanTakeVersionFromReleaseBranch()`
`71`	`71`	`}`
`72`	`72`	`}`
`73`	`73`
	`74`	`+ [Test]`
	`75`	`+ public void CanTakeVersionFromReleasesBranch()`
	`76`	`+ {`
	`77`	`+ using (var fixture = new EmptyRepositoryFixture(new Config()))`
	`78`	`+ {`
	`79`	`+ fixture.Repository.MakeATaggedCommit("1.0.3");`
	`80`	`+ fixture.Repository.MakeCommits(5);`
	`81`	`+ fixture.Repository.CreateBranch("releases/2.0.0");`
	`82`	`+ fixture.Repository.Checkout("releases/2.0.0");`
	`83`	`+`
	`84`	`+ fixture.AssertFullSemver("2.0.0-beta.1+0");`
	`85`	`+ fixture.Repository.MakeCommits(2);`
	`86`	`+ fixture.AssertFullSemver("2.0.0-beta.1+2");`
	`87`	`+ }`
	`88`	`+ }`
	`89`	`+`
`74`	`90`	`[Test]`
`75`	`91`	`public void ReleaseBranchWithNextVersionSetInConfig()`
`76`	`92`	`{`
`@@ -95,7 +111,7 @@ public void CanTakeVersionFromReleaseBranchWithTagOverridden()`
`95`	`111`	`{`
`96`	`112`	`Branches =`
`97`	`113`	`{`
`98`		`- { "release[/-]", new BranchConfig { Tag = "rc" } }`
	`114`	`+ { "releases?[/-]", new BranchConfig { Tag = "rc" } }`
`99`	`115`	`}`
`100`	`116`	`};`
`101`	`117`	`using (var fixture = new EmptyRepositoryFixture(config))`