Made sure it's still easy to add new branches to configuration.

JakeGinnivan · JakeGinnivan · commit 28d1fd5ef888 · 2017-06-18T10:58:52.000+08:00
diff --git a/docs/configuration.md b/docs/configuration.md
@@ -277,6 +277,10 @@ To resolve this issue we give GitVersion a hint to how we normally do our branch
 
 This means that we will never bother to evaluate pull requests as merge base options, being explicit like this helps GitVersion be much faster too.
 
+### is-source-branch-for
+The reverse of the above setting. This property was introduced to keep it easy to extend GitVersion's config.
+
+When you add a new branch type this allows you to specify both source-branches for the new branch, and also add the new branch to existing branch configurations. For example if you create a new branch called `unstable` you could set a value of `['release', 'master', 'feature']` etc. 
 
 ### branches
 The header for all the individual branch configuration.
diff --git a/src/GitVersionCore.Tests/ConfigProviderTests.CanWriteOutEffectiveConfiguration.approved.txt b/src/GitVersionCore.Tests/ConfigProviderTests.CanWriteOutEffectiveConfiguration.approved.txt
@@ -46,6 +46,8 @@ branches:
     source-branches:
     - develop
     - master
+    - support
+    - release
     tracks-release-branches: false
     is-release-branch: true
     is-mainline: false
@@ -94,6 +96,7 @@ branches:
     source-branches:
     - develop
     - master
+    - support
     tracks-release-branches: false
     is-release-branch: false
     is-mainline: false
diff --git a/src/GitVersionCore.Tests/GitRepoMetadataProviderTests.cs b/src/GitVersionCore.Tests/GitRepoMetadataProviderTests.cs
@@ -52,10 +52,10 @@ public void FindsCorrectMergeBaseForForwardMerge()
 
                 var develop = fixture.Repository.FindBranch("develop");
                 var release = fixture.Repository.FindBranch("release-2.0.0");
-                var releaseBranchMergeBase = new GitRepoMetadataProvider(fixture.Repository)
+                var releaseBranchMergeBase = new GitRepoMetadataProvider(fixture.Repository, new Config())
                     .FindMergeBase(release, develop);
 
-                var developMergeBase = new GitRepoMetadataProvider(fixture.Repository)
+                var developMergeBase = new GitRepoMetadataProvider(fixture.Repository, new Config())
                     .FindMergeBase(develop, release);
 
                 fixture.Repository.DumpGraph(Console.WriteLine);
@@ -109,10 +109,10 @@ public void FindsCorrectMergeBaseForForwardMergeMovesOn()
 
                 var develop = fixture.Repository.FindBranch("develop");
                 var release = fixture.Repository.FindBranch("release-2.0.0");
-                var releaseBranchMergeBase = new GitRepoMetadataProvider(fixture.Repository)
+                var releaseBranchMergeBase = new GitRepoMetadataProvider(fixture.Repository, new Config())
                     .FindMergeBase(release, develop);
 
-                var developMergeBase = new GitRepoMetadataProvider(fixture.Repository)
+                var developMergeBase = new GitRepoMetadataProvider(fixture.Repository, new Config())
                     .FindMergeBase(develop, release);
 
                 fixture.Repository.DumpGraph(Console.WriteLine);
@@ -184,10 +184,10 @@ public void FindsCorrectMergeBaseForMultipleForwardMerges()
 
                 var develop = fixture.Repository.FindBranch("develop");
                 var release = fixture.Repository.FindBranch("release-2.0.0");
-                var releaseBranchMergeBase = new GitRepoMetadataProvider(fixture.Repository)
+                var releaseBranchMergeBase = new GitRepoMetadataProvider(fixture.Repository, new Config())
                     .FindMergeBase(release, develop);
 
-                var developMergeBase = new GitRepoMetadataProvider(fixture.Repository)
+                var developMergeBase = new GitRepoMetadataProvider(fixture.Repository, new Config())
                     .FindMergeBase(develop, release);
 
                 fixture.Repository.DumpGraph(Console.WriteLine);
