Moved commit message increment configuration from branch to global config.

Author: TomGillen

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

@@ -2,75 +2,57 @@
 mode: ContinuousDelivery
 tag-prefix: '[vV]'
 continuous-delivery-fallback-tag: ci
+major-version-bump-message: '\+semver:\s?(breaking|major)'
+minor-version-bump-message: '\+semver:\s?(feature|minor)'
+patch-version-bump-message: '\+semver:\s?(fix|patch)'
 branches:
   master:
     mode: ContinuousDelivery
     tag: 
     increment: Patch
     prevent-increment-of-merged-branch-version: true
     track-merge-target: false
-    major-version-bump-message: '\+semver:\s?(breaking|major)'
-    minor-version-bump-message: '\+semver:\s?(feature|minor)'
-    patch-version-bump-message: '\+semver:\s?(fix|patch)'
-    commit-message-version-bump-mode: All
+    commit-message-incrementing: Enabled
   release[/-]:
     mode: ContinuousDelivery
     tag: beta
     increment: Patch
     prevent-increment-of-merged-branch-version: true
     track-merge-target: false
-    major-version-bump-message: '\+semver:\s?(breaking|major)'
-    minor-version-bump-message: '\+semver:\s?(feature|minor)'
-    patch-version-bump-message: '\+semver:\s?(fix|patch)'
-    commit-message-version-bump-mode: All
+    commit-message-incrementing: Enabled
   feature[/-]:
     mode: ContinuousDelivery
     tag: useBranchName
     increment: Inherit
     prevent-increment-of-merged-branch-version: false
     track-merge-target: false
-    major-version-bump-message: '\+semver:\s?(breaking|major)'
-    minor-version-bump-message: '\+semver:\s?(feature|minor)'
-    patch-version-bump-message: '\+semver:\s?(fix|patch)'
-    commit-message-version-bump-mode: All
+    commit-message-incrementing: Enabled
   (pull|pull\-requests|pr)[/-]:
     mode: ContinuousDelivery
     tag: PullRequest
     increment: Inherit
     prevent-increment-of-merged-branch-version: false
     tag-number-pattern: '[/-](?<number>\d+)[-/]'
     track-merge-target: false
-    major-version-bump-message: '\+semver:\s?(breaking|major)'
-    minor-version-bump-message: '\+semver:\s?(feature|minor)'
-    patch-version-bump-message: '\+semver:\s?(fix|patch)'
-    commit-message-version-bump-mode: All
+    commit-message-incrementing: Enabled
   hotfix[/-]:
     mode: ContinuousDelivery
     tag: beta
     increment: Patch
     prevent-increment-of-merged-branch-version: false
     track-merge-target: false
-    major-version-bump-message: '\+semver:\s?(breaking|major)'
-    minor-version-bump-message: '\+semver:\s?(feature|minor)'
-    patch-version-bump-message: '\+semver:\s?(fix|patch)'
-    commit-message-version-bump-mode: All
+    commit-message-incrementing: Enabled
   support[/-]:
     mode: ContinuousDelivery
     tag: 
     increment: Patch
     prevent-increment-of-merged-branch-version: true
     track-merge-target: false
-    major-version-bump-message: '\+semver:\s?(breaking|major)'
-    minor-version-bump-message: '\+semver:\s?(feature|minor)'
-    patch-version-bump-message: '\+semver:\s?(fix|patch)'
-    commit-message-version-bump-mode: All
+    commit-message-incrementing: Enabled
   develop:
     mode: ContinuousDeployment
     tag: unstable
     increment: Minor
     prevent-increment-of-merged-branch-version: false
     track-merge-target: true
-    major-version-bump-message: '\+semver:\s?(breaking|major)'
-    minor-version-bump-message: '\+semver:\s?(feature|minor)'
-    patch-version-bump-message: '\+semver:\s?(fix|patch)'
-    commit-message-version-bump-mode: All
+    commit-message-incrementing: Enabled

src/GitVersionCore.Tests/TestEffectiveConfiguration.cs

@@ -18,7 +18,7 @@ public TestEffectiveConfiguration(
             string majorMessage = null,
             string minorMessage = null,
             string patchMessage = null,
-            CommitMessageVersionMode commitMessageMode = CommitMessageVersionMode.All) : 
+            CommitMessageIncrementMode commitMessageMode = CommitMessageIncrementMode.Enabled) : 
                 base(assemblyVersioningScheme, versioningMode, gitTagPrefix, tag, nextVersion, IncrementStrategy.Patch, 
                     branchPrefixToTrim, preventIncrementForMergedBranchVersion, tagNumberPattern, continuousDeploymentFallbackTag,
                     trackMergeTarget,

src/GitVersionCore/Configuration/BranchConfig.cs

@@ -16,10 +16,7 @@ public BranchConfig(BranchConfig branchConfiguration)
             PreventIncrementOfMergedBranchVersion = branchConfiguration.PreventIncrementOfMergedBranchVersion;
             TagNumberPattern = branchConfiguration.TagNumberPattern;
             TrackMergeTarget = branchConfiguration.TrackMergeTarget;
-            MajorVersionBumpMessage = branchConfiguration.MajorVersionBumpMessage;
-            MinorVersionBumpMessage = branchConfiguration.MinorVersionBumpMessage;
-            PatchVersionBumpMessage = branchConfiguration.PatchVersionBumpMessage;
-            CommitMessageVersionBumpMode = branchConfiguration.CommitMessageVersionBumpMode;
+            CommitMessageIncrementing = branchConfiguration.CommitMessageIncrementing;
         }
 
         [YamlMember(Alias = "mode")]
