CommitCollection proxy

arturcic · arturcic · commit 4adf783d49ca · 2021-01-07T15:22:46.000+01:00
diff --git a/src/GitVersion.sln.DotSettings b/src/GitVersion.sln.DotSettings
@@ -573,4 +573,5 @@ II.2.12 &lt;HandlesEvent /&gt;&#xD;
 	
 	
 	<s:String x:Key="/Default/FilterSettingsManager/AttributeFilterXml/@EntryValue">&lt;data /&gt;</s:String>
-	<s:String x:Key="/Default/FilterSettingsManager/CoverageFilterXml/@EntryValue">&lt;data&gt;&lt;IncludeFilters /&gt;&lt;ExcludeFilters /&gt;&lt;/data&gt;</s:String></wpf:ResourceDictionary>
+	<s:String x:Key="/Default/FilterSettingsManager/CoverageFilterXml/@EntryValue">&lt;data&gt;&lt;IncludeFilters /&gt;&lt;ExcludeFilters /&gt;&lt;/data&gt;</s:String>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Reacheable/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
diff --git a/src/GitVersionCore.Tests/Extensions/GitToolsTestingExtensions.cs b/src/GitVersionCore.Tests/Extensions/GitToolsTestingExtensions.cs
@@ -61,8 +61,8 @@ public static VersionVariables GetVersion(this RepositoryFixtureBase fixture, Co
 
             try
             {
-                var executeGitVersion = nextVersionCalculator.FindVersion();
-                var variables = variableProvider.GetVariablesFor(executeGitVersion, context.Configuration, context.IsCurrentCommitTagged);
+                var semanticVersion = nextVersionCalculator.FindVersion();
+                var variables = variableProvider.GetVariablesFor(semanticVersion, context.Configuration, context.IsCurrentCommitTagged);
 
                 return variables;
             }
diff --git a/src/GitVersionCore.Tests/Mocks/MockBranch.cs b/src/GitVersionCore.Tests/Mocks/MockBranch.cs
@@ -1,6 +1,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
+using GitVersion;
 using LibGit2Sharp;
 using Branch = GitVersion.Branch;
 
@@ -24,10 +25,10 @@ public MockBranch()
 
         }
 
-        private readonly MockCommitLog commits = new MockCommitLog();
+        private readonly MockCommitCollection commits = new MockCommitCollection();
         private readonly string friendlyName;
         public override string FriendlyName => friendlyName;
-        public override ICommitLog Commits => commits;
+        public override CommitCollection Commits => commits;
         public override Commit Tip => commits.First();
         public override bool IsTracking => true;
         public override bool IsRemote => false;