diff --git a/src/GitVersionCore.Tests/GitVersionContextTests.cs b/src/GitVersionCore.Tests/GitVersionContextTests.cs
@@ -5,6 +5,7 @@
     using LibGit2Sharp;
     using NUnit.Framework;
     using Shouldly;
+    using System.Collections.Generic;
 
     public class GitVersionContextTests
     {
@@ -98,8 +99,8 @@ public void UsesFirstBranchConfigWhenMultipleMatch()
                 VersioningMode = VersioningMode.ContinuousDelivery,
                 Branches =
                 {
-                    { "release/latest", new BranchConfig { Increment = IncrementStrategy.None, Regex = "release/latest", SourceBranches = new string[0] } },
-                    { "release", new BranchConfig { Increment = IncrementStrategy.Patch, Regex = "releases?[/-]", SourceBranches = new string[0] } }
+                    { "release/latest", new BranchConfig { Increment = IncrementStrategy.None, Regex = "release/latest", SourceBranches = new List<string>() } },
+                    { "release", new BranchConfig { Increment = IncrementStrategy.Patch, Regex = "releases?[/-]", SourceBranches = new List<string>() } }
                 }
             }.ApplyDefaults();
 
diff --git a/src/GitVersionCore.Tests/IntegrationTests/DevelopScenarios.cs b/src/GitVersionCore.Tests/IntegrationTests/DevelopScenarios.cs
@@ -3,6 +3,7 @@
 using GitVersionCore.Tests;
 using LibGit2Sharp;
 using NUnit.Framework;
+using System.Collections.Generic;
 
 [TestFixture]
 public class DevelopScenarios
@@ -65,7 +66,7 @@ public void CanChangeDevelopTagViaConfig()
                     "develop", new BranchConfig
                     {
                         Tag = "alpha",
-                        SourceBranches = new string[0]
+                        SourceBranches = new List<string>()
                     }
                 }
             }
diff --git a/src/GitVersionCore.Tests/IntegrationTests/FeatureBranchScenarios.cs b/src/GitVersionCore.Tests/IntegrationTests/FeatureBranchScenarios.cs
@@ -42,9 +42,16 @@ public void BranchCreatedAfterFastForwardMergeShouldInheritCorrectly()
         {
             Branches =
             {
-                { "unstable", new BranchConfig {
-                    Increment = IncrementStrategy.Minor, Regex = "unstable", SourceBranches = new string[0]
-                } }
+                {
+                    "unstable",
+                    new BranchConfig
+                    {
+                        Increment = IncrementStrategy.Minor,
+                        Regex = "unstable",
+                        SourceBranches = new List<string>(),
+                        IsSourceBranchFor = new [] { "feature" }
+                    }
+                }
             }
         };
 
diff --git a/src/GitVersionCore.Tests/IntegrationTests/OtherScenarios.cs b/src/GitVersionCore.Tests/IntegrationTests/OtherScenarios.cs
@@ -5,6 +5,7 @@
     using GitVersion;
     using LibGit2Sharp;
     using NUnit.Framework;
+    using System.Collections.Generic;
 
     [TestFixture]
     public class OtherScenarios
@@ -57,7 +58,7 @@ public void AllowHavingMainInsteadOfMaster()
                 Increment = IncrementStrategy.Patch,
                 PreventIncrementOfMergedBranchVersion = true,
                 TrackMergeTarget = false,
-                SourceBranches = new string[0]
+                SourceBranches = new List<string>()
             });
 
             using (var fixture = new EmptyRepositoryFixture())
diff --git a/src/GitVersionCore.Tests/IntegrationTests/ReleaseBranchScenarios.cs b/src/GitVersionCore.Tests/IntegrationTests/ReleaseBranchScenarios.cs
@@ -418,7 +418,7 @@ public void CommitOnDevelop_AfterReleaseBranchMergeToDevelop_ShouldNotResetCount
             fixture.AssertFullSemver(config, "2.0.0-beta.5");
         }
     }