@@ -42,17 +39,8 @@ public BranchConfig(BranchConfig branchConfiguration)
 
         [YamlMember(Alias = "track-merge-target")]
         public bool? TrackMergeTarget { get; set; }
-
-        [YamlMember(Alias = "major-version-bump-message")]
-        public string MajorVersionBumpMessage { get; set; }
-
-        [YamlMember(Alias = "minor-version-bump-message")]
-        public string MinorVersionBumpMessage { get; set; }
-
-        [YamlMember(Alias = "patch-version-bump-message")]
-        public string PatchVersionBumpMessage { get; set; }
-
-        [YamlMember(Alias = "commit-message-version-bump-mode")]
-        public CommitMessageVersionMode? CommitMessageVersionBumpMode { get; set; }
+        
+        [YamlMember(Alias = "commit-message-incrementing")]
+        public CommitMessageIncrementMode? CommitMessageIncrementing { get; set; }
     }
 }

src/GitVersionCore/Configuration/Config.cs

@@ -23,6 +23,15 @@ public class Config
         [YamlMember(Alias = "next-version")]
         public string NextVersion { get; set; }
 
+        [YamlMember(Alias = "major-version-bump-message")]
+        public string MajorVersionBumpMessage { get; set; }
+
+        [YamlMember(Alias = "minor-version-bump-message")]
+        public string MinorVersionBumpMessage { get; set; }
+
+        [YamlMember(Alias = "patch-version-bump-message")]
+        public string PatchVersionBumpMessage { get; set; }
+
         [YamlMember(Alias = "branches")]
         public Dictionary<string, BranchConfig> Branches
         {

src/GitVersionCore/Configuration/ConfigurationProvider.cs

@@ -24,6 +24,9 @@ public static void ApplyDefaultsTo(Config config)
             config.TagPrefix = config.TagPrefix ?? DefaultTagPrefix;
             config.VersioningMode = config.VersioningMode ?? VersioningMode.ContinuousDelivery;
             config.ContinuousDeploymentFallbackTag = config.ContinuousDeploymentFallbackTag ?? "ci";
+            config.MajorVersionBumpMessage = config.MajorVersionBumpMessage ?? IncrementStrategyFinder.DefaultMajorPattern;
+            config.MinorVersionBumpMessage = config.MinorVersionBumpMessage ?? IncrementStrategyFinder.DefaultMinorPattern;
+            config.PatchVersionBumpMessage = config.PatchVersionBumpMessage ?? IncrementStrategyFinder.DefaultPatchPattern;
             var configBranches = config.Branches.ToList();
 
             ApplyBranchDefaults(config, GetOrCreateBranchDefaults(config, "master"), defaultTag: string.Empty, defaultPreventIncrement: true);
@@ -72,18 +75,15 @@ public static void ApplyBranchDefaults(Config config,
             string majorVersionBumpMessage = IncrementStrategyFinder.DefaultMajorPattern,
             string minorVersionBumpMessage = IncrementStrategyFinder.DefaultMinorPattern,
             string patchVersionBumpMessage = IncrementStrategyFinder.DefaultPatchPattern,
-            CommitMessageVersionMode commitMessageVersionBump = CommitMessageVersionMode.All)
+            CommitMessageIncrementMode commitMessageVersionBump = CommitMessageIncrementMode.Enabled)
         {
             branchConfig.Tag = branchConfig.Tag ?? defaultTag;
             branchConfig.TagNumberPattern = branchConfig.TagNumberPattern ?? defaultTagNumberPattern;
             branchConfig.Increment = branchConfig.Increment ?? defaultIncrementStrategy;
             branchConfig.PreventIncrementOfMergedBranchVersion = branchConfig.PreventIncrementOfMergedBranchVersion ?? defaultPreventIncrement;
             branchConfig.TrackMergeTarget = branchConfig.TrackMergeTarget ?? defaultTrackMergeTarget;
             branchConfig.VersioningMode = branchConfig.VersioningMode ?? defaultVersioningMode ?? config.VersioningMode;
-            branchConfig.MajorVersionBumpMessage = branchConfig.MajorVersionBumpMessage ?? majorVersionBumpMessage;
-            branchConfig.MinorVersionBumpMessage = branchConfig.MinorVersionBumpMessage ?? minorVersionBumpMessage;
-            branchConfig.PatchVersionBumpMessage = branchConfig.PatchVersionBumpMessage ?? patchVersionBumpMessage;
-            branchConfig.CommitMessageVersionBumpMode = branchConfig.CommitMessageVersionBumpMode ?? commitMessageVersionBump;
+            branchConfig.CommitMessageIncrementing = branchConfig.CommitMessageIncrementing ?? commitMessageVersionBump;
         }
 
         static Config ReadConfig(string workingDirectory, IFileSystem fileSystem)

