Support of TrackMergeTarget for the TrunkBased branching strategy.

Author: HHobeck

src/GitVersion.Core.Tests/IntegrationTests/PerformanceScenarios.cs

@@ -24,6 +24,8 @@ public void RepositoryWithALotOfTags()
         var sw = Stopwatch.StartNew();
 
         fixture.AssertFullSemver($"1.0.{maxCommits}-feature.1+1", configuration);
+        sw.Stop();
+
         sw.ElapsedMilliseconds.ShouldBeLessThan(5000);
     }
 }

src/GitVersion.Core.Tests/IntegrationTests/SupportBranchScenarios.cs

@@ -79,7 +79,7 @@ public void WhenSupportIsBranchedFromMainWithSpecificTag()
         using var fixture = new EmptyRepositoryFixture();
 
         fixture.MakeACommit();
-        fixture.AssertFullSemver("0.0.1-1");
+        fixture.AssertFullSemver("0.0.1-1", configuration);
 
         fixture.ApplyTag("1.4.0-rc");
         fixture.MakeACommit();

src/GitVersion.Core.Tests/TrunkBased/TrunkBasedScenariosWithAGitFlow+GivenADevelopBranchWithOneCommitMergedToMainWithTrackMergeTargetWhenMergedCommitTaggedAsStable.cs

@@ -0,0 +1,71 @@
+using GitVersion.Configuration;
+using GitVersion.Core.Tests;
+using GitVersion.Core.Tests.IntegrationTests;
+using GitVersion.VersionCalculation;
+
+namespace GitVersion.Core.TrunkBased;
+
+internal partial class TrunkBasedScenariosWithAGitFlow
+{
+    [Parallelizable(ParallelScope.All)]
+    public class GivenADevelopBranchWithOneCommitMergedToMainWithTrackMergeTargetWhenMergedCommitTaggedAsStable
+    {
+        private EmptyRepositoryFixture? fixture;
+
+        private static GitFlowConfigurationBuilder TrunkBasedBuilder => GitFlowConfigurationBuilder.New.WithLabel(null)
+            .WithVersioningMode(VersioningMode.TrunkBased)
+            .WithBranch("main", _ => _.WithVersioningMode(VersioningMode.ManualDeployment))
+            .WithBranch("develop", _ => _.WithVersioningMode(VersioningMode.ManualDeployment).WithTrackMergeTarget(true));
+
+        [OneTimeSetUp]
+        public void OneTimeSetUp()
+        {
+            // * 55 minutes ago  (tag: 1.0.0, main)
+            // |\
+            // | * 56 minutes ago  (HEAD -> develop)
+            // |/  
+            // * 58 minutes ago
+
+            fixture = new EmptyRepositoryFixture("main");
+
+            fixture.MakeACommit("A");
+            fixture.BranchTo("develop");
+            fixture.MakeACommit("B");
+            fixture.MergeTo("main");
+            fixture.ApplyTag("1.0.0");
+            fixture.Checkout("develop");
+        }
+
+        [OneTimeTearDown]
+        public void OneTimeTearDown() => fixture?.Dispose();
+
+        [TestCase(IncrementStrategy.None, IncrementStrategy.None, ExpectedResult = "1.0.0-alpha.1+0")]
+        [TestCase(IncrementStrategy.None, IncrementStrategy.Patch, ExpectedResult = "1.0.1-alpha.1+0")]
+        [TestCase(IncrementStrategy.None, IncrementStrategy.Minor, ExpectedResult = "1.1.0-alpha.1+0")]
+        [TestCase(IncrementStrategy.None, IncrementStrategy.Major, ExpectedResult = "2.0.0-alpha.1+0")]
+
+        [TestCase(IncrementStrategy.Patch, IncrementStrategy.None, ExpectedResult = "1.0.0-alpha.1+0")]
+        [TestCase(IncrementStrategy.Patch, IncrementStrategy.Patch, ExpectedResult = "1.0.1-alpha.1+0")]
+        [TestCase(IncrementStrategy.Patch, IncrementStrategy.Minor, ExpectedResult = "1.1.0-alpha.1+0")]
+        [TestCase(IncrementStrategy.Patch, IncrementStrategy.Major, ExpectedResult = "2.0.0-alpha.1+0")]
+
+        [TestCase(IncrementStrategy.Minor, IncrementStrategy.None, ExpectedResult = "1.0.0-alpha.1+0")]
+        [TestCase(IncrementStrategy.Minor, IncrementStrategy.Patch, ExpectedResult = "1.0.1-alpha.1+0")]
+        [TestCase(IncrementStrategy.Minor, IncrementStrategy.Minor, ExpectedResult = "1.1.0-alpha.1+0")]
+        [TestCase(IncrementStrategy.Minor, IncrementStrategy.Major, ExpectedResult = "2.0.0-alpha.1+0")]
+
+        [TestCase(IncrementStrategy.Major, IncrementStrategy.None, ExpectedResult = "1.0.0-alpha.1+0")]
+        [TestCase(IncrementStrategy.Major, IncrementStrategy.Patch, ExpectedResult = "1.0.1-alpha.1+0")]
+        [TestCase(IncrementStrategy.Major, IncrementStrategy.Minor, ExpectedResult = "1.1.0-alpha.1+0")]
+        [TestCase(IncrementStrategy.Major, IncrementStrategy.Major, ExpectedResult = "2.0.0-alpha.1+0")]
+        public string GetVersion(IncrementStrategy incrementOnMain, IncrementStrategy increment)
+        {
+            IGitVersionConfiguration trunkBased = TrunkBasedBuilder
+                .WithBranch("main", _ => _.WithIncrement(incrementOnMain).WithLabel(null))
+                .WithBranch("develop", _ => _.WithIncrement(increment))
+                .Build();
+
+            return fixture!.GetVersion(trunkBased).FullSemVer;
+        }
+    }
+}