-  
+
     public void ReleaseBranchShouldUseBranchNameVersionDespiteBumpInPreviousCommit()
     {
         using (var fixture = new EmptyRepositoryFixture())
@@ -463,4 +463,53 @@ public void ReleaseBranchedAtCommitWithSemverMessageShouldUseBranchNameVersion()
             fixture.AssertFullSemver("2.0.0-beta.1+1");
         }
     }
+
+    [Test]
+    public void FeatureFromReleaseBranch_ShouldNotResetCount()
+    {
+        var config = new Config
+        {
+            VersioningMode = VersioningMode.ContinuousDeployment
+        };
+
+        using (var fixture = new EmptyRepositoryFixture())
+        {
+            fixture.Repository.MakeACommit("initial");
+            fixture.Repository.CreateBranch("develop");
+            Commands.Checkout(fixture.Repository, "develop");
+            fixture.Repository.CreateBranch("release-2.0.0");
+            Commands.Checkout(fixture.Repository, "release-2.0.0");
+            fixture.AssertFullSemver(config, "2.0.0-beta.0");
+
+            // Make some commits on release
+            fixture.Repository.MakeCommits(10);
+            fixture.AssertFullSemver(config, "2.0.0-beta.10");
+
+            // Create feature from release
+            fixture.BranchTo("feature/xxx");
+            fixture.Repository.MakeACommit("feature 1");
+            fixture.Repository.MakeACommit("feature 2");
+
+            // Check version on release
+            Commands.Checkout(fixture.Repository, "release-2.0.0");
+            fixture.AssertFullSemver(config, "2.0.0-beta.10");
+            fixture.Repository.MakeACommit("release 11");
+            fixture.AssertFullSemver(config, "2.0.0-beta.11");
+
+            // Make new commit on feature
+            Commands.Checkout(fixture.Repository, "feature/xxx");
+            fixture.Repository.MakeACommit("feature 3");
+
+            // Checkout to release (no new commits) 
+            Commands.Checkout(fixture.Repository, "release-2.0.0");
+            fixture.AssertFullSemver(config, "2.0.0-beta.11");
+
+            // Merge feature to release
+            fixture.Repository.MergeNoFF("feature/xxx", Generate.SignatureNow());
+            fixture.AssertFullSemver(config, "2.0.0-beta.15");
+
+            fixture.Repository.MakeACommit("release 13 - after feature merge");
+            fixture.AssertFullSemver(config, "2.0.0-beta.16");
+        }
+    }
 }
diff --git a/src/GitVersionCore.Tests/IntegrationTests/VersionBumpingScenarios.cs b/src/GitVersionCore.Tests/IntegrationTests/VersionBumpingScenarios.cs
@@ -2,6 +2,7 @@
 using GitVersion;
 using GitVersionCore.Tests;
 using NUnit.Framework;
+using System.Collections.Generic;
 
 [TestFixture]
 public class VersionBumpingScenarios
@@ -17,7 +18,7 @@ public void AppliedPrereleaseTagCausesBump()
                     "master", new BranchConfig
                     {
                         Tag = "pre",
-                        SourceBranches = new string[0]
+                        SourceBranches = new List<string>()
                     }
                 }
             }
diff --git a/src/GitVersionCore.Tests/VersionCalculation/NextVersionCalculatorTests.cs b/src/GitVersionCore.Tests/VersionCalculation/NextVersionCalculatorTests.cs
@@ -68,7 +68,7 @@ public void PreReleaseTagCanUseBranchName()
                         {
                             Regex = "custom/",
                             Tag = "useBranchName",
-                            SourceBranches = new string[0]
+                            SourceBranches = new List<string>()
                         }
                     }
                 }