diff --git a/src/GitVersionCore.Tests/Mocks/MockCommitCollection.cs b/src/GitVersionCore.Tests/Mocks/MockCommitCollection.cs
@@ -1,27 +1,22 @@
-using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
+using GitVersion;
 using LibGit2Sharp;
 
 namespace GitVersionCore.Tests.Mocks
 {
-    public class MockCommitLog : ICommitLog
+    public class MockCommitCollection : CommitCollection
     {
         private List<Commit> Commits = new List<Commit>();
 
-        public IEnumerator<Commit> GetEnumerator()
+        public override IEnumerator<Commit> GetEnumerator()
         {
             if (SortedBy == CommitSortStrategies.Reverse)
                 return Commits.GetEnumerator();
 
             return Enumerable.Reverse(Commits).GetEnumerator();
         }
 
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
-
         public CommitSortStrategies SortedBy { get; set; }
         public void Add(Commit item)
         {
@@ -33,7 +28,6 @@ public void Clear()
             Commits.Clear();
         }
 
-
         public bool Contains(Commit item)
         {
             return Commits.Contains(item);
@@ -52,5 +46,10 @@ public bool Remove(Commit item)
         public int Count => Commits.Count;
 
         public bool IsReadOnly => false;
+
+        public override CommitCollection QueryBy(CommitFilter commitFilter)
+        {
+            return this;
+        }
     }
 }
diff --git a/src/GitVersionCore.Tests/Mocks/MockQueryableCommitLog.cs b/src/GitVersionCore.Tests/Mocks/MockQueryableCommitLog.cs
diff --git a/src/GitVersionCore.Tests/Mocks/MockRepository.cs b/src/GitVersionCore.Tests/Mocks/MockRepository.cs
@@ -10,7 +10,7 @@ namespace GitVersionCore.Tests.Mocks
 {
     public class MockRepository : IGitRepository
     {
-        private IQueryableCommitLog commits;
+        private CommitCollection commits;
 
         public MockRepository()
         {
@@ -26,9 +26,9 @@ public void Dispose()
         public Branch Head { get; set; }
         public ReferenceCollection Refs { get; set; }
 
-        public IQueryableCommitLog Commits
+        public CommitCollection Commits
         {
-            get => commits ?? new MockQueryableCommitLog(Head.Commits);
+            get => commits ?? Head.Commits;
             set => commits = value;
         }
 
diff --git a/src/GitVersionCore/Core/Abstractions/IGitRepository.cs b/src/GitVersionCore/Core/Abstractions/IGitRepository.cs
@@ -7,8 +7,8 @@ public interface IGitRepository : IDisposable
     {
         IGitRepositoryCommands Commands { get; }
         ObjectDatabase ObjectDatabase { get; }
-        IQueryableCommitLog Commits { get; }
         Branch Head { get; }
+        CommitCollection Commits { get; }
         BranchCollection Branches { get; }
         TagCollection Tags { get; }
         ReferenceCollection Refs { get; }
diff --git a/src/GitVersionCore/Core/Abstractions/IRepositoryMetadataProvider.cs b/src/GitVersionCore/Core/Abstractions/IRepositoryMetadataProvider.cs
@@ -39,7 +39,7 @@ public interface IRepositoryMetadataProvider
         IEnumerable<SemanticVersion> GetVersionTagsOnBranch(Branch branch, string tagPrefixRegex);
         IEnumerable<Tuple<Tag, SemanticVersion>> GetValidVersionTags(string tagPrefixRegex, DateTimeOffset? olderThan = null);
 
-        ICommitLog GetCommitLog(Commit baseVersionSource, Commit currentCommit);
+        CommitCollection GetCommitLog(Commit baseVersionSource, Commit currentCommit);
         bool GetMatchingCommitBranch(Commit baseVersionSource, Branch branch, Commit firstMatchingCommit);
         string ShortenObjectId(GitObject commit);
         VersionField? DetermineIncrementedField(BaseVersion baseVersion, GitVersionContext context);
diff --git a/src/GitVersionCore/Core/GitModel.cs b/src/GitVersionCore/Core/GitModel.cs
@@ -25,7 +25,7 @@ protected Branch()
         public virtual string FriendlyName => innerBranch.FriendlyName;
         public virtual Commit Tip => innerBranch.Tip;
         public virtual bool IsRemote => innerBranch.IsRemote;
-        public virtual ICommitLog Commits => innerBranch.Commits;
+        public virtual CommitCollection Commits => CommitCollection.FromCommitLog(innerBranch.Commits);
         public virtual bool IsTracking => innerBranch.IsTracking;
     }
 
@@ -135,4 +135,32 @@ public virtual IEnumerable<Reference> FromGlob(string pattern)
             return innerReferenceCollection.FromGlob(pattern);
         }
     }
+
+    public class CommitCollection : IEnumerable<Commit>
+    {
+        private readonly ICommitLog innerCommitCollection;
+        private CommitCollection(ICommitLog branchCollection) => innerCommitCollection = branchCollection;
+
+        protected CommitCollection()
+        {
+        }
+
+        public static ICommitLog ToCommitLog(CommitCollection d) => d.innerCommitCollection;
+
+        public static CommitCollection FromCommitLog(ICommitLog b) => b is null ? null : new CommitCollection(b);
+
+        public virtual IEnumerator<Commit> GetEnumerator()
+        {
+            foreach (var branch in innerCommitCollection)
+                yield return branch;
+        }
+
+        IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+
+        public virtual CommitCollection QueryBy(CommitFilter commitFilter)
+        {
+            var commitLog = ((IQueryableCommitLog) innerCommitCollection).QueryBy(commitFilter);
+            return FromCommitLog(commitLog);
+        }
+    }
 }
diff --git a/src/GitVersionCore/Core/GitRepository.cs b/src/GitVersionCore/Core/GitRepository.cs
@@ -38,7 +38,7 @@ public void Dispose()
 
         public ReferenceCollection Refs => (ReferenceCollection)repositoryInstance.Refs;
 
-        public IQueryableCommitLog Commits => repositoryInstance.Commits;
+        public CommitCollection Commits => CommitCollection.FromCommitLog(repositoryInstance.Commits);
 
         public BranchCollection Branches => (BranchCollection)repositoryInstance.Branches;
 
diff --git a/src/GitVersionCore/Core/RepositoryMetadataProvider.cs b/src/GitVersionCore/Core/RepositoryMetadataProvider.cs
@@ -406,7 +406,7 @@ public IEnumerable<Tuple<Tag, SemanticVersion>> GetValidVersionTags(string tagPr
         }
 
 
-        public ICommitLog GetCommitLog(Commit baseVersionSource, Commit currentCommit)
+        public CommitCollection GetCommitLog(Commit baseVersionSource, Commit currentCommit)
         {
             var filter = new CommitFilter
             {
@@ -415,7 +415,8 @@ public ICommitLog GetCommitLog(Commit baseVersionSource, Commit currentCommit)
                 SortBy = CommitSortStrategies.Topological | CommitSortStrategies.Time
             };
 
-            return repository.Commits.QueryBy(filter);
+            var commits = repository.Commits;
+            return commits.QueryBy(filter);
         }
 
         public bool GetMatchingCommitBranch(Commit baseVersionSource, Branch branch, Commit firstMatchingCommit)
diff --git a/src/GitVersionCore/VersionCalculation/IncrementStrategyFinder.cs b/src/GitVersionCore/VersionCalculation/IncrementStrategyFinder.cs
@@ -2,8 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
-using GitVersion.Configuration;
-using GitVersion.Extensions;
 using GitVersion.VersionCalculation;
 using LibGit2Sharp;
 
@@ -57,17 +55,7 @@ public static class IncrementStrategyFinder
 
             return commitMessageIncrement;
         }
