Merge pull request #1102 from JakeGinnivan/feature-branch-does-not-pick-up-version

Feature branch does not pick up version

Author: JakeGinnivan

docs/configuration.md

@@ -163,7 +163,7 @@ branches:
     increment: Patch
     prevent-increment-of-merged-branch-version: true
     track-merge-target: false
-    is-develop: false
+    tracks-release-branches: false
     is-release-branch: false
   release:
     regex: releases?[/-]
@@ -172,7 +172,7 @@ branches:
     increment: Patch
     prevent-increment-of-merged-branch-version: true
     track-merge-target: false
-    is-develop: false
+    tracks-release-branches: false
     is-release-branch: true
   feature:
     regex: features?[/-]
@@ -181,7 +181,7 @@ branches:
     increment: Inherit
     prevent-increment-of-merged-branch-version: false
     track-merge-target: false
-    is-develop: false
+    tracks-release-branches: false
     is-release-branch: false
   pull-request:
     regex: (pull|pull\-requests|pr)[/-]
@@ -191,7 +191,7 @@ branches:
     prevent-increment-of-merged-branch-version: false
     tag-number-pattern: '[/-](?<number>\d+)[-/]'
     track-merge-target: false
-    is-develop: false
+    tracks-release-branches: false
     is-release-branch: false
   hotfix:
     regex: hotfix(es)?[/-]
@@ -200,7 +200,7 @@ branches:
     increment: Patch
     prevent-increment-of-merged-branch-version: false
     track-merge-target: false
-    is-develop: false
+    tracks-release-branches: false
     is-release-branch: false
   support:
     regex: support[/-]
@@ -209,7 +209,7 @@ branches:
     increment: Patch
     prevent-increment-of-merged-branch-version: true
     track-merge-target: false
-    is-develop: false
+    tracks-release-branches: false
     is-release-branch: false
   develop:
     regex: dev(elop)?(ment)?$
@@ -218,7 +218,7 @@ branches:
     increment: Minor
     prevent-increment-of-merged-branch-version: false
     track-merge-target: true