@@ -99,7 +99,7 @@ public void PreReleaseTagCanUseBranchNameVariable()
                         {
                             Regex = "custom/",
                             Tag = "alpha.{BranchName}",
-                            SourceBranches = new string[0]
+                            SourceBranches = new List<string>()
                         }
                     }
                 }
diff --git a/src/GitVersionCore/BranchConfigurationCalculator.cs b/src/GitVersionCore/BranchConfigurationCalculator.cs
@@ -22,7 +22,7 @@ public static BranchConfig GetBranchConfiguration(GitVersionContext context, Bra
                     targetBranch.FriendlyName));
 
                 matchingBranches = new BranchConfig { Name = string.Empty };
-                ConfigurationProvider.ApplyBranchDefaults(context.FullConfiguration, matchingBranches, "", new string[0]);
+                ConfigurationProvider.ApplyBranchDefaults(context.FullConfiguration, matchingBranches, "", new List<string>());
             }
 
             return matchingBranches.Increment == IncrementStrategy.Inherit ?
diff --git a/src/GitVersionCore/Configuration/BranchConfig.cs b/src/GitVersionCore/Configuration/BranchConfig.cs
@@ -1,5 +1,6 @@
 ﻿namespace GitVersion
 {
+    using System.Collections.Generic;
     using YamlDotNet.Serialization;
 
     public class BranchConfig
@@ -25,6 +26,8 @@ public BranchConfig(BranchConfig branchConfiguration)
             IsReleaseBranch = branchConfiguration.IsReleaseBranch;
             IsMainline = branchConfiguration.IsMainline;
             Name = branchConfiguration.Name;
+            SourceBranches = branchConfiguration.SourceBranches;
+            IsSourceBranchFor = branchConfiguration.IsSourceBranchFor;
         }
 
         [YamlMember(Alias = "mode")]
@@ -55,7 +58,10 @@ public BranchConfig(BranchConfig branchConfiguration)
         public string Regex { get; set; }
 
         [YamlMember(Alias = "source-branches")]
-        public string[] SourceBranches { get; set; }
+        public List<string> SourceBranches { get; set; }
+
+        [YamlMember(Alias = "is-source-branch-for")]
+        public string[] IsSourceBranchFor { get; set; }
 
         [YamlMember(Alias = "tracks-release-branches")]
         public bool? TracksReleaseBranches { get; set; }