src/GitVersion.Core/Core/Abstractions/IRepositoryStore.cs

@@ -42,18 +42,11 @@ public interface IRepositoryStore
 
     SemanticVersion? GetCurrentCommitTaggedVersion(ICommit? commit, string? tagPrefix, SemanticVersionFormat format, bool handleDetachedBranch);
 
-    IEnumerable<SemanticVersion> GetVersionTagsOnBranch(IBranch branch, string? tagPrefix, SemanticVersionFormat format);
-
     IReadOnlyList<SemanticVersionWithTag> GetTaggedSemanticVersions(string? tagPrefix, SemanticVersionFormat format);
 
     IReadOnlyList<SemanticVersionWithTag> GetTaggedSemanticVersionsOnBranch(IBranch branch, string? tagPrefix, SemanticVersionFormat format);
 
     bool IsCommitOnBranch(ICommit? baseVersionSource, IBranch branch, ICommit firstMatchingCommit);
 
     int GetNumberOfUncommittedChanges();
-
-    IEnumerable<SemanticVersionWithTag> GetSemanticVersions(
-        IGitVersionConfiguration configuration, IBranch currentBranch, ICommit currentCommit,
-        bool trackMergeTarget, bool tracksReleaseBranches
-    );
 }

src/GitVersion.Core/Core/RepositoryStore.cs

