Merge pull request #3988 from HHobeck/feature/ensure-pull-request

arturcic · web-flow · commit c850a3cb0eb3 · 2024-04-16T19:49:46.000+02:00
EnsurePullRequestWithIncrementMajorOnMainAndMinorOnFeatureBranch
diff --git a/src/GitVersion.Core.Tests/Core/RepositoryStoreTests.cs b/src/GitVersion.Core.Tests/Core/RepositoryStoreTests.cs
@@ -227,10 +227,10 @@ public void FindCommitBranchWasBranchedFromShouldReturnNullIfTheRemoteIsTheOnlyS
         branch.ShouldNotBeNull();
 
         var configuration = GitFlowConfigurationBuilder.New.Build();
-        var branchedCommit = gitRepoMetadataProvider.FindCommitBranchWasBranchedFrom(branch, configuration, []);
+        var branchedCommit = gitRepoMetadataProvider.FindCommitBranchBranchedFrom(branch, configuration, []);
         branchedCommit.ShouldBe(BranchCommit.Empty);
 
-        var branchedCommits = gitRepoMetadataProvider.FindCommitBranchesWasBranchedFrom(branch, configuration).ToArray();
+        var branchedCommits = gitRepoMetadataProvider.FindCommitBranchesBranchedFrom(branch, configuration).ToArray();
         branchedCommits.ShouldBeEmpty();
     }
 }
diff --git a/src/GitVersion.Core.Tests/IntegrationTests/HotfixBranchScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/HotfixBranchScenarios.cs
@@ -162,7 +162,7 @@ public void FeatureOnHotfixFeatureBranchDeleted()
         fixture.Checkout(hotfix451);
         fixture.MergeNoFF(featureBranch); // commit 2
         fixture.Repository.Branches.Remove(featureBranch);
-        fixture.AssertFullSemver("4.5.1-beta.1+3", configuration);
+        fixture.AssertFullSemver("4.5.1-beta.1+4", configuration);
     }
 
     /// <summary>
@@ -208,7 +208,7 @@ public void FeatureOnHotfixFeatureBranchNotDeleted()
         fixture.Checkout(hotfix451);
         fixture.MergeNoFF(featureBranch); // commit 2
 
-        fixture.AssertFullSemver("4.5.1-beta.1+3", configuration);
+        fixture.AssertFullSemver("4.5.1-beta.1+4", configuration);
     }
 
     [Test]
diff --git a/src/GitVersion.Core.Tests/IntegrationTests/PullRequestScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/PullRequestScenarios.cs
@@ -1,3 +1,4 @@
+using GitVersion.Configuration;
 using GitVersion.Core.Tests.Helpers;
 using LibGit2Sharp;
 