diff --git a/src/GitVersionCore/Configuration/ConfigurationProvider.cs b/src/GitVersionCore/Configuration/ConfigurationProvider.cs
@@ -2,6 +2,7 @@ namespace GitVersion
 {
     using Configuration.Init.Wizard;
     using GitVersion.Helpers;
+    using System.Collections.Generic;
     using System.IO;
     using System.Linq;
     using System.Text;
@@ -104,7 +105,7 @@ public static void ApplyDefaultsTo(Config config)
             ApplyBranchDefaults(config,
                 GetOrCreateBranchDefaults(config, DevelopBranchKey),
                 DevelopBranchRegex,
-                new string[0],
+                new List<string>(),
                 defaultTag: "alpha",
                 defaultIncrementStrategy: IncrementStrategy.Minor,
                 defaultVersioningMode: VersioningMode.ContinuousDeployment,
@@ -113,41 +114,41 @@ public static void ApplyDefaultsTo(Config config)
             ApplyBranchDefaults(config,
                 GetOrCreateBranchDefaults(config, MasterBranchKey),
                 MasterBranchRegex,
-                new string[] { "develop", "release" },
+                new List<string> { "develop", "release" },
                 defaultTag: string.Empty,
                 defaultPreventIncrement: true,
                 defaultIncrementStrategy: IncrementStrategy.Patch,
                 isMainline: true);
             ApplyBranchDefaults(config,
                 GetOrCreateBranchDefaults(config, ReleaseBranchKey),
                 ReleaseBranchRegex,
-                new string[] { "develop", "master" },
+                new List<string> { "develop", "master", "support", "release" },
                 defaultTag: "beta",
                 defaultPreventIncrement: true,
                 defaultIncrementStrategy: IncrementStrategy.Patch,
                 isReleaseBranch: true);
             ApplyBranchDefaults(config,
                 GetOrCreateBranchDefaults(config, FeatureBranchKey),
                 FeatureBranchRegex,
-                new string[] { "develop", "master", "release", "feature", "support", "hotfix" },
+                new List<string> { "develop", "master", "release", "feature", "support", "hotfix" },
                 defaultIncrementStrategy: IncrementStrategy.Inherit);
             ApplyBranchDefaults(config,
                 GetOrCreateBranchDefaults(config, PullRequestBranchKey),
                 PullRequestRegex,
-                new string[] { "develop", "master", "release", "feature", "support", "hotfix" },
+                new List<string> { "develop", "master", "release", "feature", "support", "hotfix" },
                 defaultTag: "PullRequest",
                 defaultTagNumberPattern: @"[/-](?<number>\d+)",
                 defaultIncrementStrategy: IncrementStrategy.Inherit);
             ApplyBranchDefaults(config,
                 GetOrCreateBranchDefaults(config, HotfixBranchKey),
                 HotfixBranchRegex,
-                new string[] { "develop", "master" },
+                new List<string> { "develop", "master", "support" },
                 defaultTag: "beta",
                 defaultIncrementStrategy: IncrementStrategy.Patch);
             ApplyBranchDefaults(config,
                 GetOrCreateBranchDefaults(config, SupportBranchKey),
                 SupportBranchRegex,
-                new string[] { "master" },
+                new List<string> { "master" },
                 defaultTag: string.Empty,
                 defaultPreventIncrement: true,
                 defaultIncrementStrategy: IncrementStrategy.Patch,
@@ -171,6 +172,16 @@ public static void ApplyDefaultsTo(Config config)
 
                 ApplyBranchDefaults(config, branchConfig.Value, regex, sourceBranches);
             }
+
+            // This is a second pass to add additional sources, it has to be another pass to prevent ordering issues
+            foreach (var branchConfig in configBranches)
+            {
+                if (branchConfig.Value.IsSourceBranchFor == null) continue;
+                foreach (var isSourceBranch in branchConfig.Value.IsSourceBranchFor)
+                {
+                    config.Branches[isSourceBranch].SourceBranches.Add(branchConfig.Key);
+                }
+            }
         }
 
         static void ApplyOverridesTo(Config config, Config overrideConfig)
@@ -193,7 +204,7 @@ static BranchConfig GetOrCreateBranchDefaults(Config config, string branchKey)
         public static void ApplyBranchDefaults(Config config,
             BranchConfig branchConfig,
             string branchRegex,
-            string[] sourceBranches,
+            List<string> sourceBranches,
             string defaultTag = "useBranchName",
             IncrementStrategy? defaultIncrementStrategy = null, // Looked up from main config
             bool defaultPreventIncrement = false,
diff --git a/src/GitVersionCore/GitRepoMetadataProvider.cs b/src/GitVersionCore/GitRepoMetadataProvider.cs
diff --git a/src/GitVersionCore/GitVersionContext.cs b/src/GitVersionCore/GitVersionContext.cs
diff --git a/src/GitVersionCore/VersionCalculation/BaseVersionCalculator.cs b/src/GitVersionCore/VersionCalculation/BaseVersionCalculator.cs

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`using LibGit2Sharp;`
`6`	`6`	`using NUnit.Framework;`
`7`	`7`	`using Shouldly;`
	`8`	`+ using System.Collections.Generic;`
`8`	`9`
`9`	`10`	`public class GitVersionContextTests`
`10`	`11`	`{`
`@@ -98,8 +99,8 @@ public void UsesFirstBranchConfigWhenMultipleMatch()`
`98`	`99`	`VersioningMode = VersioningMode.ContinuousDelivery,`
`99`	`100`	`Branches =`
`100`	`101`	`{`
`101`		`- { "release/latest", new BranchConfig { Increment = IncrementStrategy.None, Regex = "release/latest", SourceBranches = new string[0] } },`
`102`		`- { "release", new BranchConfig { Increment = IncrementStrategy.Patch, Regex = "releases?[/-]", SourceBranches = new string[0] } }`
	`102`	`+ { "release/latest", new BranchConfig { Increment = IncrementStrategy.None, Regex = "release/latest", SourceBranches = new List<string>() } },`
	`103`	`+ { "release", new BranchConfig { Increment = IncrementStrategy.Patch, Regex = "releases?[/-]", SourceBranches = new List<string>() } }`
`103`	`104`	`}`
`104`	`105`	`}.ApplyDefaults();`
`105`	`106`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`using GitVersionCore.Tests;`
`4`	`4`	`using LibGit2Sharp;`
`5`	`5`	`using NUnit.Framework;`
	`6`	`+using System.Collections.Generic;`
`6`	`7`
`7`	`8`	`[TestFixture]`
`8`	`9`	`public class DevelopScenarios`
`@@ -65,7 +66,7 @@ public void CanChangeDevelopTagViaConfig()`
`65`	`66`	`"develop", new BranchConfig`
`66`	`67`	`{`
`67`	`68`	`Tag = "alpha",`
`68`		`- SourceBranches = new string[0]`
	`69`	`+ SourceBranches = new List<string>()`
`69`	`70`	`}`
`70`	`71`	`}`
`71`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,9 +42,16 @@ public void BranchCreatedAfterFastForwardMergeShouldInheritCorrectly()`
`42`	`42`	`{`
`43`	`43`	`Branches =`
`44`	`44`	`{`
`45`		`- { "unstable", new BranchConfig {`
`46`		`- Increment = IncrementStrategy.Minor, Regex = "unstable", SourceBranches = new string[0]`
`47`		`- } }`
	`45`	`+ {`
	`46`	`+ "unstable",`
	`47`	`+ new BranchConfig`
	`48`	`+ {`
	`49`	`+ Increment = IncrementStrategy.Minor,`
	`50`	`+ Regex = "unstable",`
	`51`	`+ SourceBranches = new List<string>(),`
	`52`	`+ IsSourceBranchFor = new [] { "feature" }`
	`53`	`+ }`
	`54`	`+ }`
`48`	`55`	`}`
`49`	`56`	`};`
`50`	`57`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`using GitVersion;`
`3`	`3`	`using GitVersionCore.Tests;`
`4`	`4`	`using NUnit.Framework;`
	`5`	`+using System.Collections.Generic;`
`5`	`6`
`6`	`7`	`[TestFixture]`
`7`	`8`	`public class VersionBumpingScenarios`
`@@ -17,7 +18,7 @@ public void AppliedPrereleaseTagCausesBump()`
`17`	`18`	`"master", new BranchConfig`
`18`	`19`	`{`
`19`	`20`	`Tag = "pre",`
`20`		`- SourceBranches = new string[0]`
	`21`	`+ SourceBranches = new List<string>()`
`21`	`22`	`}`
`22`	`23`	`}`
`23`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public void PreReleaseTagCanUseBranchName()`
`68`	`68`	`{`
`69`	`69`	`Regex = "custom/",`
`70`	`70`	`Tag = "useBranchName",`
`71`		`- SourceBranches = new string[0]`
	`71`	`+ SourceBranches = new List<string>()`
`72`	`72`	`}`
`73`	`73`	`}`
`74`	`74`	`}`
`@@ -99,7 +99,7 @@ public void PreReleaseTagCanUseBranchNameVariable()`
`99`	`99`	`{`
`100`	`100`	`Regex = "custom/",`
`101`	`101`	`Tag = "alpha.{BranchName}",`
`102`		`- SourceBranches = new string[0]`
	`102`	`+ SourceBranches = new List<string>()`
`103`	`103`	`}`
`104`	`104`	`}`
`105`	`105`	`}`