src/GitVersionCore/EffectiveConfiguration.cs

@@ -17,7 +17,7 @@ public EffectiveConfiguration(
             string majorVersionBumpMessage,
             string minorVersionBumpMessage,
             string patchVersionBumpMessage,
-            CommitMessageVersionMode commitMessageVersionBumpMode)
+            CommitMessageIncrementMode commitMessageIncrementing)
         {
             AssemblyVersioningScheme = assemblyVersioningScheme;
             VersioningMode = versioningMode;
@@ -33,7 +33,7 @@ public EffectiveConfiguration(
             MajorVersionBumpMessage = majorVersionBumpMessage;
             MinorVersionBumpMessage = minorVersionBumpMessage;
             PatchVersionBumpMessage = patchVersionBumpMessage;
-            CommitMessageVersionBumpMode = commitMessageVersionBumpMode;
+            CommitMessageIncrementing = commitMessageIncrementing;
         }
 
         public VersioningMode VersioningMode { get; private set; }
@@ -70,6 +70,6 @@ public EffectiveConfiguration(
 
         public string PatchVersionBumpMessage { get; private set; }
 
-        public CommitMessageVersionMode CommitMessageVersionBumpMode { get; private set; }
+        public CommitMessageIncrementMode CommitMessageIncrementing { get; private set; }
     }
 }

src/GitVersionCore/GitVersionContext.cs

@@ -98,15 +98,15 @@ void CalculateEffectiveConfiguration()
             var incrementStrategy = currentBranchConfig.Value.Increment.Value;
             var preventIncrementForMergedBranchVersion = currentBranchConfig.Value.PreventIncrementOfMergedBranchVersion.Value;
             var trackMergeTarget = currentBranchConfig.Value.TrackMergeTarget.Value;
-            var majorMessage = currentBranchConfig.Value.MajorVersionBumpMessage;
-            var minorMessage = currentBranchConfig.Value.MinorVersionBumpMessage;
-            var patchMessage = currentBranchConfig.Value.MinorVersionBumpMessage;
-            var commitMessageVersionBump = currentBranchConfig.Value.CommitMessageVersionBumpMode.Value;
+            var commitMessageVersionBump = currentBranchConfig.Value.CommitMessageIncrementing.Value;
 
             var nextVersion = configuration.NextVersion;
             var assemblyVersioningScheme = configuration.AssemblyVersioningScheme.Value;
             var gitTagPrefix = configuration.TagPrefix;
-            
+            var majorMessage = configuration.MajorVersionBumpMessage;
+            var minorMessage = configuration.MinorVersionBumpMessage;
+            var patchMessage = configuration.MinorVersionBumpMessage;
+
             Configuration = new EffectiveConfiguration(
                 assemblyVersioningScheme, versioningMode, gitTagPrefix, 
                 tag, nextVersion, incrementStrategy, currentBranchConfig.Key, 

src/GitVersionCore/IncrementStrategyFinder.cs

@@ -6,11 +6,11 @@
     using VersionCalculation.BaseVersionCalculators;
     using LibGit2Sharp;
 
-    public enum CommitMessageVersionMode
+    public enum CommitMessageIncrementMode
     {
-        All,
-        MergeMessageOnly,
-        None
+        Enabled,
+        Disabled,
+        MergeMessageOnly
     }
 
     public static class IncrementStrategyFinder
@@ -48,14 +48,14 @@ public static class IncrementStrategyFinder
 
         private static VersionField? FindCommitMessageIncrement(GitVersionContext context, BaseVersion baseVersion)
         {
-            if (context.Configuration.CommitMessageVersionBumpMode == CommitMessageVersionMode.None)
+            if (context.Configuration.CommitMessageIncrementing == CommitMessageIncrementMode.Disabled)
             {
                 return null;
             }
 
             var commits = GetIntermediateCommits(context.Repository, baseVersion.BaseVersionSource, context.CurrentCommit);
 
-            if (context.Configuration.CommitMessageVersionBumpMode == CommitMessageVersionMode.MergeMessageOnly)
+            if (context.Configuration.CommitMessageIncrementing == CommitMessageIncrementMode.MergeMessageOnly)
             {
                 commits = commits.Where(c => c.Parents.Count() > 1);
             }