Rename isDevelop to tracksReleaseBranches

Author: maxraab

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/IntegrationTests/FeatureBranchScenarios.cs

@@ -251,7 +251,7 @@ public void PickUpVersionFromMasterMarkedWithIsDevelop()
                         "master", new BranchConfig()
                         {
                             Tag = "pre",
-                            IsDevelop = true,
+                            TracksReleaseBranches = true,
                         }
                     },
                     {

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

@@ -20,7 +20,7 @@ public static KeyValuePair<string, BranchConfig> GetBranchConfiguration(Commit c
                     currentBranch.FriendlyName));
 
                 var branchConfig = new BranchConfig();
-                ConfigurationProvider.ApplyBranchDefaults(config, branchConfig, "", isDevelop: true);
+                ConfigurationProvider.ApplyBranchDefaults(config, branchConfig, "");
                 return new KeyValuePair<string, BranchConfig>(string.Empty, branchConfig);
             }
             if (matchingBranches.Length == 1)
@@ -118,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
                         });
                 }
 
@@ -150,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/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;
         }

src/GitVersionCore/GitVersionContext.cs

@@ -71,11 +71,9 @@ public GitVersionContext(IRepository repository, Branch currentBranch, Config co
         /// Contains the raw configuration, use Configuration for specific config based on the current GitVersion context.
         /// </summary>
         public Config FullConfiguration { get; private set; }
-
         public SemanticVersion CurrentCommitTaggedVersion { get; private set; }
         public bool OnlyEvaluateTrackedBranches { get; private set; }
         public EffectiveConfiguration Configuration { get; private set; }
-
         public IRepository Repository { get; private set; }
         public Branch CurrentBranch { get; private set; }
         public Commit CurrentCommit { get; private set; }
@@ -93,8 +91,8 @@ void CalculateEffectiveConfiguration()
                 throw new Exception(string.Format("Configuration value for 'PreventIncrementOfMergedBranchVersion' for branch {0} has no value. (this should not happen, please report an issue)", currentBranchConfig.Key));
             if (!currentBranchConfig.Value.TrackMergeTarget.HasValue)
                 throw new Exception(string.Format("Configuration value for 'TrackMergeTarget' for branch {0} has no value. (this should not happen, please report an issue)", currentBranchConfig.Key));
-            if (!currentBranchConfig.Value.IsDevelop.HasValue)
-                throw new Exception(string.Format("Configuration value for 'IsDevelop' for branch {0} has no value. (this should not happen, please report an issue)", currentBranchConfig.Key));
+            if (!currentBranchConfig.Value.TracksReleaseBranches.HasValue)
+                throw new Exception(string.Format("Configuration value for 'TracksReleaseBranches' for branch {0} has no value. (this should not happen, please report an issue)", currentBranchConfig.Key));
             if (!currentBranchConfig.Value.IsReleaseBranch.HasValue)
                 throw new Exception(string.Format("Configuration value for 'IsReleaseBranch' for branch {0} has no value. (this should not happen, please report an issue)", currentBranchConfig.Key));
 
@@ -140,7 +138,7 @@ void CalculateEffectiveConfiguration()
                 FullConfiguration.BuildMetaDataPadding.Value,
                 FullConfiguration.CommitsSinceVersionSourcePadding.Value,
                 FullConfiguration.Ignore.ToFilters(),
-                currentBranchConfig.Value.IsDevelop.Value,
+                currentBranchConfig.Value.TracksReleaseBranches.Value,
                 currentBranchConfig.Value.IsReleaseBranch.Value);
         }
     }