Merge pull request #2379 from kcaswick/issue-1

Reproduce 'Sequence contains no matching element' error

Author: asbjornu

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

@@ -5,6 +5,7 @@
 using GitVersion.VersionCalculation;
 using LibGit2Sharp;
 using NUnit.Framework;
+using Shouldly;
 
 namespace GitVersion.Core.Tests.IntegrationTests;
 
@@ -537,6 +538,32 @@ public void BranchWithoutMergeBaseMainlineBranchIsFound()
         fixture.AssertFullSemver("0.1.3-issue-branch.1", currentConfig);
     }
 
+    [Test]
+    public void GivenARemoteGitRepositoryWithCommitsThenClonedLocalDevelopShouldMatchRemoteVersion()
+    {
+        using var fixture = new RemoteRepositoryFixture();
+        fixture.AssertFullSemver("0.1.4", config);
+        fixture.BranchTo("develop");
+        fixture.AssertFullSemver("0.2.0-alpha.0", config);
+        Console.WriteLine(fixture.SequenceDiagram.GetDiagram());
+        var local = fixture.CloneRepository();
+        fixture.AssertFullSemver("0.2.0-alpha.0", config, repository: local.Repository);
+        local.Repository.DumpGraph();
+    }
+
+    [Test]
+    public void GivenNoMainThrowsWarning()
+    {
+        using var fixture = new EmptyRepositoryFixture();
+        fixture.Repository.MakeACommit();
+        fixture.Repository.MakeATaggedCommit("1.0.0");
+        fixture.Repository.MakeACommit();
+        Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("develop"));
+        fixture.Repository.Branches.Remove(fixture.Repository.Branches["main"]);
+
+        var exception = Assert.Throws<WarningException>(() => fixture.AssertFullSemver("1.1.0-alpha.1", config));
+        exception!.Message.ShouldMatch("No branches can be found matching the commit .* in the configured Mainline branches: main, support");
+    }
 }
 
 internal static class CommitExtensions

src/GitVersion.Core/Core/RepositoryStore.cs

@@ -295,14 +295,50 @@ static IEnumerable<IBranch> InnerGetBranchesContainingCommit(ICommit commit, IEn
 
     public Dictionary<string, List<IBranch>> GetMainlineBranches(ICommit commit, IEnumerable<KeyValuePair<string, BranchConfig?>>? mainlineBranchConfigs) =>
         this.repository.Branches
-            .Where(b => mainlineBranchConfigs?.Any(c => c.Value?.Regex != null && Regex.IsMatch(b.Name.Friendly, c.Value.Regex)) == true)
+            .Where(b => BranchIsMainline(b, mainlineBranchConfigs))
             .Select(b => new { Origin = FindBranchOrigin(b, commit), Branch = b })
-            .Where(a => a.Origin != null)
-            .GroupBy(b => b.Origin?.Sha, b => b.Branch)
-            .ToDictionary(b => b.Key, b => b.ToList());
+            .Where(x => x.Origin is not null)
+            .GroupBy(x => x.Origin!.Sha, a => a.Branch)
+            .ToDictionary(x => x.Key, x => x.ToList());
+
+    private bool BranchIsMainline(INamedReference branch, IEnumerable<KeyValuePair<string, BranchConfig?>>? mainlineBranchConfigs) =>
+        mainlineBranchConfigs?.Any(c => BranchMatchesMainlineConfig(branch, c)) == true;
+
+    private bool BranchMatchesMainlineConfig(INamedReference branch, KeyValuePair<string, BranchConfig?> mainlineBranchConfig)
+    {
+        if (mainlineBranchConfig.Value?.Regex == null)
+        {
+            return false;
+        }
+
+        var mainlineRegex = mainlineBranchConfig.Value.Regex;
+        var branchName = branch.Name.WithoutRemote;
+        var match = Regex.IsMatch(branchName, mainlineRegex);
+        this.log.Info($"'{mainlineRegex}' {(match ? "matches" : "does not match")} '{branchName}'.");
+        return match;
+    }
+
+    private ICommit? FindBranchOrigin(IBranch branch, ICommit commit)
+    {
+        var branchName = branch.Name.Friendly;
+        var mergeBase = FindMergeBase(branch.Tip!, commit);
+        if (mergeBase is not null)
+        {
+            this.log.Info($"Found merge base {mergeBase.Sha} for '{branchName}'.");
+            return mergeBase;
+        }
+
+        var branchCommit = FindCommitBranchWasBranchedFrom(branch, null);
+        if (branchCommit != BranchCommit.Empty)
+        {
+            this.log.Info($"Found parent commit {branchCommit.Commit.Sha} for '{branchName}'.");
+            return branchCommit.Commit;
+        }
+
+        this.log.Info($"Found no merge base or parent commit for '{branchName}'.");
+        return null;
+    }
 
-    private ICommit FindBranchOrigin(IBranch branch, ICommit commit) =>
-        FindMergeBase(branch.Tip!, commit) ?? FindCommitBranchWasBranchedFrom(branch, null).Commit;
 
 
     /// <summary>

src/GitVersion.Core/VersionCalculation/MainlineVersionCalculator.cs

@@ -128,7 +128,8 @@ private IBranch GetMainline(ICommit? baseVersionSource)
 
         if (!mainlineBranches.Any())
         {
-            throw new WarningException("No mainline branches found!");
+            var mainlineBranchConfigsString = string.Join(", ", mainlineBranchConfigs.Select(b => b.Value.Name));
+            throw new WarningException($"No branches can be found matching the commit {context.CurrentCommit?.Sha} in the configured Mainline branches: {mainlineBranchConfigsString}");
         }
 
         var mainlineBranchNames = mainlineBranches.Values.SelectMany(branches => branches.Select(b => b.Name.Friendly));