Increase version with bump message when commit message increment is enabled and increment strategy is none

HHobeck · HHobeck · commit c89c94c0e6b7 · 2023-03-17T16:47:36.000+01:00
diff --git a/src/GitVersion.Core.Tests/IntegrationTests/OtherScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/OtherScenarios.cs
@@ -908,4 +908,84 @@ public void EnsurePreReleaseTagLabelWithInitialTagWillBeConsideredIfGammaLabelIs
         // ✅ succeeds as expected
         fixture.AssertFullSemver($"1.0.{patchNumber + 1}-gamma.1+1", configuration);
     }
+
+    [TestCase(null)]
+    [TestCase("")]
+    public void IncreaseVersionWithBumpMessageWhenCommitMessageIncrementIsEnabledAndIncrementStrategyIsNoneForBranchWithNoLabel(string? label)
+    {
+        var configuration = GitFlowConfigurationBuilder.New.WithLabel(null)
+            .WithBranch("main", _ => _
+                .WithCommitMessageIncrementing(CommitMessageIncrementMode.Enabled)
+                .WithVersioningMode(VersioningMode.ContinuousDeployment)
+                .WithIncrement(IncrementStrategy.None)
+                .WithLabel(label)
+            )
+            .Build();
+
+        using var fixture = new EmptyRepositoryFixture("main");
+        fixture.MakeACommit();
+
+        // ✅ succeeds as expected
+        fixture.AssertFullSemver("0.0.0", configuration);
+
+        fixture.MakeACommit("+semver: minor");
+
+        // ✅ succeeds as expected
+        fixture.AssertFullSemver("0.1.0", configuration);
+
+        fixture.ApplyTag("1.0.0");
+
+        // ✅ succeeds as expected
+        fixture.AssertFullSemver("1.0.0", configuration);
+
+        fixture.MakeACommit("+semver: major");
+
+        // ✅ succeeds as expected
+        fixture.AssertFullSemver("2.0.0", configuration);
+
+        fixture.ApplyTag("2.0.0");
+        fixture.MakeACommit();
+
+        // ✅ succeeds as expected
+        fixture.AssertFullSemver("2.0.0", configuration);
+    }
+
+    [Test]
+    public void IncreaseVersionWithBumpMessageWhenCommitMessageIncrementIsEnabledAndIncrementStrategyIsNoneForBranchWithAlphaLabel()
+    {
+        var configuration = GitFlowConfigurationBuilder.New
+            .WithBranch("main", _ => _
+                .WithCommitMessageIncrementing(CommitMessageIncrementMode.Enabled)
+                .WithVersioningMode(VersioningMode.ContinuousDeployment)
+                .WithIncrement(IncrementStrategy.None)
+                .WithLabel("pre")
+            ).Build();
+
+        using var fixture = new EmptyRepositoryFixture("main");
+        fixture.MakeACommit();
+
+        // ✅ succeeds as expected
+        fixture.AssertFullSemver("0.0.0-pre.1", configuration);
+
+        fixture.MakeACommit("+semver: minor");
+
+        // ✅ succeeds as expected
+        fixture.AssertFullSemver("0.1.0-pre.2", configuration);
+
+        fixture.ApplyTag("1.0.0");
+
+        // ✅ succeeds as expected
+        fixture.AssertFullSemver("1.0.0", configuration);
+
+        fixture.MakeACommit("+semver: major");
+
+        // ✅ succeeds as expected
+        fixture.AssertFullSemver("2.0.0-pre.1", configuration);
+
+        fixture.ApplyTag("2.0.0");
+        fixture.MakeACommit();
+
+        // ✅ succeeds as expected
+        fixture.AssertFullSemver("2.0.0-pre.1", configuration);
+    }
 }
