change names of new flags

GitTools · asbjornu · Oct 18, 2018 · Oct 18, 2018 · Oct 18, 2018 · Oct 27, 2018
commit 23297325fff92598bb1ea91aff74a63cad7e4d0c
diff --git a/docs/configuration.md b/docs/configuration.md
@@ -45,12 +45,12 @@ build-metadata-padding: 4
 commits-since-version-source-padding: 4
 commit-message-incrementing: Enabled
 commit-date-format: 'yyyy-MM-dd'
-use-merge-message-version: true
+merge-message-version: Enabled
 
 ignore:
   sha: []
   commits-before: yyyy-MM-ddTHH:mm:ss
-  regex: 'ignoreMatch'
+  merge-message: '<message regex>'
 ```
 
 And the description of the available options are:
@@ -156,7 +156,7 @@ details on the syntax. Default set to `Enabled`; set to `Disabled` to disable.
 ### commit-date-format
 Sets the format which will be used to format the `CommitDate` output variable.
 
-#### use-merge-message-version
+#### merge-message-version
 This configuration can be used to disable merge message version detection, where the version
 is infered from the commit message.
 
@@ -186,7 +186,7 @@ Date and time in the format `yyyy-MM-ddTHH:mm:ss` (eg `commits-before:
 2015-10-23T12:23:15`) to setup an exclusion range. Effectively any commit before
 `commits-before` will be ignored.
 
-#### regex
+#### merge-message
 The regex to match commit messages that will be ignored. Useful to exclude for example
 pull request from an automatic nuget updater.
 

diff --git a/src/GitVersionCore.Tests/ConfigProviderTests.CanWriteOutEffectiveConfiguration.approved.txt b/src/GitVersionCore.Tests/ConfigProviderTests.CanWriteOutEffectiveConfiguration.approved.txt
@@ -11,7 +11,7 @@ legacy-semver-padding: 4
 build-metadata-padding: 4
 commits-since-version-source-padding: 4
 commit-message-incrementing: Enabled
-use-merge-message-version: true
+merge-message-version: Enabled
 branches:
   develop:
     mode: ContinuousDeployment

diff --git a/src/GitVersionCore.Tests/TestEffectiveConfiguration.cs b/src/GitVersionCore.Tests/TestEffectiveConfiguration.cs
@@ -34,7 +34,7 @@ public TestEffectiveConfiguration(
             bool tracksReleaseBranches = false,
             bool isRelease = false,
             string commitDateFormat = "yyyy-MM-dd",
-            bool useMergeMessageVersion = true) :
+            bool mergeMessageVersion = true) :
             base(assemblyVersioningScheme, assemblyFileVersioningScheme, assemblyInformationalFormat, assemblyVersioningFormat, assemblyFileVersioningFormat, versioningMode, gitTagPrefix, tag, nextVersion, IncrementStrategy.Patch,
                     branchPrefixToTrim, preventIncrementForMergedBranchVersion, tagNumberPattern, continuousDeploymentFallbackTag,
                     trackMergeTarget,

diff --git a/src/GitVersionCore/Configuration/BranchConfig.cs b/src/GitVersionCore/Configuration/BranchConfig.cs
@@ -1,4 +1,4 @@
-namespace GitVersion
+namespace GitVersion
 {
     using System.Collections.Generic;
     using YamlDotNet.Serialization;
@@ -54,8 +54,8 @@ public BranchConfig(BranchConfig branchConfiguration)
         [YamlMember(Alias = "commit-message-incrementing")]
         public CommitMessageIncrementMode? CommitMessageIncrementing { get; set; }
 
-        [YamlMember(Alias = "regex")]
-        public string Regex { get; set; }
+        [YamlMember(Alias = "merge-message")]
+        public string MergeMessage { get; set; }
 
         [YamlMember(Alias = "source-branches")]
         public List<string> SourceBranches { get; set; }

diff --git a/src/GitVersionCore/Configuration/Config.cs b/src/GitVersionCore/Configuration/Config.cs
@@ -78,8 +78,8 @@ public string NextVersion
         [YamlMember(Alias = "commit-message-incrementing")]
         public CommitMessageIncrementMode? CommitMessageIncrementing { get; set; }
 
-        [YamlMember(Alias = "use-merge-message-version")]
-        public bool? UseMergeMessageVersion { get; set; }
+        [YamlMember(Alias = "merge-message-version")]
+        public bool? MergeMessageVersion { get; set; }
 
         [YamlMember(Alias = "branches")]
         public Dictionary<string, BranchConfig> Branches

diff --git a/src/GitVersionCore/Configuration/ConfigurationProvider.cs b/src/GitVersionCore/Configuration/ConfigurationProvider.cs
@@ -101,7 +101,7 @@ public static void ApplyDefaultsTo(Config config)
             config.BuildMetaDataPadding = config.BuildMetaDataPadding ?? 4;
             config.CommitsSinceVersionSourcePadding = config.CommitsSinceVersionSourcePadding ?? 4;
             config.CommitDateFormat = config.CommitDateFormat ?? "yyyy-MM-dd";
-            config.UseMergeMessageVersion = config.UseMergeMessageVersion ?? true;
+            config.MergeMessageVersion = config.MergeMessageVersion ?? true;
 
             var configBranches = config.Branches.ToList();
 

diff --git a/src/GitVersionCore/Configuration/IgnoreConfig.cs b/src/GitVersionCore/Configuration/IgnoreConfig.cs
@@ -19,14 +19,14 @@ public IgnoreConfig()
         [YamlMember(Alias = "sha")]
         public IEnumerable<string> SHAs { get; set; }
 
-        [YamlMember(Alias = "regex")]
-        public string Regex { get; set; }
+        [YamlMember(Alias = "merge-message")]
+        public string MergeMessage { get; set; }
 
         public virtual IEnumerable<IVersionFilter> ToFilters()
         {
             if (SHAs.Any()) yield return new ShaVersionFilter(SHAs);
             if (Before.HasValue) yield return new MinDateVersionFilter(Before.Value);
-            if (!string.IsNullOrWhiteSpace(Regex)) yield return new MessageFilter(Regex);
+            if (!string.IsNullOrWhiteSpace(MergeMessage)) yield return new MessageFilter(MergeMessage);
         }
     }
 }
diff --git a/src/GitVersionCore/EffectiveConfiguration.cs b/src/GitVersionCore/EffectiveConfiguration.cs
@@ -62,7 +62,7 @@ public EffectiveConfiguration(
             TracksReleaseBranches = tracksReleaseBranches;
             IsCurrentBranchRelease = isCurrentBranchRelease;
             CommitDateFormat = commitDateFormat;
-            UseMergeMessageVersion = useMergeMessageVersion;
+            mergeMessageVersion = useMergeMessageVersion;
     }
 
         public bool TracksReleaseBranches { get; private set; }
@@ -118,6 +118,6 @@ public EffectiveConfiguration(
 
         public string CommitDateFormat { get; private set; }
 
-        public bool UseMergeMessageVersion { get; private set; }
+        public bool MergeMessageVersion { get; private set; }
     }
 }
diff --git a/src/GitVersionCore/GitVersionContext.cs b/src/GitVersionCore/GitVersionContext.cs
@@ -132,7 +132,7 @@ void CalculateEffectiveConfiguration()
             var patchMessage = FullConfiguration.PatchVersionBumpMessage;
             var noBumpMessage = FullConfiguration.NoBumpMessage;
             var commitDateFormat = FullConfiguration.CommitDateFormat;
-            var useMergeMessageVersion = FullConfiguration.UseMergeMessageVersion.Value;
+            var mergeMessageVersion = FullConfiguration.UseMergeMessageVersion.Value;
             var commitMessageVersionBump = currentBranchConfig.CommitMessageIncrementing ?? FullConfiguration.CommitMessageIncrementing.Value;
 
             Configuration = new EffectiveConfiguration(

diff --git a/src/GitVersionExe.Tests/TestEffectiveConfiguration.cs b/src/GitVersionExe.Tests/TestEffectiveConfiguration.cs
@@ -34,7 +34,7 @@ public TestEffectiveConfiguration(
             bool tracksReleaseBranches = false,
             bool isRelease = false,
             string commitDateFormat = "yyyy-MM-dd",
-            bool useMergeMessageVersion = true) :
+            bool mergeMessageVersion = true) :
              base(assemblyVersioningScheme, assemblyFileVersioningScheme, assemblyInformationalFormat, assemblyVersioningFormat, assemblyFileVersioningFormat, versioningMode, gitTagPrefix, tag, nextVersion, IncrementStrategy.Patch,
                     branchPrefixToTrim, preventIncrementForMergedBranchVersion, tagNumberPattern, continuousDeploymentFallbackTag,
                     trackMergeTarget,

diff --git a/src/GitVersionTask.Tests/Helpers/TestEffectiveConfiguration.cs b/src/GitVersionTask.Tests/Helpers/TestEffectiveConfiguration.cs
@@ -34,7 +34,7 @@ public TestEffectiveConfiguration(
             bool tracksReleaseBranches = false,
             bool isRelease = false,
             string commitDateFormat = "yyyy-MM-dd",
-            bool useMergeMessageVersion = true) :
+            bool mergeMessageVersion = true) :
             base(assemblyVersioningScheme, assemblyFileVersioningScheme, assemblyInformationalFormat, assemblyVersioningFormat, assemblyFileVersioningFormat, versioningMode, gitTagPrefix, tag, nextVersion, IncrementStrategy.Patch,
                     branchPrefixToTrim, preventIncrementForMergedBranchVersion, tagNumberPattern, continuousDeploymentFallbackTag,
                     trackMergeTarget,