@@ -6,6 +7,48 @@ namespace GitVersion.Core.Tests.IntegrationTests;
 [TestFixture]
 public class PullRequestScenarios : TestBase
 {
+    /// <summary>
+    /// GitHubFlow - Pull requests (increment major on main and minor on feature)
+    /// </summary>
+    [Test]
+    public void EnsurePullRequestWithIncrementMajorOnMainAndMinorOnFeatureBranch()
+    {
+        var configuration = GitHubFlowConfigurationBuilder.New
+            .WithBranch("main", _ => _
+                .WithIncrement(IncrementStrategy.Major)
+            ).WithBranch("feature", _ => _
+                .WithIncrement(IncrementStrategy.Minor)
+            ).Build();
+
+        using var fixture = new EmptyRepositoryFixture();
+
+        fixture.MakeACommit("A");
+
+        // ✅ succeeds as expected
+        fixture.AssertFullSemver("1.0.0-1", configuration);
+
+        fixture.ApplyTag("1.0.0");
+        fixture.BranchTo("feature/foo");
+        fixture.MakeACommit("B");
+
+        // ✅ succeeds as expected
+        fixture.AssertFullSemver("1.1.0-foo.1+1", configuration);
+
+        fixture.Checkout("main");
+        fixture.BranchTo("pull/2/merge");
+        fixture.MergeNoFF("feature/foo");
+
+        // ✅ succeeds as expected
+        fixture.AssertFullSemver("2.0.0-PullRequest2.2", configuration);
+
+        fixture.Checkout("main");
+        fixture.Remove("pull/2/merge");
+        fixture.MergeNoFF("feature/foo");
+
+        // ✅ succeeds as expected
+        fixture.AssertFullSemver("2.0.0-2", configuration);
+    }
+
     [Test]
     public void CanCalculatePullRequestChanges()
     {
diff --git a/src/GitVersion.Core/Core/Abstractions/IRepositoryStore.cs b/src/GitVersion.Core/Core/Abstractions/IRepositoryStore.cs
@@ -27,11 +27,11 @@ public interface IRepositoryStore
     /// Find the commit where the given branch was branched from another branch.
     /// If there are multiple such commits and branches, tries to guess based on commit histories.
     /// </summary>
-    BranchCommit FindCommitBranchWasBranchedFrom(IBranch? branch, IGitVersionConfiguration configuration, params IBranch[] excludedBranches);
+    BranchCommit FindCommitBranchBranchedFrom(IBranch? branch, IGitVersionConfiguration configuration, params IBranch[] excludedBranches);
 
-    IEnumerable<BranchCommit> FindCommitBranchesWasBranchedFrom(IBranch branch, IGitVersionConfiguration configuration, params IBranch[] excludedBranches);
+    IEnumerable<BranchCommit> FindCommitBranchesBranchedFrom(IBranch branch, IGitVersionConfiguration configuration, params IBranch[] excludedBranches);
 
-    IEnumerable<BranchCommit> FindCommitBranchesWasBranchedFrom(IBranch branch, IGitVersionConfiguration configuration, IEnumerable<IBranch> excludedBranches);
+    IEnumerable<BranchCommit> FindCommitBranchesBranchedFrom(IBranch branch, IGitVersionConfiguration configuration, IEnumerable<IBranch> excludedBranches);
 
     IEnumerable<IBranch> GetSourceBranches(IBranch branch, IGitVersionConfiguration configuration, params IBranch[] excludedBranches);
 
diff --git a/src/GitVersion.Core/Core/MainlineBranchFinder.cs b/src/GitVersion.Core/Core/MainlineBranchFinder.cs
@@ -83,7 +83,7 @@ public BranchCommit BranchOrigin(IBranch branch)
                 return mergeBase;
             }
 
-            var branchCommit = this.repositoryStore.FindCommitBranchWasBranchedFrom(branch, this.configuration);
+            var branchCommit = this.repositoryStore.FindCommitBranchBranchedFrom(branch, this.configuration);
             if (branchCommit != BranchCommit.Empty)
             {
                 this.log.Info($"Found parent commit {branchCommit.Commit.Sha} for '{branchName}'.");
diff --git a/src/GitVersion.Core/Core/RepositoryStore.cs b/src/GitVersion.Core/Core/RepositoryStore.cs
@@ -106,14 +106,47 @@ public IEnumerable<IBranch> GetSourceBranches(IBranch branch, IGitVersionConfigu
             params IBranch[] excludedBranches)
         => GetSourceBranches(branch, configuration, (IEnumerable<IBranch>)excludedBranches);
 
-    public IEnumerable<IBranch> GetSourceBranches(IBranch branch, IGitVersionConfiguration configuration, IEnumerable<IBranch> excludedBranches)
+    public IEnumerable<IBranch> GetSourceBranches(
+        IBranch branch, IGitVersionConfiguration configuration, IEnumerable<IBranch> excludedBranches)
     {
         var returnedBranches = new HashSet<IBranch>();
 
         var referenceLookup = this.repository.Refs.ToLookup(r => r.TargetIdentifier);
 
-        foreach (var branchGrouping in FindCommitBranchesWasBranchedFrom(branch, configuration, excludedBranches)
-            .GroupBy(element => element.Commit, element => element.Branch))
+        var commitBranches = FindCommitBranchesBranchedFrom(branch, configuration, excludedBranches).ToHashSet();
+
+        var ignore = new HashSet<BranchCommit>();
+        foreach (var commitBranch in commitBranches)
+        {
+            foreach (var commit in branch.Commits.Where(element => element.When > commitBranch.Commit.When))
+            {
+                var parents = commit.Parents.ToArray();
+                if (parents.Length > 1 && parents.Any(element => element.Equals(commitBranch.Commit)))
+                {
+                    ignore.Add(commitBranch);
+                }
+            }
+        }
+
+        foreach (var item in commitBranches.Skip(1).Reverse())
+        {
+            if (ignore.Contains(item)) continue;
+
+            foreach (var commitBranche in commitBranches)
+            {
+                if (item.Commit.Equals(commitBranche.Commit)) break;
+
+                foreach (var commit in commitBranche.Branch.Commits.Where(element => element.When >= item.Commit.When))
+                {
+                    if (commit.Equals(item.Commit))
+                    {
+                        commitBranches.Remove(item);
+                    }
+                }
+            }
+        }
+
+        foreach (var branchGrouping in commitBranches.GroupBy(element => element.Commit, element => element.Branch))
         {
             bool referenceMatchFound = false;
             var referenceNames = referenceLookup[branchGrouping.Key.Sha].Select(element => element.Name).ToHashSet();
@@ -141,7 +174,7 @@ public IEnumerable<IBranch> GetSourceBranches(IBranch branch, IGitVersionConfigu
     ///     Find the commit where the given branch was branched from another branch.
     ///     If there are multiple such commits and branches, tries to guess based on commit histories.
     /// </summary>
-    public BranchCommit FindCommitBranchWasBranchedFrom(IBranch? branch, IGitVersionConfiguration configuration,
+    public BranchCommit FindCommitBranchBranchedFrom(IBranch? branch, IGitVersionConfiguration configuration,
         params IBranch[] excludedBranches)
     {
         branch = branch.NotNull();
@@ -170,28 +203,22 @@ public BranchCommit FindCommitBranchWasBranchedFrom(IBranch? branch, IGitVersion
         }
     }
 
-    public IEnumerable<BranchCommit> FindCommitBranchesWasBranchedFrom(IBranch branch, IGitVersionConfiguration configuration, params IBranch[] excludedBranches)
-        => FindCommitBranchesWasBranchedFrom(branch, configuration, (IEnumerable<IBranch>)excludedBranches);
+    public IEnumerable<BranchCommit> FindCommitBranchesBranchedFrom(
+            IBranch branch, IGitVersionConfiguration configuration, params IBranch[] excludedBranches)
+        => FindCommitBranchesBranchedFrom(branch, configuration, (IEnumerable<IBranch>)excludedBranches);
 
-    public IEnumerable<BranchCommit> FindCommitBranchesWasBranchedFrom(IBranch branch, IGitVersionConfiguration configuration, IEnumerable<IBranch> excludedBranches)
+    public IEnumerable<BranchCommit> FindCommitBranchesBranchedFrom(
+        IBranch branch, IGitVersionConfiguration configuration, IEnumerable<IBranch> excludedBranches)
     {
         using (this.log.IndentLog($"Finding branches source of '{branch}'"))
         {
             if (branch.Tip == null)
             {
                 this.log.Warning($"{branch} has no tip.");
-                yield break;
+                return [];
             }
 
-            DateTimeOffset? when = null;
-            var branchCommits = new MergeCommitFinder(this, configuration, excludedBranches, this.log)
-                .FindMergeCommitsFor(branch).ToList();
-            foreach (var branchCommit in branchCommits)
-            {
-                if (when != null && branchCommit.Commit.When != when) break;
-                yield return branchCommit;
-                when = branchCommit.Commit.When;
-            }
+            return new MergeCommitFinder(this, configuration, excludedBranches, this.log).FindMergeCommitsFor(branch).ToList();
         }
     }
 
diff --git a/src/GitVersion.Core/PublicAPI.Unshipped.txt b/src/GitVersion.Core/PublicAPI.Unshipped.txt
@@ -25,9 +25,9 @@ GitVersion.Common.IRepositoryStore
 GitVersion.Common.IRepositoryStore.ExcludingBranches(System.Collections.Generic.IEnumerable<GitVersion.Git.IBranch!>! branchesToExclude) -> System.Collections.Generic.IEnumerable<GitVersion.Git.IBranch!>!
 GitVersion.Common.IRepositoryStore.FindBranch(GitVersion.Git.ReferenceName! branchName) -> GitVersion.Git.IBranch?
 GitVersion.Common.IRepositoryStore.FindBranch(string! branchName) -> GitVersion.Git.IBranch?
-GitVersion.Common.IRepositoryStore.FindCommitBranchesWasBranchedFrom(GitVersion.Git.IBranch! branch, GitVersion.Configuration.IGitVersionConfiguration! configuration, params GitVersion.Git.IBranch![]! excludedBranches) -> System.Collections.Generic.IEnumerable<GitVersion.Git.BranchCommit>!
-GitVersion.Common.IRepositoryStore.FindCommitBranchesWasBranchedFrom(GitVersion.Git.IBranch! branch, GitVersion.Configuration.IGitVersionConfiguration! configuration, System.Collections.Generic.IEnumerable<GitVersion.Git.IBranch!>! excludedBranches) -> System.Collections.Generic.IEnumerable<GitVersion.Git.BranchCommit>!
-GitVersion.Common.IRepositoryStore.FindCommitBranchWasBranchedFrom(GitVersion.Git.IBranch? branch, GitVersion.Configuration.IGitVersionConfiguration! configuration, params GitVersion.Git.IBranch![]! excludedBranches) -> GitVersion.Git.BranchCommit
+GitVersion.Common.IRepositoryStore.FindCommitBranchBranchedFrom(GitVersion.Git.IBranch? branch, GitVersion.Configuration.IGitVersionConfiguration! configuration, params GitVersion.Git.IBranch![]! excludedBranches) -> GitVersion.Git.BranchCommit
+GitVersion.Common.IRepositoryStore.FindCommitBranchesBranchedFrom(GitVersion.Git.IBranch! branch, GitVersion.Configuration.IGitVersionConfiguration! configuration, params GitVersion.Git.IBranch![]! excludedBranches) -> System.Collections.Generic.IEnumerable<GitVersion.Git.BranchCommit>!
+GitVersion.Common.IRepositoryStore.FindCommitBranchesBranchedFrom(GitVersion.Git.IBranch! branch, GitVersion.Configuration.IGitVersionConfiguration! configuration, System.Collections.Generic.IEnumerable<GitVersion.Git.IBranch!>! excludedBranches) -> System.Collections.Generic.IEnumerable<GitVersion.Git.BranchCommit>!
 GitVersion.Common.IRepositoryStore.FindMergeBase(GitVersion.Git.IBranch? branch, GitVersion.Git.IBranch? otherBranch) -> GitVersion.Git.ICommit?
 GitVersion.Common.IRepositoryStore.FindMergeBase(GitVersion.Git.ICommit! commit, GitVersion.Git.ICommit! mainlineTip) -> GitVersion.Git.ICommit?
 GitVersion.Common.IRepositoryStore.GetBranchesContainingCommit(GitVersion.Git.ICommit! commit, System.Collections.Generic.IEnumerable<GitVersion.Git.IBranch!>? branches = null, bool onlyTrackedBranches = false) -> System.Collections.Generic.IEnumerable<GitVersion.Git.IBranch!>!
@@ -829,4 +829,4 @@ static readonly GitVersion.Git.BranchCommit.Empty -> GitVersion.Git.BranchCommit
 static readonly GitVersion.Helpers.Disposable.Empty -> System.IDisposable!
 static readonly GitVersion.SemanticVersion.Empty -> GitVersion.SemanticVersion!
 static readonly GitVersion.SemanticVersionBuildMetaData.Empty -> GitVersion.SemanticVersionBuildMetaData!
-static readonly GitVersion.SemanticVersionPreReleaseTag.Empty -> GitVersion.SemanticVersionPreReleaseTag!
+static readonly GitVersion.SemanticVersionPreReleaseTag.Empty -> GitVersion.SemanticVersionPreReleaseTag!
diff --git a/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/TrunkBasedVersionStrategy.cs b/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/TrunkBasedVersionStrategy.cs
@@ -230,7 +230,7 @@ private IReadOnlyDictionary<ICommit, EffectiveBranchConfiguration> GetCommitsWas
         var branch = repositoryStore.FindBranch(branchName);
         if (branch is null) return result;
 
-        var branchCommits = repositoryStore.FindCommitBranchesWasBranchedFrom(
+        var branchCommits = repositoryStore.FindCommitBranchesBranchedFrom(
             branch, Context.Configuration
         ).ToList();
 
diff --git a/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/VersionInBranchNameVersionStrategy.cs b/src/GitVersion.Core/VersionCalculation/VersionSearchStrategies/VersionInBranchNameVersionStrategy.cs
@@ -40,7 +40,7 @@ public bool TryGetBaseVersion(EffectiveBranchConfiguration configuration, [NotNu
             return false;
 
         Lazy<BranchCommit> commitBranchWasBranchedFrom = new(
-            () => this.repositoryStore.FindCommitBranchWasBranchedFrom(configuration.Branch, Context.Configuration)
+            () => this.repositoryStore.FindCommitBranchBranchedFrom(configuration.Branch, Context.Configuration)
         );
         foreach (var branch in new[] { Context.CurrentBranch, configuration.Branch })
         {

Original file line number	Diff line number	Diff line change
`@@ -227,10 +227,10 @@ public void FindCommitBranchWasBranchedFromShouldReturnNullIfTheRemoteIsTheOnlyS`
`227`	`227`	`branch.ShouldNotBeNull();`
`228`	`228`
`229`	`229`	`var configuration = GitFlowConfigurationBuilder.New.Build();`
`230`		`- var branchedCommit = gitRepoMetadataProvider.FindCommitBranchWasBranchedFrom(branch, configuration, []);`
	`230`	`+ var branchedCommit = gitRepoMetadataProvider.FindCommitBranchBranchedFrom(branch, configuration, []);`
`231`	`231`	`branchedCommit.ShouldBe(BranchCommit.Empty);`
`232`	`232`
`233`		`- var branchedCommits = gitRepoMetadataProvider.FindCommitBranchesWasBranchedFrom(branch, configuration).ToArray();`
	`233`	`+ var branchedCommits = gitRepoMetadataProvider.FindCommitBranchesBranchedFrom(branch, configuration).ToArray();`
`234`	`234`	`branchedCommits.ShouldBeEmpty();`
`235`	`235`	`}`
`236`	`236`	`}`
Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ public void FeatureOnHotfixFeatureBranchDeleted()`
`162`	`162`	`fixture.Checkout(hotfix451);`
`163`	`163`	`fixture.MergeNoFF(featureBranch); // commit 2`
`164`	`164`	`fixture.Repository.Branches.Remove(featureBranch);`
`165`		`- fixture.AssertFullSemver("4.5.1-beta.1+3", configuration);`
	`165`	`+ fixture.AssertFullSemver("4.5.1-beta.1+4", configuration);`
`166`	`166`	`}`
`167`	`167`
`168`	`168`	`/// <summary>`
`@@ -208,7 +208,7 @@ public void FeatureOnHotfixFeatureBranchNotDeleted()`
`208`	`208`	`fixture.Checkout(hotfix451);`
`209`	`209`	`fixture.MergeNoFF(featureBranch); // commit 2`
`210`	`210`
`211`		`- fixture.AssertFullSemver("4.5.1-beta.1+3", configuration);`
	`211`	`+ fixture.AssertFullSemver("4.5.1-beta.1+4", configuration);`
`212`	`212`	`}`
`213`	`213`
`214`	`214`	`[Test]`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ public BranchCommit BranchOrigin(IBranch branch)`
`83`	`83`	`return mergeBase;`
`84`	`84`	`}`
`85`	`85`
`86`		`- var branchCommit = this.repositoryStore.FindCommitBranchWasBranchedFrom(branch, this.configuration);`
	`86`	`+ var branchCommit = this.repositoryStore.FindCommitBranchBranchedFrom(branch, this.configuration);`
`87`	`87`	`if (branchCommit != BranchCommit.Empty)`
`88`	`88`	`{`
`89`	`89`	`this.log.Info($"Found parent commit {branchCommit.Commit.Sha} for '{branchName}'.");`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public bool TryGetBaseVersion(EffectiveBranchConfiguration configuration, [NotNu`
`40`	`40`	`return false;`
`41`	`41`
`42`	`42`	`Lazy<BranchCommit> commitBranchWasBranchedFrom = new(`
`43`		`- () => this.repositoryStore.FindCommitBranchWasBranchedFrom(configuration.Branch, Context.Configuration)`
	`43`	`+ () => this.repositoryStore.FindCommitBranchBranchedFrom(configuration.Branch, Context.Configuration)`
`44`	`44`	`);`
`45`	`45`	`foreach (var branch in new[] { Context.CurrentBranch, configuration.Branch })`
`46`	`46`	`{`