diff --git a/src/GitVersion.Core/PublicAPI.Unshipped.txt b/src/GitVersion.Core/PublicAPI.Unshipped.txt
@@ -890,12 +890,13 @@ GitVersion.VersionCalculation.EffectiveBranchConfigurationFinder.EffectiveBranch
 GitVersion.VersionCalculation.IEffectiveBranchConfigurationFinder
 GitVersion.VersionCalculation.IEffectiveBranchConfigurationFinder.GetConfigurations(GitVersion.IBranch! branch, GitVersion.Configuration.IGitVersionConfiguration! configuration) -> System.Collections.Generic.IEnumerable<GitVersion.Configuration.EffectiveBranchConfiguration!>!
 GitVersion.VersionCalculation.IIncrementStrategyFinder
-GitVersion.VersionCalculation.IIncrementStrategyFinder.DetermineIncrementedField(GitVersion.GitVersionContext! context, GitVersion.VersionCalculation.BaseVersion! baseVersion, GitVersion.Configuration.EffectiveConfiguration! configuration) -> GitVersion.VersionField
-GitVersion.VersionCalculation.IIncrementStrategyFinder.GetIncrementForCommits(GitVersion.Configuration.IGitVersionConfiguration! configuration, System.Collections.Generic.IEnumerable<GitVersion.ICommit!>! commits) -> GitVersion.VersionField?
+GitVersion.VersionCalculation.IIncrementStrategyFinder.DetermineIncrementedField(GitVersion.ICommit? currentCommit, GitVersion.VersionCalculation.BaseVersion! baseVersion, GitVersion.Configuration.EffectiveConfiguration! configuration) -> GitVersion.VersionField
+GitVersion.VersionCalculation.IIncrementStrategyFinder.GetIncrementForCommits(string? majorVersionBumpMessage, string? minorVersionBumpMessage, string? patchVersionBumpMessage, string? noBumpMessage, System.Collections.Generic.IEnumerable<GitVersion.ICommit!>! commits) -> GitVersion.VersionField?
 GitVersion.VersionCalculation.IMainlineVersionCalculator
 GitVersion.VersionCalculation.IMainlineVersionCalculator.CreateVersionBuildMetaData(GitVersion.ICommit? baseVersionSource) -> GitVersion.SemanticVersionBuildMetaData!
 GitVersion.VersionCalculation.IMainlineVersionCalculator.FindMainlineModeVersion(GitVersion.VersionCalculation.NextVersion! nextVersion) -> GitVersion.SemanticVersion!
-GitVersion.VersionCalculation.IncrementStrategyFinder.GetIncrementForCommits(GitVersion.Configuration.IGitVersionConfiguration! configuration, System.Collections.Generic.IEnumerable<GitVersion.ICommit!>! commits) -> GitVersion.VersionField?
+GitVersion.VersionCalculation.IncrementStrategyFinder.DetermineIncrementedField(GitVersion.ICommit? currentCommit, GitVersion.VersionCalculation.BaseVersion! baseVersion, GitVersion.Configuration.EffectiveConfiguration! configuration) -> GitVersion.VersionField
+GitVersion.VersionCalculation.IncrementStrategyFinder.GetIncrementForCommits(string? majorVersionBumpMessage, string? minorVersionBumpMessage, string? patchVersionBumpMessage, string? noBumpMessage, System.Collections.Generic.IEnumerable<GitVersion.ICommit!>! commits) -> GitVersion.VersionField?
 GitVersion.VersionCalculation.INextVersionCalculator
 GitVersion.VersionCalculation.INextVersionCalculator.FindVersion() -> GitVersion.VersionCalculation.NextVersion!
 GitVersion.VersionCalculation.IVariableProvider