-        public static VersionField FindDefaultIncrementForBranch(GitVersionContext context, string branch = null)
-        {
-            var config = context.FullConfiguration.GetConfigForBranch(branch ?? context.CurrentBranch.NameWithoutRemote());
-            if (config?.Increment != null && config.Increment != IncrementStrategy.Inherit)
-            {
-                return config.Increment.Value.ToVersionField();
-            }
 
-            // Fallback to patch
-            return VersionField.Patch;
-        }
         public static VersionField? GetIncrementForCommits(GitVersionContext context, IEnumerable<Commit> commits)
         {
             var majorRegex = TryGetRegexOrDefault(context.Configuration.MajorVersionBumpMessage, DefaultMajorPatternRegex);
diff --git a/src/GitVersionCore/VersionCalculation/MainlineVersionCalculator.cs b/src/GitVersionCore/VersionCalculation/MainlineVersionCalculator.cs
@@ -69,6 +69,7 @@ public SemanticVersion FindMainlineModeVersion(BaseVersion baseVersion)
                     // This will increment for any direct commits on mainline
                     mainlineVersion = IncrementForEachCommit(directCommits, mainlineVersion, mainline);
                 }
+
                 mainlineVersion.BuildMetaData = CreateVersionBuildMetaData(mergeBase);
 
                 // branches other than master always get a bump for the act of branching
@@ -102,7 +103,6 @@ public SemanticVersionBuildMetaData CreateVersionBuildMetaData(Commit baseVersio
         }
 
 
-
         private SemanticVersion AggregateMergeCommitIncrement(Commit commit, List<Commit> directCommits, SemanticVersion mainlineVersion, Branch mainline)
         {
             // Merge commit, process all merged commits as a batch
@@ -230,13 +230,12 @@ private SemanticVersion IncrementForEachCommit(IEnumerable<Commit> directCommits
         {
             foreach (var directCommit in directCommits)
             {
-                var directCommitIncrement = IncrementStrategyFinder.GetIncrementForCommits(context, new[]
-                                            {
-                                                directCommit
-                                            }) ?? IncrementStrategyFinder.FindDefaultIncrementForBranch(context, mainline.FriendlyName);
+                var directCommitIncrement = IncrementStrategyFinder.GetIncrementForCommits(context, new[] { directCommit })
+                                            ?? FindDefaultIncrementForBranch(context, mainline.FriendlyName);
                 mainlineVersion = mainlineVersion.IncrementVersion(directCommitIncrement);
                 log.Info($"Direct commit on master {directCommit.Sha} incremented base versions {directCommitIncrement}, now {mainlineVersion}");
             }
+
             return mainlineVersion;
         }
 
@@ -245,7 +244,7 @@ private VersionField FindMessageIncrement(Commit mergeCommit, Commit mergedHead,
             var commits = repositoryMetadataProvider.GetMergeBaseCommits(mergeCommit, mergedHead, findMergeBase);
             commitLog.RemoveAll(c => commits.Any(c1 => c1.Sha == c.Sha));
             return IncrementStrategyFinder.GetIncrementForCommits(context, commits)
-                ?? TryFindIncrementFromMergeMessage(mergeCommit);
+                   ?? TryFindIncrementFromMergeMessage(mergeCommit);
         }
 
         private VersionField TryFindIncrementFromMergeMessage(Commit mergeCommit)
@@ -264,7 +263,19 @@ private VersionField TryFindIncrementFromMergeMessage(Commit mergeCommit)
             }
 
             // Fallback to config increment value
-            return IncrementStrategyFinder.FindDefaultIncrementForBranch(context);
+            return FindDefaultIncrementForBranch(context);
+        }
+
+        private static VersionField FindDefaultIncrementForBranch(GitVersionContext context, string branch = null)
+        {
+            var config = context.FullConfiguration.GetConfigForBranch(branch ?? context.CurrentBranch.NameWithoutRemote());
+            if (config?.Increment != null && config.Increment != IncrementStrategy.Inherit)
+            {
+                return config.Increment.Value.ToVersionField();
+            }
+
+            // Fallback to patch
+            return VersionField.Patch;
         }
 
         private static Commit GetMergedHead(Commit mergeCommit)

