Commit proxy

arturcic · arturcic · commit b5492cdc4db6 · 2021-01-07T15:22:46.000+01:00
diff --git a/src/GitVersionCore.Tests/Core/RepositoryExtensionsTests.cs b/src/GitVersionCore.Tests/Core/RepositoryExtensionsTests.cs
@@ -8,6 +8,7 @@
 using LibGit2Sharp;
 using NSubstitute;
 using NUnit.Framework;
+using Commit = GitVersion.Commit;
 using Branch = GitVersion.Branch;
 using BranchCollection = GitVersion.BranchCollection;
 using ReferenceCollection = GitVersion.ReferenceCollection;
diff --git a/src/GitVersionCore.Tests/IntegrationTests/IgnoreBeforeScenarios.cs b/src/GitVersionCore.Tests/IntegrationTests/IgnoreBeforeScenarios.cs
@@ -1,4 +1,5 @@
 using GitTools.Testing;
+using GitVersion;
 using GitVersion.Configuration;
 using GitVersion.Extensions;
 using GitVersion.Model.Configuration;
@@ -14,7 +15,7 @@ public class IgnoreBeforeScenarios : TestBase
         public void ShouldFallbackToBaseVersionWhenAllCommitsAreIgnored()
         {
             using var fixture = new EmptyRepositoryFixture();
-            var commit = fixture.Repository.MakeACommit();
+            var commit = (Commit)fixture.Repository.MakeACommit();
 
             var config = new ConfigurationBuilder()
                 .Add(new Config
diff --git a/src/GitVersionCore.Tests/Mocks/MockBranch.cs b/src/GitVersionCore.Tests/Mocks/MockBranch.cs
@@ -2,8 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using GitVersion;
-using LibGit2Sharp;
 using Branch = GitVersion.Branch;
+using Commit = GitVersion.Commit;
 
 namespace GitVersionCore.Tests.Mocks
 {
diff --git a/src/GitVersionCore.Tests/Mocks/MockCommit.cs b/src/GitVersionCore.Tests/Mocks/MockCommit.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using LibGit2Sharp;
+using Commit = GitVersion.Commit;
 
 namespace GitVersionCore.Tests.Mocks
 {
diff --git a/src/GitVersionCore.Tests/Mocks/MockCommitCollection.cs b/src/GitVersionCore.Tests/Mocks/MockCommitCollection.cs
@@ -2,6 +2,7 @@
 using System.Linq;
 using GitVersion;
 using LibGit2Sharp;
+using Commit = GitVersion.Commit;
 
 namespace GitVersionCore.Tests.Mocks
 {
diff --git a/src/GitVersionCore.Tests/VersionCalculation/BaseVersionCalculatorTests.cs b/src/GitVersionCore.Tests/VersionCalculation/BaseVersionCalculatorTests.cs
@@ -7,11 +7,11 @@
 using GitVersion.VersionCalculation;
 using GitVersionCore.Tests.Helpers;
 using GitVersionCore.Tests.Mocks;
-using LibGit2Sharp;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using NUnit.Framework;
 using Shouldly;
+using Commit = GitVersion.Commit;
 
 namespace GitVersionCore.Tests.VersionCalculation
 {
diff --git a/src/GitVersionCore.Tests/VersionCalculation/Strategies/MergeMessageBaseVersionStrategyTests.cs b/src/GitVersionCore.Tests/VersionCalculation/Strategies/MergeMessageBaseVersionStrategyTests.cs
@@ -1,11 +1,11 @@
 using System.Collections.Generic;
 using System.Linq;
+using GitVersion;
 using GitVersion.Extensions;
 using GitVersion.Model.Configuration;
 using GitVersion.VersionCalculation;
 using GitVersionCore.Tests.Helpers;
 using GitVersionCore.Tests.Mocks;
-using LibGit2Sharp;
 using NUnit.Framework;
 using Shouldly;
 
diff --git a/src/GitVersionCore.Tests/VersionCalculation/TestBaseVersionCalculator.cs b/src/GitVersionCore.Tests/VersionCalculation/TestBaseVersionCalculator.cs
@@ -1,6 +1,6 @@
 using GitVersion;
 using GitVersion.VersionCalculation;
-using LibGit2Sharp;
+using Commit = GitVersion.Commit;
 
 namespace GitVersionCore.Tests.VersionCalculation
 {
diff --git a/src/GitVersionCore.Tests/VersionCalculation/TestMainlineVersionCalculator.cs b/src/GitVersionCore.Tests/VersionCalculation/TestMainlineVersionCalculator.cs
@@ -1,6 +1,6 @@
 using GitVersion;
 using GitVersion.VersionCalculation;
-using LibGit2Sharp;
+using Commit = GitVersion.Commit;
 
 namespace GitVersionCore.Tests.VersionCalculation
 {
diff --git a/src/GitVersionCore/Configuration/Abstractions/IBranchConfigurationCalculator.cs b/src/GitVersionCore/Configuration/Abstractions/IBranchConfigurationCalculator.cs
@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using GitVersion.Model.Configuration;
-using LibGit2Sharp;
 
 namespace GitVersion.Configuration
 {
diff --git a/src/GitVersionCore/Configuration/BranchConfigurationCalculator.cs b/src/GitVersionCore/Configuration/BranchConfigurationCalculator.cs
@@ -6,7 +6,6 @@
 using GitVersion.Extensions;
 using GitVersion.Logging;
 using GitVersion.Model.Configuration;
-using LibGit2Sharp;
 
 namespace GitVersion.Configuration
 {
diff --git a/src/GitVersionCore/Core/GitModel.cs b/src/GitVersionCore/Core/GitModel.cs
@@ -1,10 +1,55 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using GitVersion.Helpers;
 using LibGit2Sharp;
 
 namespace GitVersion
 {
+    public class Commit
+    {
+        private static readonly LambdaEqualityHelper<Commit> equalityHelper =
+            new LambdaEqualityHelper<Commit>(x => x.Id);
+
+        private readonly LibGit2Sharp.Commit innerCommit;
+
+        private Commit(LibGit2Sharp.Commit commit)
+        {
+            innerCommit = commit;
+        }
+
+        protected Commit()
+        {
+        }
+
+        public override bool Equals(object obj) => Equals(obj as Commit);
+        private bool Equals(Commit other) => equalityHelper.Equals(this, other);
+
+        public override int GetHashCode() => equalityHelper.GetHashCode(this);
+        public static bool operator !=(Commit left, Commit right) => !Equals(left, right);
+        public static bool operator ==(Commit left, Commit right) => Equals(left, right);
+
+        public static implicit operator LibGit2Sharp.Commit(Commit d) => d?.innerCommit;
+        public static explicit operator Commit(LibGit2Sharp.Commit b) => b is null ? null : new Commit(b);
+
+        public virtual IEnumerable<Commit> Parents
+        {
+            get
+            {
+                if (innerCommit == null) yield return null;
+                else
+                    foreach (var parent in innerCommit.Parents)
+                        yield return (Commit)parent;
+            }
+        }
+
+        public virtual string Sha => innerCommit?.Sha;
+        public virtual ObjectId Id => innerCommit?.Id;
+        public virtual Signature Committer => innerCommit?.Committer;
+        public virtual string Message => innerCommit?.Message;
+        public virtual Tree Tree => innerCommit?.Tree;
+    }
+
     public class Branch
     {
         private readonly LibGit2Sharp.Branch innerBranch;
@@ -17,13 +62,12 @@ private Branch(LibGit2Sharp.Branch branch)
         protected Branch()
         {
         }
-
         public static implicit operator LibGit2Sharp.Branch(Branch d) => d?.innerBranch;
         public static explicit operator Branch(LibGit2Sharp.Branch b) => b is null ? null : new Branch(b);
 
         public virtual string CanonicalName => innerBranch?.CanonicalName;
         public virtual string FriendlyName => innerBranch?.FriendlyName;
-        public virtual Commit Tip => innerBranch?.Tip;
+        public virtual Commit Tip => (Commit)innerBranch?.Tip;
         public virtual CommitCollection Commits => CommitCollection.FromCommitLog(innerBranch?.Commits);
         public virtual bool IsRemote => innerBranch != null && innerBranch.IsRemote;
         public virtual bool IsTracking => innerBranch != null && innerBranch.IsTracking;
@@ -152,7 +196,7 @@ protected CommitCollection()
         public virtual IEnumerator<Commit> GetEnumerator()
         {
             foreach (var commit in innerCollection)
-                yield return commit;
+                yield return (Commit)commit;
         }
 
         IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
diff --git a/src/GitVersionCore/Core/RepositoryExtensions.cs b/src/GitVersionCore/Core/RepositoryExtensions.cs
@@ -11,7 +11,7 @@ public static bool GetMatchingCommitBranch(this IGitRepository repository, Commi
             var filter = new CommitFilter
             {
                 IncludeReachableFrom = (LibGit2Sharp.Branch)branch,
-                ExcludeReachableFrom = baseVersionSource,
+                ExcludeReachableFrom = (LibGit2Sharp.Commit)baseVersionSource,
                 FirstParentOnly = true,
             };
             var commitCollection = repository.Commits.QueryBy(filter);
@@ -34,7 +34,7 @@ public static List<Commit> GetCommitsReacheableFromHead(this IGitRepository repo
         {
             var filter = new CommitFilter
             {
-                IncludeReachableFrom = headCommit,
+                IncludeReachableFrom = (LibGit2Sharp.Commit)headCommit,
                 SortBy = CommitSortStrategies.Topological | CommitSortStrategies.Reverse
             };
 
@@ -47,8 +47,8 @@ public static Commit GetForwardMerge(this IGitRepository repository, Commit comm
         {
             var filter = new CommitFilter
             {
-                IncludeReachableFrom = commitToFindCommonBase,
-                ExcludeReachableFrom = findMergeBase
+                IncludeReachableFrom = (LibGit2Sharp.Commit)commitToFindCommonBase,
+                ExcludeReachableFrom = (LibGit2Sharp.Commit)findMergeBase
             };
             var commitCollection = repository.Commits.QueryBy(filter);
 
@@ -61,8 +61,8 @@ public static IEnumerable<Commit> GetMergeBaseCommits(this IGitRepository reposi
         {
             var filter = new CommitFilter
             {
-                IncludeReachableFrom = mergedHead,
-                ExcludeReachableFrom = findMergeBase
+                IncludeReachableFrom = (LibGit2Sharp.Commit)mergedHead,
+                ExcludeReachableFrom = (LibGit2Sharp.Commit)findMergeBase
             };
             var commitCollection = repository.Commits.QueryBy(filter);
 
@@ -76,7 +76,7 @@ public static Commit GetBaseVersionSource(this IGitRepository repository, Commit
         {
             var filter = new CommitFilter
             {
-                IncludeReachableFrom = currentBranchTip
+                IncludeReachableFrom = (LibGit2Sharp.Commit)currentBranchTip
             };
             var commitCollection = repository.Commits.QueryBy(filter);
 
@@ -88,8 +88,8 @@ public static List<Commit> GetMainlineCommitLog(this IGitRepository repository,
         {
             var filter = new CommitFilter
             {
-                IncludeReachableFrom = mainlineTip,
-                ExcludeReachableFrom = baseVersionSource,
+                IncludeReachableFrom = (LibGit2Sharp.Commit)mainlineTip,
+                ExcludeReachableFrom = (LibGit2Sharp.Commit)baseVersionSource,
                 SortBy = CommitSortStrategies.Reverse,
                 FirstParentOnly = true
             };
@@ -103,8 +103,8 @@ public static CommitCollection GetCommitLog(this IGitRepository repository, Comm
         {
             var filter = new CommitFilter
             {
-                IncludeReachableFrom = currentCommit,
-                ExcludeReachableFrom = baseVersionSource,
+                IncludeReachableFrom = (LibGit2Sharp.Commit)currentCommit,
+                ExcludeReachableFrom = (LibGit2Sharp.Commit)baseVersionSource,
                 SortBy = CommitSortStrategies.Topological | CommitSortStrategies.Time
             };
 
diff --git a/src/GitVersionCore/Core/RepositoryMetadataProvider.cs b/src/GitVersionCore/Core/RepositoryMetadataProvider.cs
@@ -51,7 +51,7 @@ public Commit FindMergeBase(Branch branch, Branch otherBranch)
                     commitToFindCommonBase = otherBranch.Tip.Parents.First();
                 }
 
-                var findMergeBase = repository.ObjectDatabase.FindMergeBase(commit, commitToFindCommonBase);
+                var findMergeBase = (Commit)repository.ObjectDatabase.FindMergeBase(commit, commitToFindCommonBase);
                 if (findMergeBase != null)
                 {
                     log.Info($"Found merge base of {findMergeBase.Sha}");
@@ -67,7 +67,7 @@ public Commit FindMergeBase(Branch branch, Branch otherBranch)
                             // TODO Fix the logging up in this section
                             var second = forwardMerge.Parents.First();
                             log.Debug("Second " + second.Sha);
-                            var mergeBase = repository.ObjectDatabase.FindMergeBase(commit, second);
+                            var mergeBase = (Commit)repository.ObjectDatabase.FindMergeBase(commit, second);
                             if (mergeBase == null)
                             {
                                 log.Warning("Could not find mergbase for " + commit);
@@ -98,7 +98,7 @@ public Commit FindMergeBase(Branch branch, Branch otherBranch)
 
         public Commit FindMergeBase(Commit commit, Commit mainlineTip)
         {
-            return repository.ObjectDatabase.FindMergeBase(commit, mainlineTip);
+            return (Commit)repository.ObjectDatabase.FindMergeBase(commit, mainlineTip);
         }
 
         public Commit GetCurrentCommit(Branch currentBranch, string commitId)
@@ -325,7 +325,7 @@ public SemanticVersion GetCurrentCommitTaggedVersion(Commit commit, EffectiveCon
             return repository.Tags
                 .SelectMany(t =>
                 {
-                    if (t.PeeledTarget() == commit && SemanticVersion.TryParse(t.FriendlyName, config.GitTagPrefix, out var version))
+                    if (t.PeeledTarget() is LibGit2Sharp.Commit targetCommit && targetCommit == commit && SemanticVersion.TryParse(t.FriendlyName, config.GitTagPrefix, out var version))
                         return new[]
                         {
                             version
@@ -366,7 +366,10 @@ public IEnumerable<Tuple<Tag, SemanticVersion>> GetValidVersionTags(string tagPr
 
             foreach (var tag in repository.Tags)
             {
-                if (!(tag.PeeledTarget() is Commit commit) || (olderThan.HasValue && commit.When() > olderThan.Value))
+                if (!(tag.PeeledTarget() is LibGit2Sharp.Commit commit))
+                    continue;
+
+                if (olderThan.HasValue && ((Commit)commit).When() > olderThan.Value)
                     continue;
 
                 if (SemanticVersion.TryParse(tag.FriendlyName, tagPrefixRegex, out var semver))
diff --git a/src/GitVersionCore/Model/BranchCommit.cs b/src/GitVersionCore/Model/BranchCommit.cs
@@ -1,5 +1,3 @@
-using LibGit2Sharp;
-
 namespace GitVersion
 {
     /// <summary>
diff --git a/src/GitVersionCore/Model/GitVersionContext.cs b/src/GitVersionCore/Model/GitVersionContext.cs
@@ -1,5 +1,4 @@
 using GitVersion.Model.Configuration;
-using LibGit2Sharp;
 
 namespace GitVersion
 {
diff --git a/src/GitVersionCore/VersionCalculation/Abstractions/IMainlineVersionCalculator.cs b/src/GitVersionCore/VersionCalculation/Abstractions/IMainlineVersionCalculator.cs
@@ -1,5 +1,3 @@
-using LibGit2Sharp;
-
 namespace GitVersion.VersionCalculation
 {
     public interface IMainlineVersionCalculator
diff --git a/src/GitVersionCore/VersionCalculation/BaseVersionCalculators/BaseVersion.cs b/src/GitVersionCore/VersionCalculation/BaseVersionCalculators/BaseVersion.cs
@@ -1,5 +1,3 @@
-using LibGit2Sharp;
-
 namespace GitVersion.VersionCalculation
 {
     public class BaseVersion
diff --git a/src/GitVersionCore/VersionCalculation/BaseVersionCalculators/MergeMessageVersionStrategy.cs b/src/GitVersionCore/VersionCalculation/BaseVersionCalculators/MergeMessageVersionStrategy.cs
@@ -5,7 +5,6 @@
 using GitVersion.Configuration;
 using GitVersion.Extensions;
 using GitVersion.Logging;
-using LibGit2Sharp;
 
 namespace GitVersion.VersionCalculation
 {
diff --git a/src/GitVersionCore/VersionCalculation/BaseVersionCalculators/TaggedCommitVersionStrategy.cs b/src/GitVersionCore/VersionCalculation/BaseVersionCalculators/TaggedCommitVersionStrategy.cs
@@ -35,8 +35,8 @@ internal IEnumerable<BaseVersion> GetTaggedVersions(Branch currentBranch, DateTi
                 .SelectMany(commit => { return allTags.Where(t => IsValidTag(t.Item1, commit)); })
                 .Select(t =>
                 {
-                    if (t.Item1.PeeledTarget() is Commit)
-                        return new VersionTaggedCommit(t.Item1.PeeledTarget() as Commit, t.Item2, t.Item1.FriendlyName);
+                    if (t.Item1.PeeledTarget() is LibGit2Sharp.Commit commit)
+                        return new VersionTaggedCommit((Commit)commit, t.Item2, t.Item1.FriendlyName);
 
                     return null;
                 })
@@ -62,7 +62,7 @@ protected virtual string FormatSource(VersionTaggedCommit version)
 
         protected virtual bool IsValidTag(Tag tag, Commit commit)
         {
-            return tag.PeeledTarget() == commit;
+            return tag.PeeledTarget() is LibGit2Sharp.Commit targetCommit && targetCommit == commit;
         }
 
         protected class VersionTaggedCommit
diff --git a/src/GitVersionCore/VersionCalculation/IncrementStrategyFinder.cs b/src/GitVersionCore/VersionCalculation/IncrementStrategyFinder.cs
@@ -3,7 +3,6 @@
 using System.Linq;
 using System.Text.RegularExpressions;
 using GitVersion.VersionCalculation;
-using LibGit2Sharp;
 
 namespace GitVersion
 {
diff --git a/src/GitVersionCore/VersionCalculation/MainlineVersionCalculator.cs b/src/GitVersionCore/VersionCalculation/MainlineVersionCalculator.cs
@@ -5,7 +5,6 @@
 using GitVersion.Configuration;
 using GitVersion.Extensions;
 using GitVersion.Logging;
-using LibGit2Sharp;
 
 namespace GitVersion.VersionCalculation
 {

Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using System.Linq;`
`4`	`4`	`using GitVersion;`
`5`		`-using LibGit2Sharp;`
`6`	`5`	`using Branch = GitVersion.Branch;`
	`6`	`+using Commit = GitVersion.Commit;`
`7`	`7`
`8`	`8`	`namespace GitVersionCore.Tests.Mocks`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using System.Diagnostics;`
`4`	`4`	`using LibGit2Sharp;`
	`5`	`+using Commit = GitVersion.Commit;`
`5`	`6`
`6`	`7`	`namespace GitVersionCore.Tests.Mocks`
`7`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using GitVersion;`
`2`	`2`	`using GitVersion.VersionCalculation;`
`3`		`-using LibGit2Sharp;`
	`3`	`+using Commit = GitVersion.Commit;`
`4`	`4`
`5`	`5`	`namespace GitVersionCore.Tests.VersionCalculation`
`6`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`using System.Collections.Generic;`
`2`	`2`	`using GitVersion.Model.Configuration;`
`3`		`-using LibGit2Sharp;`
`4`	`3`
`5`	`4`	`namespace GitVersion.Configuration`
`6`	`5`	`{`