Cretae TrunkBasedVersionStrategy implementation (see #3601 for more details)

Author: HHobeck

src/GitVersion.Core.Tests/VersionCalculation/SemanticVersionTests.cs

@@ -33,7 +33,7 @@ public void ConfigNextVersionTest(string nextVersion, string expectedVersion, Se
 
         baseVersion.ShouldNotBeNull();
         baseVersion.ShouldIncrement.ShouldBe(false);
-        baseVersion.SemanticVersion.ToString().ShouldBe(expectedVersion);
+        baseVersion.GetSemanticVersion().ToString().ShouldBe(expectedVersion);
     }
 
     [TestCase("0.1", SemanticVersionFormat.Strict)]

src/GitVersion.Core.Tests/VersionCalculation/Strategies/ConfigNextVersionBaseVersionStrategyTests.cs

@@ -177,7 +177,7 @@ private static void AssertMergeMessage(string message, string? expectedVersion,
         else
         {
             baseVersion.ShouldNotBeNull();
-            baseVersion.SemanticVersion.ToString().ShouldBe(expectedVersion);
+            baseVersion.GetSemanticVersion().ToString().ShouldBe(expectedVersion);
         }
     }
 

src/GitVersion.Core.Tests/VersionCalculation/Strategies/MergeMessageBaseVersionStrategyTests.cs

@@ -28,7 +28,7 @@ public void CanTakeVersionFromNameOfReleaseBranch(string branchName, string expe
         strategy.ShouldNotBeNull();
         var baseVersion = strategy.GetBaseVersions(effectiveBranchConfiguration).Single();
 
-        baseVersion.SemanticVersion.ToString().ShouldBe(expectedBaseVersion);
+        baseVersion.GetSemanticVersion().ToString().ShouldBe(expectedBaseVersion);
     }
 
     [TestCase("origin/hotfix-2.0.0")]
@@ -90,7 +90,7 @@ public void CanTakeVersionFromNameOfConfiguredReleaseBranch(string branchName, s
         strategy.ShouldNotBeNull();
         var baseVersion = strategy.GetBaseVersions(effectiveBranchConfiguration).Single();
 
-        baseVersion.SemanticVersion.ToString().ShouldBe(expectedBaseVersion);
+        baseVersion.GetSemanticVersion().ToString().ShouldBe(expectedBaseVersion);
     }
 
     [TestCase("origin", "release-2.0.0", "2.0.0")]
@@ -114,7 +114,7 @@ public void CanTakeVersionFromNameOfRemoteReleaseBranch(string origin, string br
         strategy.ShouldNotBeNull();
         var baseVersion = strategy.GetBaseVersions(effectiveBranchConfiguration).Single();
 
-        baseVersion.SemanticVersion.ToString().ShouldBe(expectedBaseVersion);
+        baseVersion.GetSemanticVersion().ToString().ShouldBe(expectedBaseVersion);
     }
 
     private static IVersionStrategy GetVersionStrategy(IGitRepository repository,

src/GitVersion.Core.Tests/VersionCalculation/Strategies/VersionInBranchNameBaseVersionStrategyTests.cs

@@ -1,4 +1,5 @@
 using GitVersion.Extensions;
+using GitVersion.VersionCalculation;
 
 namespace GitVersion.Configuration;
 
@@ -7,4 +8,12 @@ public record EffectiveBranchConfiguration(EffectiveConfiguration Value, IBranch
     public IBranch Branch { get; } = Branch.NotNull();
 
     public EffectiveConfiguration Value { get; } = Value.NotNull();
+
+    public NextVersion CreateNextVersion(BaseVersion baseVersion, SemanticVersion incrementedVersion)
+    {
+        incrementedVersion.NotNull();
+        baseVersion.NotNull();
+
+        return new NextVersion(incrementedVersion, baseVersion, this);
+    }
 }

src/GitVersion.Core/Configuration/EffectiveBranchConfiguration.cs

@@ -16,12 +16,13 @@ public interface IRepositoryStore
     IEnumerable<ICommit> GetCommitLog(ICommit? baseVersionSource, ICommit? currentCommit);
 
     IBranch GetTargetBranch(string? targetBranchName);
-    IBranch? FindBranch(string? branchName);
+    IBranch? FindBranch(ReferenceName branchName);
+    IBranch? FindBranch(string branchName);
     IBranch? FindMainBranch(IGitVersionConfiguration configuration);
     IEnumerable<IBranch> FindMainlineBranches(IGitVersionConfiguration configuration);
     IEnumerable<IBranch> GetReleaseBranches(IEnumerable<KeyValuePair<string, IBranchConfiguration>> releaseBranchConfig);
     IEnumerable<IBranch> ExcludingBranches(IEnumerable<IBranch> branchesToExclude);
-    IEnumerable<IBranch> GetBranchesContainingCommit(ICommit? commit, IEnumerable<IBranch>? branches = null, bool onlyTrackedBranches = false);
+    IEnumerable<IBranch> GetBranchesContainingCommit(ICommit commit, IEnumerable<IBranch>? branches = null, bool onlyTrackedBranches = false);
 
     IDictionary<string, List<IBranch>> GetMainlineBranches(ICommit commit, IGitVersionConfiguration configuration);
 
@@ -50,4 +51,9 @@ public interface IRepositoryStore
     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/Abstractions/IRepositoryStore.cs

@@ -14,9 +14,9 @@ public BranchesContainingCommitFinder(IGitRepository repository, ILog log)
         this.log = log.NotNull();
     }
 
-    public IEnumerable<IBranch> GetBranchesContainingCommit(ICommit? commit, IEnumerable<IBranch>? branches = null, bool onlyTrackedBranches = false)
+    public IEnumerable<IBranch> GetBranchesContainingCommit(ICommit commit, IEnumerable<IBranch>? branches = null, bool onlyTrackedBranches = false)
     {
-        commit = commit.NotNull();
+        commit.NotNull();
         branches ??= this.repository.Branches.ToList();
 
         // TODO Should we cache this?

src/GitVersion.Core/Core/BranchesContainingCommitFinder.cs

@@ -23,6 +23,9 @@ public GitVersionContext Create(GitVersionOptions gitVersionOptions)
         var currentBranch = this.repositoryStore.GetTargetBranch(gitVersionOptions.RepositoryInfo.TargetBranch) ?? throw new InvalidOperationException("Need a branch to operate on");
         var currentCommit = this.repositoryStore.GetCurrentCommit(currentBranch, gitVersionOptions.RepositoryInfo.CommitId);
 
+        Debugger.Launch();
+        if (currentCommit is null) throw new GitVersionException("No commits found on the current branch.");
+
         var overrideConfiguration = this.options.Value.ConfigurationInfo.OverrideConfiguration;
         var configuration = this.configurationProvider.Provide(overrideConfiguration);
         if (currentBranch.IsDetachedHead)

src/GitVersion.Core/Core/GitVersionContextFactory.cs

@@ -104,7 +104,9 @@ public IBranch GetTargetBranch(string? targetBranchName)
         return desiredBranch;
     }
 
-    public IBranch? FindBranch(string? branchName) => this.repository.Branches.FirstOrDefault(x => x.Name.EquivalentTo(branchName));
+    public IBranch? FindBranch(ReferenceName branchName) => this.repository.Branches.FirstOrDefault(x => x.Name.Equals(branchName));
+
+    public IBranch? FindBranch(string branchName) => this.repository.Branches.FirstOrDefault(x => x.Name.EquivalentTo(branchName));
 
     public IBranch? FindMainBranch(IGitVersionConfiguration configuration)
     {
@@ -143,7 +145,7 @@ private static bool IsReleaseBranch(INamedReference branch, IEnumerable<KeyValue
 
     public IEnumerable<IBranch> ExcludingBranches(IEnumerable<IBranch> branchesToExclude) => this.repository.Branches.ExcludeBranches(branchesToExclude);
 
-    public IEnumerable<IBranch> GetBranchesContainingCommit(ICommit? commit, IEnumerable<IBranch>? branches = null, bool onlyTrackedBranches = false)
+    public IEnumerable<IBranch> GetBranchesContainingCommit(ICommit commit, IEnumerable<IBranch>? branches = null, bool onlyTrackedBranches = false)
     {
         var branchesContainingCommitFinder = new BranchesContainingCommitFinder(this.repository, this.log);
         return branchesContainingCommitFinder.GetBranchesContainingCommit(commit, branches, onlyTrackedBranches);
@@ -268,7 +270,7 @@ public IEnumerable<SemanticVersion> GetVersionTagsOnBranch(IBranch branch, strin
             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))
+            var versionTags = (branch.Commits.SelectMany(c => tagsBySha[c.Sha].Select(t => t))
                 ?? Enumerable.Empty<SemanticVersionWithTag>()).ToList();
 
             this.taggedSemanticVersionsOnBranchCache.Add(branch, versionTags);
@@ -316,7 +318,7 @@ public IReadOnlyList<SemanticVersionWithTag> GetTaggedSemanticVersionsOnBranch(
             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))
+            var versionTags = (branch.Commits.SelectMany(c => tagsBySha[c.Sha].Select(t => t))
                 ?? Enumerable.Empty<SemanticVersionWithTag>()).ToList();
 
             this.taggedSemanticVersionsOnBranchCache.Add(branch, versionTags);
@@ -355,4 +357,93 @@ 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;
+                }
+            }
+        }
+    }
 }

src/GitVersion.Core/Core/RepositoryStore.cs

@@ -18,6 +18,9 @@ public static EffectiveConfiguration GetEffectiveConfiguration(this IGitVersionC
         return new(configuration, branchConfiguration);
     }
 
+    public static IBranchConfiguration GetBranchConfiguration(this IGitVersionConfiguration configuration, IBranch branch)
+        => GetBranchConfiguration(configuration, branch.NotNull().Name);
+
     public static IBranchConfiguration GetBranchConfiguration(this IGitVersionConfiguration configuration, ReferenceName branchName)
     {
         var branchConfiguration = GetBranchConfigurations(configuration, branchName.WithoutOrigin).FirstOrDefault();