@@ -905,7 +906,6 @@ GitVersion.VersionCalculation.IVersionFilter.Exclude(GitVersion.VersionCalculati
 GitVersion.VersionCalculation.IVersionStrategy
 GitVersion.VersionCalculation.IVersionStrategy.GetBaseVersions(GitVersion.Configuration.EffectiveBranchConfiguration! configuration) -> System.Collections.Generic.IEnumerable<GitVersion.VersionCalculation.BaseVersion!>!
 GitVersion.VersionCalculation.IncrementStrategyFinder
-GitVersion.VersionCalculation.IncrementStrategyFinder.DetermineIncrementedField(GitVersion.GitVersionContext! context, GitVersion.VersionCalculation.BaseVersion! baseVersion, GitVersion.Configuration.EffectiveConfiguration! configuration) -> GitVersion.VersionField
 GitVersion.VersionCalculation.IncrementStrategyFinder.IncrementStrategyFinder(GitVersion.IGitRepository! repository) -> void
 GitVersion.VersionCalculation.MergeMessageVersionStrategy
 GitVersion.VersionCalculation.MergeMessageVersionStrategy.MergeMessageVersionStrategy(GitVersion.Logging.ILog! log, System.Lazy<GitVersion.GitVersionContext!>! versionContext, GitVersion.Common.IRepositoryStore! repositoryStore) -> void
diff --git a/src/GitVersion.Core/VersionCalculation/Abstractions/IIncrementStrategyFinder.cs b/src/GitVersion.Core/VersionCalculation/Abstractions/IIncrementStrategyFinder.cs
@@ -4,7 +4,10 @@ namespace GitVersion.VersionCalculation;
 
 public interface IIncrementStrategyFinder
 {
-    VersionField DetermineIncrementedField(GitVersionContext context, BaseVersion baseVersion, EffectiveConfiguration configuration);
+    VersionField DetermineIncrementedField(ICommit? currentCommit, BaseVersion baseVersion, EffectiveConfiguration configuration);
 
-    VersionField? GetIncrementForCommits(IGitVersionConfiguration configuration, IEnumerable<ICommit> commits);
+    VersionField? GetIncrementForCommits(
+        string? majorVersionBumpMessage, string? minorVersionBumpMessage, string? patchVersionBumpMessage, string? noBumpMessage,
+        IEnumerable<ICommit> commits
+    );
 }
diff --git a/src/GitVersion.Core/VersionCalculation/IncrementStrategyFinder.cs b/src/GitVersion.Core/VersionCalculation/IncrementStrategyFinder.cs
@@ -26,11 +26,12 @@ public class IncrementStrategyFinder : IIncrementStrategyFinder
 
     public IncrementStrategyFinder(IGitRepository repository) => this.repository = repository.NotNull();
 
-    public VersionField DetermineIncrementedField(GitVersionContext context, BaseVersion baseVersion, EffectiveConfiguration configuration)
+    public VersionField DetermineIncrementedField(ICommit? currentCommit, BaseVersion baseVersion, EffectiveConfiguration configuration)
     {
+        baseVersion.NotNull();
         configuration.NotNull();
 
-        var commitMessageIncrement = FindCommitMessageIncrement(context, configuration, baseVersion.BaseVersionSource);
+        var commitMessageIncrement = FindCommitMessageIncrement(configuration, baseVersion.BaseVersionSource, currentCommit);
 
         var defaultIncrement = configuration.Increment.ToVersionField();
 
@@ -40,12 +41,6 @@ public VersionField DetermineIncrementedField(GitVersionContext context, BaseVer
             return baseVersion.ShouldIncrement ? defaultIncrement : VersionField.None;
         }
 
-        // cap the commit message severity to minor for alpha versions
-        if (baseVersion.SemanticVersion < new SemanticVersion(1) && commitMessageIncrement > VersionField.Minor)
-        {
-            commitMessageIncrement = VersionField.Minor;
-        }
-
         // don't increment for less than the branch configuration increment, if the absence of commit messages would have
         // still resulted in an increment of configuration.Increment
         if (baseVersion.ShouldIncrement && commitMessageIncrement < defaultIncrement)
@@ -56,12 +51,15 @@ public VersionField DetermineIncrementedField(GitVersionContext context, BaseVer
         return commitMessageIncrement.Value;
     }
 
-    public VersionField? GetIncrementForCommits(IGitVersionConfiguration configuration, IEnumerable<ICommit> commits)
+    public VersionField? GetIncrementForCommits(string? majorVersionBumpMessage, string? minorVersionBumpMessage,
+        string? patchVersionBumpMessage, string? noBumpMessage, IEnumerable<ICommit> commits)
     {
-        var majorRegex = TryGetRegexOrDefault(configuration.MajorVersionBumpMessage, DefaultMajorPatternRegex);
-        var minorRegex = TryGetRegexOrDefault(configuration.MinorVersionBumpMessage, DefaultMinorPatternRegex);
-        var patchRegex = TryGetRegexOrDefault(configuration.PatchVersionBumpMessage, DefaultPatchPatternRegex);
-        var none = TryGetRegexOrDefault(configuration.NoBumpMessage, DefaultNoBumpPatternRegex);
+        commits.NotNull();
+
+        var majorRegex = TryGetRegexOrDefault(majorVersionBumpMessage, DefaultMajorPatternRegex);
+        var minorRegex = TryGetRegexOrDefault(minorVersionBumpMessage, DefaultMinorPatternRegex);
+        var patchRegex = TryGetRegexOrDefault(patchVersionBumpMessage, DefaultPatchPatternRegex);
+        var none = TryGetRegexOrDefault(noBumpMessage, DefaultNoBumpPatternRegex);
 
         var increments = commits
             .Select(c => GetIncrementFromCommit(c, majorRegex, minorRegex, patchRegex, none))
@@ -73,16 +71,14 @@ public VersionField DetermineIncrementedField(GitVersionContext context, BaseVer
             : null;
     }
 
-    private VersionField? FindCommitMessageIncrement(GitVersionContext context, EffectiveConfiguration configuration, ICommit? baseCommit)
+    private VersionField? FindCommitMessageIncrement(EffectiveConfiguration configuration, ICommit? baseCommit, ICommit? currentCommit)
     {
-        if (baseCommit == null) return null;
-
         if (configuration.CommitMessageIncrementing == CommitMessageIncrementMode.Disabled)
         {
             return null;
         }
 
-        var commits = GetIntermediateCommits(baseCommit, context.CurrentCommit);
+        var commits = GetIntermediateCommits(baseCommit, currentCommit);
 
         // consider commit messages since latest tag only (see #3071)
         var tags = new HashSet<string?>(repository.Tags.Select(t => t.TargetSha));
@@ -96,7 +92,13 @@ public VersionField DetermineIncrementedField(GitVersionContext context, BaseVer
             commits = commits.Where(c => c.Parents.Count() > 1);
         }
 
-        return GetIncrementForCommits(context.Configuration, commits);
+        return GetIncrementForCommits(
+            majorVersionBumpMessage: configuration.MajorVersionBumpMessage,
+            minorVersionBumpMessage: configuration.MinorVersionBumpMessage,
+            patchVersionBumpMessage: configuration.PatchVersionBumpMessage,
+            noBumpMessage: configuration.NoBumpMessage,
+            commits: commits
+        );
     }
 
     private static Regex TryGetRegexOrDefault(string? messageRegex, Regex defaultRegex) =>
@@ -108,11 +110,17 @@ private static Regex TryGetRegexOrDefault(string? messageRegex, Regex defaultReg
     /// Get the sequence of commits in a repository between a <paramref name="baseCommit"/> (exclusive)
     /// and a particular <paramref name="headCommit"/> (inclusive)
     /// </summary>
-    private IEnumerable<ICommit> GetIntermediateCommits(IGitObject baseCommit, ICommit? headCommit)
+    private IEnumerable<ICommit> GetIntermediateCommits(ICommit? baseCommit, ICommit? headCommit)
     {
         var map = GetHeadCommitsMap(headCommit);
-        if (!map.TryGetValue(baseCommit.Sha, out var baseIndex)) return Enumerable.Empty<ICommit>();
-        var commitAfterBaseIndex = baseIndex + 1;
+
+        var commitAfterBaseIndex = 0;
+        if (baseCommit != null)
+        {
+            if (!map.TryGetValue(baseCommit.Sha, out var baseIndex)) return Enumerable.Empty<ICommit>();
+            commitAfterBaseIndex = baseIndex + 1;
+        }
+
         var headCommits = GetHeadCommits(headCommit);
         return new ArraySegment<ICommit>(headCommits, commitAfterBaseIndex, headCommits.Length - commitAfterBaseIndex);
     }
diff --git a/src/GitVersion.Core/VersionCalculation/MainlineVersionCalculator.cs b/src/GitVersion.Core/VersionCalculation/MainlineVersionCalculator.cs
@@ -281,8 +281,13 @@ private SemanticVersion IncrementForEachCommit(IEnumerable<ICommit> directCommit
     {
         foreach (var directCommit in directCommits)
         {
-            var directCommitIncrement = this.incrementStrategyFinder.GetIncrementForCommits(Context.Configuration, new[] { directCommit })
-                ?? FindDefaultIncrementForBranch(Context, mainline);
+            var directCommitIncrement = this.incrementStrategyFinder.GetIncrementForCommits(
+                majorVersionBumpMessage: Context.Configuration.MajorVersionBumpMessage,
+                minorVersionBumpMessage: Context.Configuration.MinorVersionBumpMessage,
+                patchVersionBumpMessage: Context.Configuration.PatchVersionBumpMessage,
+                noBumpMessage: Context.Configuration.NoBumpMessage,
+                commits: new[] { directCommit }
+            ) ?? FindDefaultIncrementForBranch(Context, mainline);
             mainlineVersion = mainlineVersion.IncrementVersion(directCommitIncrement, null);
             this.log.Info($"Direct commit on main {directCommit} incremented base versions {directCommitIncrement}, now {mainlineVersion}");
         }
@@ -294,8 +299,15 @@ private VersionField FindMessageIncrement(ICommit? mergeCommit, ICommit? mergedH
     {
         var commits = this.repositoryStore.GetMergeBaseCommits(mergeCommit, mergedHead, findMergeBase);
         commitLog.RemoveAll(c => commits.Any(c1 => c1.Sha == c.Sha));
-        return this.incrementStrategyFinder.GetIncrementForCommits(Context.Configuration, commits)
-            ?? TryFindIncrementFromMergeMessage(mergeCommit);
+
+        var messageIncrement = this.incrementStrategyFinder.GetIncrementForCommits(
+            majorVersionBumpMessage: Context.Configuration.MajorVersionBumpMessage,
+            minorVersionBumpMessage: Context.Configuration.MinorVersionBumpMessage,
+            patchVersionBumpMessage: Context.Configuration.PatchVersionBumpMessage,
+            noBumpMessage: Context.Configuration.NoBumpMessage,
+            commits: commits
+        );
+        return messageIncrement ?? TryFindIncrementFromMergeMessage(mergeCommit);
     }
 
     private VersionField TryFindIncrementFromMergeMessage(ICommit? mergeCommit)
diff --git a/src/GitVersion.Core/VersionCalculation/NextVersionCalculator.cs b/src/GitVersion.Core/VersionCalculation/NextVersionCalculator.cs

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,10 @@ namespace GitVersion.VersionCalculation;`
`4`	`4`
`5`	`5`	`public interface IIncrementStrategyFinder`
`6`	`6`	`{`
`7`		`- VersionField DetermineIncrementedField(GitVersionContext context, BaseVersion baseVersion, EffectiveConfiguration configuration);`
	`7`	`+ VersionField DetermineIncrementedField(ICommit? currentCommit, BaseVersion baseVersion, EffectiveConfiguration configuration);`
`8`	`8`
`9`		`- VersionField? GetIncrementForCommits(IGitVersionConfiguration configuration, IEnumerable<ICommit> commits);`
	`9`	`+ VersionField? GetIncrementForCommits(`
	`10`	`+ string? majorVersionBumpMessage, string? minorVersionBumpMessage, string? patchVersionBumpMessage, string? noBumpMessage,`
	`11`	`+ IEnumerable<ICommit> commits`
	`12`	`+ );`
`10`	`13`	`}`