Original file line number	Diff line number	Diff line change
`@@ -61,8 +61,8 @@ public static VersionVariables GetVersion(this RepositoryFixtureBase fixture, Co`
`61`	`61`
`62`	`62`	`try`
`63`	`63`	`{`
`64`		`- var executeGitVersion = nextVersionCalculator.FindVersion();`
`65`		`- var variables = variableProvider.GetVariablesFor(executeGitVersion, context.Configuration, context.IsCurrentCommitTagged);`
	`64`	`+ var semanticVersion = nextVersionCalculator.FindVersion();`
	`65`	`+ var variables = variableProvider.GetVariablesFor(semanticVersion, context.Configuration, context.IsCurrentCommitTagged);`
`66`	`66`
`67`	`67`	`return variables;`
`68`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,27 +1,22 @@`
`1`		`-using System.Collections;`
`2`	`1`	`using System.Collections.Generic;`
`3`	`2`	`using System.Linq;`
	`3`	`+using GitVersion;`
`4`	`4`	`using LibGit2Sharp;`
`5`	`5`
`6`	`6`	`namespace GitVersionCore.Tests.Mocks`
`7`	`7`	`{`
`8`		`- public class MockCommitLog : ICommitLog`
	`8`	`+ public class MockCommitCollection : CommitCollection`
`9`	`9`	`{`
`10`	`10`	`private List<Commit> Commits = new List<Commit>();`
`11`	`11`
`12`		`- public IEnumerator<Commit> GetEnumerator()`
	`12`	`+ public override IEnumerator<Commit> GetEnumerator()`
`13`	`13`	`{`
`14`	`14`	`if (SortedBy == CommitSortStrategies.Reverse)`
`15`	`15`	`return Commits.GetEnumerator();`
`16`	`16`
`17`	`17`	`return Enumerable.Reverse(Commits).GetEnumerator();`
`18`	`18`	`}`
`19`	`19`
`20`		`- IEnumerator IEnumerable.GetEnumerator()`
`21`		`- {`
`22`		`- return GetEnumerator();`
`23`		`- }`
`24`		`-`
`25`	`20`	`public CommitSortStrategies SortedBy { get; set; }`
`26`	`21`	`public void Add(Commit item)`
`27`	`22`	`{`
`@@ -33,7 +28,6 @@ public void Clear()`
`33`	`28`	`Commits.Clear();`
`34`	`29`	`}`
`35`	`30`
`36`		`-`
`37`	`31`	`public bool Contains(Commit item)`
`38`	`32`	`{`
`39`	`33`	`return Commits.Contains(item);`
`@@ -52,5 +46,10 @@ public bool Remove(Commit item)`
`52`	`46`	`public int Count => Commits.Count;`
`53`	`47`
`54`	`48`	`public bool IsReadOnly => false;`
	`49`	`+`
	`50`	`+ public override CommitCollection QueryBy(CommitFilter commitFilter)`
	`51`	`+ {`
	`52`	`+ return this;`
	`53`	`+ }`
`55`	`54`	`}`
`56`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ namespace GitVersionCore.Tests.Mocks`
`10`	`10`	`{`
`11`	`11`	`public class MockRepository : IGitRepository`
`12`	`12`	`{`
`13`		`- private IQueryableCommitLog commits;`
	`13`	`+ private CommitCollection commits;`
`14`	`14`
`15`	`15`	`public MockRepository()`
`16`	`16`	`{`
`@@ -26,9 +26,9 @@ public void Dispose()`
`26`	`26`	`public Branch Head { get; set; }`
`27`	`27`	`public ReferenceCollection Refs { get; set; }`
`28`	`28`
`29`		`- public IQueryableCommitLog Commits`
	`29`	`+ public CommitCollection Commits`
`30`	`30`	`{`
`31`		`- get => commits ?? new MockQueryableCommitLog(Head.Commits);`
	`31`	`+ get => commits ?? Head.Commits;`
`32`	`32`	`set => commits = value;`
`33`	`33`	`}`
`34`	`34`