Remove TrunkBasedVersionCalculator and fix IsMatchForBranchSpecificLabel

Author: HHobeck

src/GitVersion.Core/Git/SemanticVersion.cs

@@ -33,7 +33,7 @@ public class SemanticVersion : IFormattable, IComparable<SemanticVersion>, IEqua
     public bool IsLabeledWith(string value) => PreReleaseTag.HasTag() && PreReleaseTag.Name.IsEquivalentTo(value);
 
     public bool IsMatchForBranchSpecificLabel(string? value)
-        => PreReleaseTag.Name.Length == 0 || value is null || IsLabeledWith(value);
+        => (PreReleaseTag.Name == string.Empty && PreReleaseTag.Number is null) || value is null || IsLabeledWith(value);
 
     public SemanticVersion(long major = 0, long minor = 0, long patch = 0)
     {

src/GitVersion.Core/VersionCalculation/TrunkBased/NonTrunk/MergeCommitOnNonTrunkBase.cs

@@ -9,7 +9,7 @@ public virtual IEnumerable<BaseVersionV2> GetIncrements(TrunkBasedIteration iter
     {
         var baseVersion = TrunkBasedVersionStrategy.DetermineBaseVersionRecursive(
            iteration: commit.ChildIteration!,
-           targetLabelBS: context.TargetLabel,
+           targetLabel: context.TargetLabel,
            taggedSemanticVersions: context.TaggedSemanticVersions
        );
 

src/GitVersion.Core/VersionCalculation/TrunkBased/Trunk/MergeCommitOnTrunkBase.cs

@@ -11,7 +11,7 @@ public virtual IEnumerable<BaseVersionV2> GetIncrements(TrunkBasedIteration iter
     {
         var baseVersion = TrunkBasedVersionStrategy.DetermineBaseVersionRecursive(
            iteration: commit.ChildIteration!,
-           targetLabelBS: context.TargetLabel,
+           targetLabel: context.TargetLabel,
            taggedSemanticVersions: context.TaggedSemanticVersions
        );
 

src/GitVersion.Core/VersionCalculation/TrunkBased/TrunkBasedVersionStrategy.cs

@@ -103,10 +103,10 @@ private bool IterateOverCommitsRecursive(IEnumerable<ICommit> commitsInReverseOr
             {
                 commit.AddSemanticVersions(values);
 
-                var labelBS = targetLabel ?? configuration.GetBranchSpecificLabel(branchName, null);
+                var label = targetLabel ?? configuration.GetBranchSpecificLabel(branchName, null);
                 foreach (var semanticVersion in values)
                 {
-                    if (semanticVersion.IsMatchForBranchSpecificLabel(labelBS)) return true;
+                    if (semanticVersion.IsMatchForBranchSpecificLabel(label)) return true;
                 }
             }
 
@@ -222,18 +222,18 @@ private IReadOnlyDictionary<ICommit, EffectiveBranchConfiguration> GetCommitsWas
     }
 
     private static BaseVersionV2 DetermineBaseVersion(
-        TrunkBasedIteration iteration, string? targetLabelBS,
+        TrunkBasedIteration iteration, string? targetLabel,
         IReadOnlyDictionary<string, HashSet<SemanticVersion>> taggedSemanticVersions
-    ) => DetermineBaseVersionRecursive(iteration, targetLabelBS, taggedSemanticVersions);
+    ) => DetermineBaseVersionRecursive(iteration, targetLabel, taggedSemanticVersions);
 
     internal static BaseVersionV2 DetermineBaseVersionRecursive(
-        TrunkBasedIteration iteration, string? targetLabelBS,
+        TrunkBasedIteration iteration, string? targetLabel,
         IReadOnlyDictionary<string, HashSet<SemanticVersion>> taggedSemanticVersions)
     {
         iteration.NotNull();
         taggedSemanticVersions.NotNull();
 
-        var incrementSteps = GetIncrementSteps(iteration, targetLabelBS, taggedSemanticVersions).ToArray();
+        var incrementSteps = GetIncrementSteps(iteration, targetLabel, taggedSemanticVersions).ToArray();
 
         var semanticVersion = SemanticVersion.Empty;
 
@@ -277,11 +277,11 @@ internal static BaseVersionV2 DetermineBaseVersionRecursive(
     }
 
     private static IEnumerable<BaseVersionV2> GetIncrementSteps(TrunkBasedIteration iteration,
-        string? targetLabelBS, IReadOnlyDictionary<string, HashSet<SemanticVersion>> taggedSemanticVersions)
+        string? targetLabel, IReadOnlyDictionary<string, HashSet<SemanticVersion>> taggedSemanticVersions)
     {
         TrunkBasedContext context = new(taggedSemanticVersions)
         {
-            TargetLabel = targetLabelBS,
+            TargetLabel = targetLabel,
         };
 
         foreach (var commit in iteration.Commits)

src/GitVersion.Core/VersionCalculation/VersionCalculationModule.cs

@@ -11,7 +11,6 @@ public void RegisterTypes(IServiceCollection services)
 
         services.AddSingleton<IVariableProvider, VariableProvider>();
         services.AddSingleton<IVersionModeCalculator, MainlineVersionCalculator>();
-        services.AddSingleton<IVersionModeCalculator, TrunkBasedVersionCalculator>();
         services.AddSingleton<IVersionModeCalculator, ContinuousDeploymentVersionCalculator>();
         services.AddSingleton<IVersionModeCalculator, ContinuousDeliveryVersionCalculator>();
         services.AddSingleton<IVersionModeCalculator, ManualDeploymentVersionCalculator>();

src/GitVersion.Core/VersionCalculation/VersionCalculators/ManualDeploymentVersionCalculator.cs

@@ -14,12 +14,6 @@ public SemanticVersion Calculate(NextVersion nextVersion)
     {
         using (this.log.IndentLog("Using manual deployment workflow to calculate the incremented version."))
         {
-            var preReleaseTag = nextVersion.IncrementedVersion.PreReleaseTag;
-            if (!preReleaseTag.HasTag() || !preReleaseTag.Number.HasValue)
-            {
-                throw new WarningException("Manual deployment requires a pre-release tag.");
-            }
-
             return CalculateInternal(nextVersion);
         }
     }

src/GitVersion.Core/VersionCalculation/VersionCalculators/NonTrunkBasedVersionCalculatorBase.cs

@@ -1,5 +1,4 @@
 using GitVersion.Common;
-using GitVersion.Configuration;
 using GitVersion.Extensions;
 using GitVersion.Logging;
 
@@ -22,15 +21,12 @@ public NonTrunkBasedVersionCalculatorBase(ILog log, IRepositoryStore repositoryS
 
     protected bool ShouldTakeIncrementedVersion(NextVersion nextVersion)
     {
-        var label = nextVersion.Configuration.GetBranchSpecificLabel(
-            Context.CurrentBranch.Name, nextVersion.BaseVersion.BranchNameOverride
-        );
+        nextVersion.NotNull();
 
-        ////
         // TODO: We need to decide whether or not to calculate the upcoming semantic version or the previous one because of tagging. Actually this should be part of the branch configuration system.
-        return Context.CurrentCommit?.Sha != nextVersion.BaseVersion.BaseVersionSource?.Sha
-            || Context.CurrentCommitTaggedVersion == null
-            || !Context.CurrentCommitTaggedVersion.IsMatchForBranchSpecificLabel(label);
+        return Context.CurrentCommit.Sha != nextVersion.BaseVersion.BaseVersionSource?.Sha
+            || Context.CurrentCommitTaggedVersion is null
+            || nextVersion.BaseVersion.SemanticVersion != Context.CurrentCommitTaggedVersion;
         //
     }
 

src/GitVersion.Core/VersionCalculation/VersionCalculators/TrunkBasedVersionCalculator.cs

@@ -118,6 +118,17 @@ public void MergeNoFF(string mergeSource)
         Repository.MergeNoFF(mergeSource, Generate.SignatureNow());
     }
 
+    public void MergeTo(string branchName, bool removeBranchAfterMerging = false)
+    {
+        string mergeSource = Repository.Head.FriendlyName;
+        Checkout(branchName);
+        MergeNoFF(mergeSource);
+        if (removeBranchAfterMerging)
+        {
+            Remove(mergeSource);
+        }
+    }
+
     /// <summary>
     ///     Clones the repository managed by this fixture into another LocalRepositoryFixture
     /// </summary>