-    is-develop: true
+    tracks-release-branches: true
     is-release-branch: false
 ```
 
@@ -282,7 +282,7 @@ Strategy which will look for tagged merge commits directly off the current
 branch. For example `develop` → `release/1.0.0` → merge into `master` and tag
 `1.0.0`. The tag is *not* on develop, but develop should be version `1.0.0` now.
 
-### is-develop
+### tracks-release-branches
 Indicates this branch config represents develop in GitFlow.
 
 ### is-release-branch

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

@@ -18,7 +18,7 @@ branches:
     prevent-increment-of-merged-branch-version: true
     track-merge-target: false
     regex: master
-    is-develop: false
+    tracks-release-branches: false
     is-release-branch: false
     is-mainline: true
   release:
@@ -28,7 +28,7 @@ branches:
     prevent-increment-of-merged-branch-version: true
     track-merge-target: false
     regex: releases?[/-]
-    is-develop: false
+    tracks-release-branches: false
     is-release-branch: true
     is-mainline: false
   feature:
@@ -38,7 +38,7 @@ branches:
     prevent-increment-of-merged-branch-version: false
     track-merge-target: false
     regex: features?[/-]
-    is-develop: false
+    tracks-release-branches: false
     is-release-branch: false
     is-mainline: false
   pull-request:
@@ -49,7 +49,7 @@ branches:
     tag-number-pattern: '[/-](?<number>\d+)[-/]'
     track-merge-target: false
     regex: (pull|pull\-requests|pr)[/-]
-    is-develop: false
+    tracks-release-branches: false
     is-release-branch: false
     is-mainline: false
   hotfix:
@@ -59,7 +59,7 @@ branches:
     prevent-increment-of-merged-branch-version: false
     track-merge-target: false
     regex: hotfix(es)?[/-]
-    is-develop: false
+    tracks-release-branches: false
     is-release-branch: false
     is-mainline: false
   support:
@@ -69,7 +69,7 @@ branches:
     prevent-increment-of-merged-branch-version: true
     track-merge-target: false
     regex: support[/-]
-    is-develop: false
+    tracks-release-branches: false
     is-release-branch: false
     is-mainline: true
   develop:
@@ -79,7 +79,7 @@ branches:
     prevent-increment-of-merged-branch-version: false
     track-merge-target: true
     regex: dev(elop)?(ment)?$
-    is-develop: true
+    tracks-release-branches: true
     is-release-branch: false
     is-mainline: false
 ignore:

src/GitVersionCore.Tests/ConfigProviderTests.cs

@@ -305,4 +305,23 @@ string SetupConfigFileContent(string text, string fileName, string path)
 
         return fullPath;
     }
+
+    [Test]
+    public void WarnOnObsoleteIsDevelopBranchConfigurationSetting()
+    {
+        const string text = @"
+assembly-versioning-scheme: MajorMinorPatch
+branches:
+  master:
+    tag: beta
+    is-develop: true";
+
+        OldConfigurationException exception = Should.Throw<OldConfigurationException>(() =>
+        {
+            LegacyConfigNotifier.Notify(new StringReader(text));
+        });
+
+        var expecedMessage = string.Format("'is-develop' is deprecated, use 'track-release-branches' instead.");
+        exception.Message.ShouldContain(expecedMessage);
+    }
 }

src/GitVersionCore.Tests/IntegrationTests/FeatureBranchScenarios.cs

@@ -3,6 +3,7 @@
 using GitVersionCore.Tests;
 using LibGit2Sharp;
 using NUnit.Framework;
+using System.Collections.Generic;
 
 [TestFixture]
 public class FeatureBranchScenarios
@@ -223,7 +224,7 @@ public void BranchCreatedAfterFinishReleaseShouldInheritAndIncrementFromLastMast
             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)
@@ -237,4 +238,51 @@ public void BranchCreatedAfterFinishReleaseShouldInheritAndIncrementFromLastMast
             fixture.AssertFullSemver("0.3.0-TEST-1.1+2");
         }
     }
-}
+
+    [Test]
+    public void PickUpVersionFromMasterMarkedWithIsTracksReleaseBranches()
+    {
+        var config = new Config
+        {
+            VersioningMode = VersioningMode.ContinuousDelivery,
+            Branches = new Dictionary<string, BranchConfig>
+                {
+                    {
+                        "master", new BranchConfig()
+                        {
+                            Tag = "pre",
+                            TracksReleaseBranches = true,
+                        }
+                    },
+                    {
+                        "release", new BranchConfig()
+                        {
+                            IsReleaseBranch = true,
+                            Tag = "rc",
+                        }
+                    }
+                }
+        };
+
+        using (var fixture = new EmptyRepositoryFixture())
+        {
+            fixture.MakeACommit();
+
+            // create a release branch and tag a release
+            fixture.BranchTo("release/0.10.0");
+            fixture.MakeACommit();
+            fixture.MakeACommit();
+            fixture.AssertFullSemver(config, "0.10.0-rc.1+2");
+
+            // switch to master and verify the version
+            fixture.Checkout("master");
+            fixture.MakeACommit();
+            fixture.AssertFullSemver(config, "0.10.1-pre.1+1");
+
+            // create a feature branch from master and verify the version
+            // TODO this will pass once default becomes inherit
+            //fixture.BranchTo("MyFeatureD");
+            //fixture.AssertFullSemver(config, "0.10.1-MyFeatureD.1+1");
+        }
+    }
+}

src/GitVersionCore.Tests/TestEffectiveConfiguration.cs

@@ -1,9 +1,9 @@
 namespace GitVersionCore.Tests
 {
-    using System.Collections.Generic;
-    using System.Linq;
     using GitVersion;
     using GitVersion.VersionFilters;
+    using System.Collections.Generic;
+    using System.Linq;
 
     public class TestEffectiveConfiguration : EffectiveConfiguration
     {
@@ -28,15 +28,15 @@ public TestEffectiveConfiguration(
             int buildMetaDataPadding = 4,
             int commitsSinceVersionSourcePadding = 4,
             IEnumerable<IVersionFilter> versionFilters = null,
-            bool isDevelop = false,
-            bool isRelease = false) : 
+            bool tracksReleaseBranches = false,
+            bool isRelease = false) :
             base(assemblyVersioningScheme, assemblyInformationalFormat, versioningMode, gitTagPrefix, tag, nextVersion, IncrementStrategy.Patch,
                     branchPrefixToTrim, preventIncrementForMergedBranchVersion, tagNumberPattern, continuousDeploymentFallbackTag,
                     trackMergeTarget,
                     majorMessage, minorMessage, patchMessage, noBumpMessage,
                     commitMessageMode, legacySemVerPadding, buildMetaDataPadding, commitsSinceVersionSourcePadding,
                     versionFilters ?? Enumerable.Empty<IVersionFilter>(),
-                    isDevelop, isRelease)
+                    tracksReleaseBranches, isRelease)
         {
         }
     }

src/GitVersionCore/BranchConfigurationCalculator.cs

@@ -1,14 +1,12 @@
 namespace GitVersion
 {
+    using JetBrains.Annotations;
+    using LibGit2Sharp;
     using System;
     using System.Collections.Generic;
     using System.Linq;
     using System.Text.RegularExpressions;
 
-    using JetBrains.Annotations;
-
-    using LibGit2Sharp;
-
     public class BranchConfigurationCalculator
     {
         public static KeyValuePair<string, BranchConfig> GetBranchConfiguration(Commit currentCommit, IRepository repository, bool onlyEvaluateTrackedBranches, Config config, Branch currentBranch, IList<Branch> excludedInheritBranches = null)
@@ -48,7 +46,7 @@ static KeyValuePair<string, BranchConfig>[] LookupBranchConfiguration([NotNull]
             {
                 throw new ArgumentNullException("config");
             }
-            
+
             if (currentBranch == null)
             {
                 throw new ArgumentNullException("currentBranch");
@@ -120,7 +118,7 @@ static KeyValuePair<string, BranchConfig> InheritBranchConfiguration(bool onlyEv
                             Increment = branchConfig.Increment,
                             PreventIncrementOfMergedBranchVersion = branchConfig.PreventIncrementOfMergedBranchVersion,
                             // If we are inheriting from develop then we should behave like develop
-                            IsDevelop = branchConfig.IsDevelop
+                            TracksReleaseBranches = branchConfig.TracksReleaseBranches
                         });
                 }
 
@@ -152,7 +150,7 @@ static KeyValuePair<string, BranchConfig> InheritBranchConfiguration(bool onlyEv
                         Increment = inheritingBranchConfig.Increment,
                         PreventIncrementOfMergedBranchVersion = inheritingBranchConfig.PreventIncrementOfMergedBranchVersion,
                         // If we are inheriting from develop then we should behave like develop
-                        IsDevelop = inheritingBranchConfig.IsDevelop
+                        TracksReleaseBranches = inheritingBranchConfig.TracksReleaseBranches
                     });
             }
         }

src/GitVersionCore/Configuration/BranchConfig.cs

@@ -18,7 +18,7 @@ public BranchConfig(BranchConfig branchConfiguration)
             TagNumberPattern = branchConfiguration.TagNumberPattern;
             TrackMergeTarget = branchConfiguration.TrackMergeTarget;
             CommitMessageIncrementing = branchConfiguration.CommitMessageIncrementing;
-            IsDevelop = branchConfiguration.IsDevelop;
+            TracksReleaseBranches = branchConfiguration.TracksReleaseBranches;
             IsReleaseBranch = branchConfiguration.IsReleaseBranch;
             IsMainline = branchConfiguration.IsMainline;
         }
@@ -43,15 +43,15 @@ public BranchConfig(BranchConfig branchConfiguration)
 
         [YamlMember(Alias = "track-merge-target")]
         public bool? TrackMergeTarget { get; set; }
-        
+
         [YamlMember(Alias = "commit-message-incrementing")]
         public CommitMessageIncrementMode? CommitMessageIncrementing { get; set; }
 
         [YamlMember(Alias = "regex")]
         public string Regex { get; set; }
 
-        [YamlMember(Alias = "is-develop")]
-        public bool? IsDevelop { get; set; }
+        [YamlMember(Alias = "tracks-release-branches")]
+        public bool? TracksReleaseBranches { get; set; }
 
         [YamlMember(Alias = "is-release-branch")]
         public bool? IsReleaseBranch { get; set; }

src/GitVersionCore/Configuration/Config.cs

@@ -33,11 +33,11 @@ public Config()
         [YamlMember(Alias = "next-version")]
         public string NextVersion
         {
-            get { return this.nextVersion; }
+            get { return nextVersion; }
             set
             {
                 int major;
-                this.nextVersion = int.TryParse(value, NumberStyles.Any, NumberFormatInfo.InvariantInfo, out major)
+                nextVersion = int.TryParse(value, NumberStyles.Any, NumberFormatInfo.InvariantInfo, out major)
                     ? string.Format("{0}.0", major)
                     : value;
             }

src/GitVersionCore/Configuration/ConfigurationProvider.cs

@@ -2,6 +2,7 @@ namespace GitVersion
 {
     using Configuration.Init.Wizard;
     using GitVersion.Helpers;
+    using System;
     using System.IO;
     using System.Linq;
     using System.Text;
@@ -121,10 +122,10 @@ public static void ApplyDefaultsTo(Config config)
                 defaultIncrementStrategy: IncrementStrategy.Minor,
                 defaultVersioningMode: VersioningMode.ContinuousDeployment,
                 defaultTrackMergeTarget: true,
-                isDevelop: true);
+                tracksReleaseBranches: true);
 
             // Any user defined branches should have other values defaulted after known branches filled in
-            // This allows users to override one value of 
+            // This allows users to override one value of
             foreach (var branchConfig in configBranches)
             {
                 var regex = branchConfig.Value.Regex;
@@ -163,7 +164,7 @@ public static void ApplyBranchDefaults(Config config,
             VersioningMode? defaultVersioningMode = null, // Looked up from main config
             bool defaultTrackMergeTarget = false,
             string defaultTagNumberPattern = null,
-            bool isDevelop = false,
+            bool tracksReleaseBranches = false,
             bool isReleaseBranch = false,
             bool isMainline = false)
         {
@@ -174,7 +175,7 @@ public static void ApplyBranchDefaults(Config config,
             branchConfig.PreventIncrementOfMergedBranchVersion = branchConfig.PreventIncrementOfMergedBranchVersion ?? defaultPreventIncrement;
             branchConfig.TrackMergeTarget = branchConfig.TrackMergeTarget ?? defaultTrackMergeTarget;
             branchConfig.VersioningMode = branchConfig.VersioningMode ?? defaultVersioningMode ?? config.VersioningMode;
-            branchConfig.IsDevelop = branchConfig.IsDevelop ?? isDevelop;
+            branchConfig.TracksReleaseBranches = branchConfig.TracksReleaseBranches ?? tracksReleaseBranches;
             branchConfig.IsReleaseBranch = branchConfig.IsReleaseBranch ?? isReleaseBranch;
             branchConfig.IsMainline = branchConfig.IsMainline ?? isMainline;
         }