Name FindCommitBranchWasBranchedFrom to FindCommitBranchBranchedFrom

HHobeck · HHobeck · commit 5765f74146f0 · 2024-04-16T17:49:37.000+02:00
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/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
@@ -113,7 +113,7 @@ public IEnumerable<IBranch> GetSourceBranches(
 
         var referenceLookup = this.repository.Refs.ToLookup(r => r.TargetIdentifier);
 
-        var commitBranches = FindCommitBranchesWasBranchedFrom(branch, configuration, excludedBranches).ToHashSet();
+        var commitBranches = FindCommitBranchesBranchedFrom(branch, configuration, excludedBranches).ToHashSet();
 
         var ignore = new HashSet<BranchCommit>();
         foreach (var commitBranch in commitBranches)
@@ -174,7 +174,7 @@ public IEnumerable<IBranch> GetSourceBranches(
     ///     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();
@@ -203,10 +203,12 @@ 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}'"))
         {
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
`@@ -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
`@@ -113,7 +113,7 @@ public IEnumerable<IBranch> GetSourceBranches(`
`113`	`113`
`114`	`114`	`var referenceLookup = this.repository.Refs.ToLookup(r => r.TargetIdentifier);`
`115`	`115`
`116`		`- var commitBranches = FindCommitBranchesWasBranchedFrom(branch, configuration, excludedBranches).ToHashSet();`
	`116`	`+ var commitBranches = FindCommitBranchesBranchedFrom(branch, configuration, excludedBranches).ToHashSet();`
`117`	`117`
`118`	`118`	`var ignore = new HashSet<BranchCommit>();`
`119`	`119`	`foreach (var commitBranch in commitBranches)`
`@@ -174,7 +174,7 @@ public IEnumerable<IBranch> GetSourceBranches(`
`174`	`174`	`/// Find the commit where the given branch was branched from another branch.`
`175`	`175`	`/// If there are multiple such commits and branches, tries to guess based on commit histories.`
`176`	`176`	`/// </summary>`
`177`		`- public BranchCommit FindCommitBranchWasBranchedFrom(IBranch? branch, IGitVersionConfiguration configuration,`
	`177`	`+ public BranchCommit FindCommitBranchBranchedFrom(IBranch? branch, IGitVersionConfiguration configuration,`
`178`	`178`	`params IBranch[] excludedBranches)`
`179`	`179`	`{`
`180`	`180`	`branch = branch.NotNull();`
`@@ -203,10 +203,12 @@ public BranchCommit FindCommitBranchWasBranchedFrom(IBranch? branch, IGitVersion`
`203`	`203`	`}`
`204`	`204`	`}`
`205`	`205`
`206`		`- public IEnumerable<BranchCommit> FindCommitBranchesWasBranchedFrom(IBranch branch, IGitVersionConfiguration configuration, params IBranch[] excludedBranches)`
`207`		`- => FindCommitBranchesWasBranchedFrom(branch, configuration, (IEnumerable<IBranch>)excludedBranches);`
	`206`	`+ public IEnumerable<BranchCommit> FindCommitBranchesBranchedFrom(`
	`207`	`+ IBranch branch, IGitVersionConfiguration configuration, params IBranch[] excludedBranches)`
	`208`	`+ => FindCommitBranchesBranchedFrom(branch, configuration, (IEnumerable<IBranch>)excludedBranches);`
`208`	`209`
`209`		`- public IEnumerable<BranchCommit> FindCommitBranchesWasBranchedFrom(IBranch branch, IGitVersionConfiguration configuration, IEnumerable<IBranch> excludedBranches)`
	`210`	`+ public IEnumerable<BranchCommit> FindCommitBranchesBranchedFrom(`
	`211`	`+ IBranch branch, IGitVersionConfiguration configuration, IEnumerable<IBranch> excludedBranches)`
`210`	`212`	`{`
`211`	`213`	`using (this.log.IndentLog($"Finding branches source of '{branch}'"))`
`212`	`214`	`{`
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`	`{`