@@ -257,29 +257,6 @@ public IEnumerable<BranchCommit> FindCommitBranchesWasBranchedFrom(IBranch branc
             .SelectMany(tag => GetCurrentCommitSemanticVersions(commit, tagPrefix, tag, format, handleDetachedBranch))
             .Max();
 
-    public IEnumerable<SemanticVersion> GetVersionTagsOnBranch(IBranch branch, string? tagPrefix, SemanticVersionFormat format)
-    {
-        branch = branch.NotNull();
-
-        if (this.taggedSemanticVersionsOnBranchCache.TryGetValue(branch, out var onBranch))
-        {
-            this.log.Debug($"Cache hit for version tags on branch '{branch.Name.Canonical}");
-            return onBranch.Select(element => element.Value);
-        }
-
-        using (this.log.IndentLog($"Getting version tags from branch '{branch.Name.Canonical}'."))
-        {
-            var semanticVersions = GetTaggedSemanticVersions(tagPrefix, format);
-            var tagsBySha = semanticVersions.Where(t => t.Tag.TargetSha != null).ToLookup(t => t.Tag.TargetSha, t => t);
-
-            var versionTags = (branch.Commits.SelectMany(c => tagsBySha[c.Sha].Select(t => t))
-                ?? Enumerable.Empty<SemanticVersionWithTag>()).ToList();
-
-            this.taggedSemanticVersionsOnBranchCache.Add(branch, versionTags);
-            return versionTags.Select(element => element.Value);
-        }
-    }
-
     public IReadOnlyList<SemanticVersionWithTag> GetTaggedSemanticVersions(string? tagPrefix, SemanticVersionFormat format)
     {
         if (this.taggedSemanticVersionsCache != null)
@@ -359,93 +336,4 @@ private IEnumerable<SemanticVersion> GetCurrentCommitSemanticVersions(ICommit? c
             ? new[] { version }
             : Array.Empty<SemanticVersion>();
     }
-
-    public IEnumerable<SemanticVersionWithTag> GetSemanticVersions(IGitVersionConfiguration configuration,
-        IBranch currentBranch, ICommit currentCommit, bool trackMergeTarget, bool tracksReleaseBranches)
-    {
-        var olderThan = currentCommit?.When;
-
-        IEnumerable<SemanticVersionWithTag> GetSemanticVersions()
-        {
-            var semanticVersions = GetTaggedSemanticVersions(
-                configuration.TagPrefix, configuration.SemanticVersionFormat
-            ).ToList();
-            var semanticVersionsByCommitLazy = new Lazy<ILookup<string, SemanticVersionWithTag>>(
-                () => semanticVersions.ToLookup(element => element.Tag.Commit.Id.Sha)
-            );
-
-            foreach (var semanticVersion in GetSemanticVersionsCommon(currentBranch, semanticVersionsByCommitLazy))
-            {
-                if (semanticVersion.Tag.Commit.When <= olderThan) yield return semanticVersion;
-            }
-
-            if (trackMergeTarget)
-            {
-                foreach (var semanticVersion in GetSemanticVersionsTrackMergeTarget(currentBranch, semanticVersionsByCommitLazy))
-                {
-                    if (semanticVersion.Tag.Commit.When <= olderThan) yield return semanticVersion;
-                }
-            }
-
-            if (tracksReleaseBranches)
-            {
-                foreach (var semanticVersion in GetSemanticVersionsTracksReleaseBranches(configuration, semanticVersionsByCommitLazy))
-                {
-                    yield return semanticVersion;
-                }
-            }
-        }
-
-        var alreadyReturnedValues = new HashSet<SemanticVersionWithTag>();
-
-        foreach (var semanticVersion in GetSemanticVersions())
-        {
-            if (alreadyReturnedValues.Add(semanticVersion))
-                yield return semanticVersion;
-        }
-    }
-
-    private static IEnumerable<SemanticVersionWithTag> GetSemanticVersionsCommon(
-        IBranch currentBranch, Lazy<ILookup<string, SemanticVersionWithTag>> semanticVersionsByCommitLazy)
-    {
-        foreach (var commit in currentBranch.Commits)
-        {
-            foreach (var semanticVersion in semanticVersionsByCommitLazy.Value[commit.Id.Sha])
-            {
-                yield return semanticVersion;
-            }
-        }
-    }
-
-    private static IEnumerable<SemanticVersionWithTag> GetSemanticVersionsTrackMergeTarget(
-        IBranch currentBranch, Lazy<ILookup<string, SemanticVersionWithTag>> semanticVersionsByCommitLazy)
-    {
-        var commitsOnCurrentBranch = currentBranch.Commits.ToArray();
-        if (!commitsOnCurrentBranch.Any()) yield break;
-
-        var shaHashSet = new HashSet<string>(commitsOnCurrentBranch.Select(element => element.Id.Sha));
-        foreach (var semanticVersion in semanticVersionsByCommitLazy.Value.SelectMany(element => element))
-        {
-            var parentCommits = semanticVersion.Tag.Commit.Parents ?? Array.Empty<ICommit>();
-            if (parentCommits.Any(element => shaHashSet.Contains(element.Id.Sha)))
-            {
-                yield return semanticVersion;
-            }
-        }
-    }
-
-    private IEnumerable<SemanticVersionWithTag> GetSemanticVersionsTracksReleaseBranches(
-        IGitVersionConfiguration configuration, Lazy<ILookup<string, SemanticVersionWithTag>> semanticVersionsByCommitLazy)
-    {
-        foreach (var mainBranch in FindMainlineBranches(configuration))
-        {
-            foreach (var commit in mainBranch.Commits?.ToArray() ?? Array.Empty<ICommit>())
-            {
-                foreach (var semanticVersion in semanticVersionsByCommitLazy.Value[commit.Id.Sha])
-                {
-                    yield return semanticVersion;
-                }
-            }
-        }
-    }
 }