Create TrunkBasedVersionStrategy implementation (see #3601 for more details)

Author: HHobeck

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

@@ -0,0 +1,22 @@
+using GitVersion.Configuration;
+using GitVersion.Extensions;
+
+namespace GitVersion.VersionCalculation.TrunkBased;
+
+internal sealed class EnrichIncrement : ITrunkBasedContextPreEnricher
+{
+    public void Enrich(TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context)
+    {
+        var incrementForcedByBranch = commit.GetIncrementForcedByBranch();
+        var incrementForcedByCommit = commit.Increment;
+        context.Increment = context.Increment.Consolidate(incrementForcedByBranch, incrementForcedByCommit);
+
+        if (commit.Predecessor is not null && commit.Predecessor.BranchName != commit.BranchName)
+            context.Label = null;
+        context.Label ??= commit.Configuration.GetBranchSpecificLabel(commit.BranchName, null);
+
+        if (commit.Configuration.IsMainline)
+            context.BaseVersionSource = commit.Predecessor?.Value;
+        context.ForceIncrement |= commit.Configuration.IsMainline || commit.IsPredecessorTheLastCommitOnTrunk;
+    }
+}

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

@@ -0,0 +1,20 @@
+using GitVersion.Configuration;
+using GitVersion.Extensions;
+
+namespace GitVersion.VersionCalculation.TrunkBased;
+
+internal sealed class EnrichSemanticVersion : ITrunkBasedContextPreEnricher
+{
+    public void Enrich(TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context)
+    {
+        var branchSpecificLabel = context.TargetLabel;
+        branchSpecificLabel ??= iteration.Configuration.GetBranchSpecificLabel(commit.BranchName, null);
+        branchSpecificLabel ??= commit.Configuration.GetBranchSpecificLabel(commit.BranchName, null);
+
+        var semanticVersions = commit.SemanticVersions.Where(
+            element => element.IsMatchForBranchSpecificLabel(branchSpecificLabel)
+        ).ToList();
+        context.AlternativeSemanticVersions.AddRange(commit.SemanticVersions.Except(semanticVersions));
+        context.SemanticVersion = semanticVersions.Max();
+    }
+}

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

@@ -0,0 +1,6 @@
+namespace GitVersion.VersionCalculation.TrunkBased;
+
+internal interface ITrunkBasedContextPostEnricher
+{
+    void Enrich(TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context);
+}

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

@@ -0,0 +1,6 @@
+namespace GitVersion.VersionCalculation.TrunkBased;
+
+internal interface ITrunkBasedContextPreEnricher
+{
+    void Enrich(TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context);
+}

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

@@ -0,0 +1,8 @@
+namespace GitVersion.VersionCalculation.TrunkBased;
+
+internal interface ITrunkBasedIncrementer
+{
+    bool MatchPrecondition(TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context);
+
+    IEnumerable<BaseVersionV2> GetIncrements(TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context);
+}

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

@@ -0,0 +1,36 @@
+using GitVersion.Configuration;
+
+namespace GitVersion.VersionCalculation.TrunkBased.NonTrunk;
+
+internal sealed class CommitOnNonTrunk : ITrunkBasedIncrementer
+{
+    // B  57 minutes ago  (HEAD -> feature/foo)
+    // A  58 minutes ago <<--
+
+    // B  57 minutes ago  (HEAD -> feature/foo) <<--
+    // A  58 minutes ago
+
+    public bool MatchPrecondition(TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context)
+        => commit.ChildIteration is null && !commit.Configuration.IsMainline && context.SemanticVersion is null;
+
+    public IEnumerable<BaseVersionV2> GetIncrements(TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context)
+    {
+        if (commit.Predecessor is not null && commit.Predecessor.BranchName != commit.BranchName)
+            context.Label = null;
+        context.Label ??= commit.Configuration.GetBranchSpecificLabel(commit.BranchName, null);
+
+        if (commit.Successor is null)
+        {
+            yield return BaseVersionV2.ShouldIncrementTrue(
+                source: GetType().Name,
+                baseVersionSource: context.BaseVersionSource,
+                increment: context.Increment,
+                label: context.Label,
+                forceIncrement: context.ForceIncrement,
+                alternativeSemanticVersion: context.AlternativeSemanticVersions.Max()
+            );
+
+            context.BaseVersionSource = commit.Value;
+        }
+    }
+}

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

@@ -0,0 +1,29 @@
+using GitVersion.Configuration;
+using GitVersion.Extensions;
+
+namespace GitVersion.VersionCalculation.TrunkBased.NonTrunk;
+
+internal abstract class CommitOnNonTrunkBranchedBase : ITrunkBasedIncrementer
+{
+    public virtual bool MatchPrecondition(TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context)
+        => !commit.Configuration.IsMainline && commit.BranchName != iteration.BranchName && commit.Successor is null;
+
+    public virtual IEnumerable<BaseVersionV2> GetIncrements(TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context)
+    {
+        context.BaseVersionSource = commit.Value;
+
+        var incrementForcedByBranch = iteration.Configuration.Increment == IncrementStrategy.Inherit
+            ? commit.GetIncrementForcedByBranch() : iteration.Configuration.Increment.ToVersionField();
+        context.Increment = context.Increment.Consolidate(incrementForcedByBranch);
+
+        context.Label = iteration.Configuration.GetBranchSpecificLabel(iteration.BranchName, null) ?? context.Label;
+        context.ForceIncrement = true;
+
+        yield return BaseVersionV2.ShouldIncrementFalse(
+            source: GetType().Name,
+            baseVersionSource: null,
+            label: context.Label,
+            alternativeSemanticVersion: context.AlternativeSemanticVersions.Max()
+        );
+    }
+}

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

@@ -0,0 +1,18 @@
+namespace GitVersion.VersionCalculation.TrunkBased.NonTrunk;
+
+internal sealed class CommitOnNonTrunkBranchedToNonTrunk : CommitOnNonTrunkBranchedBase
+{
+    // B  51 minutes ago  (HEAD -> feature/foo, main) <<--
+    // A  59 minutes ago
+
+    // B  58 minutes ago  (main)
+    // A  59 minutes ago  (HEAD -> feature/foo) <<--
+
+    // *  54 minutes ago  (main)
+    // | B  56 minutes ago  (HEAD -> feature/foo)
+    // |/
+    // A  58 minutes ago <<--
+
+    public override bool MatchPrecondition(TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context)
+        => base.MatchPrecondition(iteration, commit, context) && !iteration.Configuration.IsMainline;
+}

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

@@ -0,0 +1,18 @@
+namespace GitVersion.VersionCalculation.TrunkBased.NonTrunk;
+
+internal sealed class CommitOnNonTrunkBranchedToTrunk : CommitOnNonTrunkBranchedBase
+{
+    // B  51 minutes ago  (HEAD -> release/1.0.x, main) <<--
+    // A  59 minutes ago
+
+    // B  58 minutes ago  (main)
+    // A  59 minutes ago  (HEAD -> release/1.0.x) <<--
+
+    // *  54 minutes ago  (main)
+    // | B  56 minutes ago  (HEAD -> release/1.0.x)
+    // |/
+    // A  58 minutes ago <<--
+
+    public override bool MatchPrecondition(TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context)
+        => base.MatchPrecondition(iteration, commit, context) && iteration.Configuration.IsMainline;
+}

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

@@ -0,0 +1,10 @@
+namespace GitVersion.VersionCalculation.TrunkBased.NonTrunk;
+
+internal sealed class CommitOnNonTrunkWithPreReleaseTag : CommitOnNonTrunkWithPreReleaseTagBase
+{
+    // B 57 minutes ago  (HEAD -> feature/foo)
+    // A 58 minutes ago  (tag 1.2.3-1) <<--
+
+    public override bool MatchPrecondition(TrunkBasedIteration iteration, TrunkBasedCommit commit, TrunkBasedContext context)
+        => base.MatchPrecondition(iteration, commit, context) && commit.Successor is not null;
+}