Merge pull request #696 from JakeGinnivan/PerformanceFix

Performance fix

Author: JakeGinnivan

src/GitVersionCore.Tests/Helpers/GitTestExtensions.cs

@@ -8,9 +8,9 @@ public static class GitTestExtensions
 {
     static int pad = 1;
 
-    public static Commit MakeACommit(this IRepository repository)
+    public static Commit MakeACommit(this IRepository repository, string commitMessage = null)
     {
-        return CreateFileAndCommit(repository, Guid.NewGuid().ToString());
+        return CreateFileAndCommit(repository, Guid.NewGuid().ToString(), commitMessage);
     }
 
     public static void MergeNoFF(this IRepository repository, string branch)
@@ -33,7 +33,7 @@ public static Commit[] MakeCommits(this IRepository repository, int numCommitsTo
             .ToArray();
     }
 
-    public static Commit CreateFileAndCommit(this IRepository repository, string relativeFileName)
+    public static Commit CreateFileAndCommit(this IRepository repository, string relativeFileName, string commitMessage = null)
     {
         var randomFile = Path.Combine(repository.Info.WorkingDirectory, relativeFileName);
         if (File.Exists(randomFile))
@@ -47,7 +47,7 @@ public static Commit CreateFileAndCommit(this IRepository repository, string rel
 
         repository.Stage(randomFile);
 
-        return repository.Commit(string.Format("Test Commit for file '{0}'", relativeFileName),
+        return repository.Commit(string.Format("Test Commit for file '{0}' - {1}", relativeFileName, commitMessage),
             Constants.SignatureNow(), Constants.SignatureNow());
     }
 

src/GitVersionCore.Tests/IntegrationTests/VersionBumpingScenarios.cs

@@ -23,4 +23,22 @@ public void AppliedPrereleaseTagCausesBump()
             fixture.AssertFullSemver("1.0.0-pre.2+1");
         }
     }
+
+    [Test]
+    public void CanUseCommitMessagesToBumpVersion()
+    {
+        using (var fixture = new EmptyRepositoryFixture(new Config()))
+        {
+            fixture.Repository.MakeACommit();
+            fixture.MakeATaggedCommit("1.0.0");
+            fixture.Repository.MakeACommit("+semver:minor");
+
+            fixture.AssertFullSemver("1.1.0+1");
+
+            fixture.Repository.MakeACommit("+semver:major");
+
+            fixture.AssertFullSemver("2.0.0+2");
+        }
+
+    }
 }

src/GitVersionCore/IncrementStrategyFinder.cs

@@ -15,6 +15,7 @@ public enum CommitMessageIncrementMode
 
     public static class IncrementStrategyFinder
     {
+        private static List<Commit> intermediateCommitCache;
         public const string DefaultMajorPattern = @"\+semver:\s?(breaking|major)";
         public const string DefaultMinorPattern = @"\+semver:\s?(feature|minor)";
         public const string DefaultPatchPattern = @"\+semver:\s?(fix|patch)";
@@ -80,14 +81,28 @@ public static class IncrementStrategyFinder
 
         private static IEnumerable<Commit> GetIntermediateCommits(IRepository repo, Commit baseCommit, Commit headCommit)
         {
-            var filter = new CommitFilter
+            if (baseCommit == null) yield break;
+
+            if (intermediateCommitCache == null || intermediateCommitCache.LastOrDefault() != headCommit)
+            {
+                var filter = new CommitFilter
+                {
+                    Since = headCommit,
+                    SortBy = CommitSortStrategies.Topological | CommitSortStrategies.Reverse
+                };
+
+                intermediateCommitCache = repo.Commits.QueryBy(filter).ToList();
+            }
+
+            var found = false;
+            foreach (var commit in intermediateCommitCache)
             {
-                Since = headCommit,
-                Until = baseCommit,
-                SortBy = CommitSortStrategies.Topological | CommitSortStrategies.Reverse
-            };
+                if (commit.Sha == baseCommit.Sha)
+                    found = true;
 
-            return repo.Commits.QueryBy(filter);
+                if (found)
+                    yield return commit;
+            }
         }
 
         private static VersionField? FindIncrementFromMessage(string message, Regex major, Regex minor, Regex patch)