replace IRepository with IGitRepository

arturcic · arturcic · commit f4a2891915b6 · 2021-01-07T15:22:46.000+01:00
diff --git a/src/GitVersionCore.Tests/Core/GitVersionExecutorTests.cs b/src/GitVersionCore.Tests/Core/GitVersionExecutorTests.cs
@@ -255,7 +255,7 @@ public void CacheFileIsMissing()
             var gitVersionOptions = new GitVersionOptions { WorkingDirectory = fixture.RepositoryPath };
 
             fixture.Repository.MakeACommit();
-            var gitVersionCalculator = GetGitVersionCalculator(gitVersionOptions, log, fixture.Repository);
+            var gitVersionCalculator = GetGitVersionCalculator(gitVersionOptions, log, new GitRepository(fixture.Repository));
 
             gitVersionCalculator.CalculateVersionVariables();
 
@@ -299,7 +299,7 @@ public void ConfigChangeInvalidatesCache()
         CommitsSinceVersionSource: 19
         CommitsSinceVersionSourcePadded: 0019
         CommitDate: 2015-11-10
-        UncommittedChanges: 0 
+        UncommittedChanges: 0
         ";
 
             using var fixture = new EmptyRepositoryFixture();
@@ -483,7 +483,7 @@ public void DynamicRepositoriesShouldNotErrorWithFailedToFindGitDirectory()
                 }
             };
 
-            var gitVersionCalculator = GetGitVersionCalculator(gitVersionOptions, repository: fixture.Repository);
+            var gitVersionCalculator = GetGitVersionCalculator(gitVersionOptions, repository: new GitRepository(fixture.Repository));
             gitPreparer.Prepare();
             gitVersionCalculator.CalculateVersionVariables();
         }
@@ -566,7 +566,7 @@ public void CalculateVersionFromWorktreeHead()
             version.Sha.ShouldBe(commits.First().Sha);
         }
 
-        private IGitVersionCalculateTool GetGitVersionCalculator(GitVersionOptions gitVersionOptions, ILog logger = null, IRepository repository = null, IFileSystem fs = null)
+        private IGitVersionCalculateTool GetGitVersionCalculator(GitVersionOptions gitVersionOptions, ILog logger = null, IGitRepository repository = null, IFileSystem fs = null)
         {
             sp = GetServiceProvider(gitVersionOptions, logger, repository, fs);
 
@@ -578,7 +578,7 @@ private IGitVersionCalculateTool GetGitVersionCalculator(GitVersionOptions gitVe
             return sp.GetService<IGitVersionCalculateTool>();
         }
 
-        private static IServiceProvider GetServiceProvider(GitVersionOptions gitVersionOptions, ILog log = null, IRepository repository = null, IFileSystem fileSystem = null, IEnvironment environment = null)
+        private static IServiceProvider GetServiceProvider(GitVersionOptions gitVersionOptions, ILog log = null, IGitRepository repository = null, IFileSystem fileSystem = null, IEnvironment environment = null)
         {
             return ConfigureServices(services =>
             {
diff --git a/src/GitVersionCore.Tests/Core/RepositoryExtensionsTests.cs b/src/GitVersionCore.Tests/Core/RepositoryExtensionsTests.cs
@@ -33,9 +33,9 @@ private IGitRepository MockRepository()
 
         private Remote MockRemote(IGitRepository repository)
         {
-            var branches = new TestableBranchCollection(repository);
+            var branches = new TestableBranchCollection();
             var tipId = new ObjectId("c6d8764d20ff16c0df14c73680e52b255b608926");
-            var tip = new TestableCommit(repository, tipId);
+            var tip = new TestableCommit(tipId);
             var head = branches.Add("refs/heads/feature/feat-test", tip);
             var remote = new TesatbleRemote("origin");
             var references = new TestableReferenceCollection();
@@ -49,12 +49,6 @@ private Remote MockRemote(IGitRepository repository)
 
         private class TestableBranchCollection : BranchCollection
         {
-            private readonly IRepository repository;
-            public TestableBranchCollection(IRepository repository)
-            {
-                this.repository = repository;
-            }
-
             IDictionary<string, Branch> branches = new Dictionary<string, Branch>();
 
             public override Branch this[string name] =>
@@ -72,7 +66,7 @@ public override Branch Add(string name, Commit commit)
             public override Branch Add(string name, string committish)
             {
                 var id = new ObjectId(committish);
-                var commit = new TestableCommit(this.repository, id);
+                var commit = new TestableCommit(id);
                 return Add(name, commit);
             }
 
@@ -127,19 +121,16 @@ public TestableBranch(string canonicalName, Commit tip)
             public override Commit Tip => this.tip;
         }
 
-        private class TestableCommit : Commit, IBelongToARepository
+        private class TestableCommit : Commit
         {
-            private IRepository repository;
             private ObjectId id;
 
-            public TestableCommit(IRepository repository, ObjectId id)
+            public TestableCommit(ObjectId id)
             {
-                this.repository = repository;
                 this.id = id;
             }
 
             public override ObjectId Id => this.id;
-            public IRepository Repository => this.repository;
         }
 
         private class TesatbleRemote : Remote
diff --git a/src/GitVersionCore.Tests/Core/RepositoryMetadataProviderTests.cs b/src/GitVersionCore.Tests/Core/RepositoryMetadataProviderTests.cs
@@ -1,7 +1,6 @@
 using System;
 using GitTools.Testing;
 using GitVersion;
-using GitVersion.Extensions;
 using GitVersion.Logging;
 using GitVersionCore.Tests.Helpers;
 using GitVersionCore.Tests.IntegrationTests;
@@ -63,7 +62,8 @@ public void FindsCorrectMergeBaseForForwardMerge()
 
             var develop = fixture.Repository.FindBranch("develop");
             var release = fixture.Repository.FindBranch("release-2.0.0");
-            var gitRepoMetadataProvider = new RepositoryMetadataProvider(log, fixture.Repository);
+            var repository = new GitRepository(() => fixture.RepositoryPath);
+            var gitRepoMetadataProvider = new RepositoryMetadataProvider(log, repository);
 
             var releaseBranchMergeBase = gitRepoMetadataProvider.FindMergeBase(release, develop);
 
@@ -118,7 +118,8 @@ public void FindsCorrectMergeBaseForForwardMergeMovesOn()
 
             var develop = fixture.Repository.FindBranch("develop");
             var release = fixture.Repository.FindBranch("release-2.0.0");
-            var gitRepoMetadataProvider = new RepositoryMetadataProvider(log, fixture.Repository);
+            var repository = new GitRepository(() => fixture.RepositoryPath);
+            var gitRepoMetadataProvider = new RepositoryMetadataProvider(log, repository);
 
             var releaseBranchMergeBase = gitRepoMetadataProvider.FindMergeBase(release, develop);
 
@@ -192,7 +193,8 @@ public void FindsCorrectMergeBaseForMultipleForwardMerges()
             var develop = fixture.Repository.FindBranch("develop");
             var release = fixture.Repository.FindBranch("release-2.0.0");
 
-            var gitRepoMetadataProvider = new RepositoryMetadataProvider(log, fixture.Repository);
+            var repository = new GitRepository(() => fixture.RepositoryPath);
+            var gitRepoMetadataProvider = new RepositoryMetadataProvider(log, repository);
 
             var releaseBranchMergeBase = gitRepoMetadataProvider.FindMergeBase(release, develop);
 
diff --git a/src/GitVersionCore.Tests/Extensions/GitToolsTestingExtensions.cs b/src/GitVersionCore.Tests/Extensions/GitToolsTestingExtensions.cs
@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using System.Linq;
 using GitTools.Testing;
 using GitVersion;
 using GitVersion.BuildAgents;
@@ -18,6 +19,16 @@ namespace GitVersionCore.Tests
 {
     public static class GitToolsTestingExtensions
     {
+        public static Branch FindBranch(this IRepository repository, string branchName)
+        {
+            return repository.Branches.FirstOrDefault(x => x.NameWithoutRemote() == branchName);
+        }
+
+        public static void DumpGraph(this IRepository repository, Action<string> writer = null, int? maxCommits = null)
+        {
+            LibGitExtensions.DumpGraph(repository.Info.Path, writer, maxCommits);
+        }
+
         public static VersionVariables GetVersion(this RepositoryFixtureBase fixture, Config configuration = null, IRepository repository = null, string commitId = null, bool onlyTrackedBranches = true, string branch = null)
         {
             if (configuration == null)
diff --git a/src/GitVersionCore.Tests/Helpers/GitVersionContextBuilder.cs b/src/GitVersionCore.Tests/Helpers/GitVersionContextBuilder.cs
@@ -6,20 +6,19 @@
 using GitVersion.Model.Configuration;
 using GitVersionCore.Tests.Helpers;
 using GitVersionCore.Tests.Mocks;
-using LibGit2Sharp;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 
 namespace GitVersionCore.Tests
 {
     public class GitVersionContextBuilder
     {
-        private IRepository repository;
+        private IGitRepository repository;
         private Config configuration;
         public IServiceProvider ServicesProvider;
         private Action<IServiceCollection> overrideServices;
 
-        public GitVersionContextBuilder WithRepository(IRepository gitRepository)
+        public GitVersionContextBuilder WithRepository(IGitRepository gitRepository)
         {
             repository = gitRepository;
             return this;
@@ -95,7 +94,7 @@ public void Build()
             });
         }
 
-        private static IRepository CreateRepository()
+        private static IGitRepository CreateRepository()
         {
             var mockBranch = new MockBranch("master") { new MockCommit { CommitterEx = Generate.SignatureNow() } };
             var mockRepository = new MockRepository
diff --git a/src/GitVersionCore.Tests/Helpers/TestBase.cs b/src/GitVersionCore.Tests/Helpers/TestBase.cs
@@ -3,7 +3,6 @@
 using GitVersion.Configuration;
 using GitVersion.Extensions;
 using GitVersion.Model.Configuration;
-using LibGit2Sharp;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 
@@ -25,7 +24,7 @@ protected static IServiceProvider ConfigureServices(Action<IServiceCollection> o
             return services.BuildServiceProvider();
         }
 
-        protected static IServiceProvider BuildServiceProvider(string workingDirectory, IRepository repository, string branch, Config config = null)
+        protected static IServiceProvider BuildServiceProvider(string workingDirectory, IGitRepository repository, string branch, Config config = null)
         {
             config ??= new ConfigurationBuilder().Build();
             var options = Options.Create(new GitVersionOptions
diff --git a/src/GitVersionCore.Tests/IntegrationTests/DocumentationSamples.cs b/src/GitVersionCore.Tests/IntegrationTests/DocumentationSamples.cs
@@ -1,6 +1,5 @@
 using System;
 using GitTools.Testing;
-using GitVersion.Extensions;
 using GitVersionCore.Tests.Helpers;
 using NUnit.Framework;
 using Shouldly;
diff --git a/src/GitVersionCore.Tests/IntegrationTests/PullRequestScenarios.cs b/src/GitVersionCore.Tests/IntegrationTests/PullRequestScenarios.cs
@@ -1,5 +1,4 @@
 using GitTools.Testing;
-using GitVersion.Extensions;
 using GitVersionCore.Tests.Helpers;
 using LibGit2Sharp;
 using NUnit.Framework;
diff --git a/src/GitVersionCore.Tests/Mocks/MockRepository.cs b/src/GitVersionCore.Tests/Mocks/MockRepository.cs
@@ -1,11 +1,12 @@
 using System;
 using System.Collections.Generic;
+using GitVersion;
 using LibGit2Sharp;
 using Index = LibGit2Sharp.Index;
 
 namespace GitVersionCore.Tests.Mocks
 {
-    public class MockRepository : IRepository
+    public class MockRepository : IGitRepository
     {
         private IQueryableCommitLog commits;
 
@@ -221,5 +222,6 @@ public IQueryableCommitLog Commits
         public Network Network { get; set; }
 
         public StashCollection Stashes => throw new NotImplementedException();
+        public IGitRepositoryCommands Commands { get; }
     }
 }
diff --git a/src/GitVersionCore.Tests/Model/GitVersionContextTests.cs b/src/GitVersionCore.Tests/Model/GitVersionContextTests.cs
@@ -62,7 +62,7 @@ public void CanInheritIncrement(IncrementStrategy increment, IncrementStrategy?
             fixture.BranchTo(dummyBranchName);
             fixture.MakeACommit();
 
-            var context = GetGitVersionContext(fixture.RepositoryPath, fixture.Repository, dummyBranchName, config);
+            var context = GetGitVersionContext(fixture.RepositoryPath, new GitRepository(fixture.Repository), dummyBranchName, config);
 
             context.Configuration.Increment.ShouldBe(alternateExpected ?? increment);
         }
@@ -176,12 +176,12 @@ public void CanFindParentBranchForInheritingIncrementStrategy()
             Commands.Checkout(fixture.Repository, featureBranch);
             fixture.Repository.MakeACommit();
 
-            var context = GetGitVersionContext(fixture.RepositoryPath, fixture.Repository, "develop", config);
+            var context = GetGitVersionContext(fixture.RepositoryPath, new GitRepository(fixture.Repository), "develop", config);
 
             context.Configuration.Increment.ShouldBe(IncrementStrategy.Major);
         }
 
-        private static GitVersionContext GetGitVersionContext(string workingDirectory, IRepository repository, string branch, Config config = null)
+        private static GitVersionContext GetGitVersionContext(string workingDirectory, IGitRepository repository, string branch, Config config = null)
         {
             var options = Options.Create(new GitVersionOptions
             {
diff --git a/src/GitVersionCore.Tests/VersionCalculation/NextVersionCalculatorTests.cs b/src/GitVersionCore.Tests/VersionCalculation/NextVersionCalculatorTests.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using GitTools.Testing;
 using GitVersion;
-using GitVersion.Extensions;
 using GitVersion.Model.Configuration;
 using GitVersion.VersionCalculation;
 using GitVersionCore.Tests.Helpers;
diff --git a/src/GitVersionCore.Tests/VersionCalculation/Strategies/VersionInBranchNameBaseVersionStrategyTests.cs b/src/GitVersionCore.Tests/VersionCalculation/Strategies/VersionInBranchNameBaseVersionStrategyTests.cs
@@ -1,5 +1,6 @@
 using System.Linq;
 using GitTools.Testing;
+using GitVersion;
 using GitVersion.Configuration;
 using GitVersion.Extensions;
 using GitVersion.Model.Configuration;
@@ -22,7 +23,7 @@ public void CanTakeVersionFromNameOfReleaseBranch(string branchName, string expe
             fixture.Repository.MakeACommit();
             fixture.Repository.CreateBranch(branchName);
 
-            var strategy = GetVersionStrategy(fixture.RepositoryPath, fixture.Repository, branchName);
+            var strategy = GetVersionStrategy(fixture.RepositoryPath, new GitRepository(fixture.Repository), branchName);
             var baseVersion = strategy.GetVersions().Single();
 
             baseVersion.SemanticVersion.ToString().ShouldBe(expectedBaseVersion);
@@ -38,7 +39,7 @@ public void ShouldNotTakeVersionFromNameOfNonReleaseBranch(string branchName)
             fixture.Repository.MakeACommit();
             fixture.Repository.CreateBranch(branchName);
 
-            var strategy = GetVersionStrategy(fixture.RepositoryPath, fixture.Repository, branchName);
+            var strategy = GetVersionStrategy(fixture.RepositoryPath, new GitRepository(fixture.Repository), branchName);
             var baseVersions = strategy.GetVersions();
 
             baseVersions.ShouldBeEmpty();
@@ -56,7 +57,7 @@ public void CanTakeVersionFromNameOfConfiguredReleaseBranch(string branchName, s
                          .Add(new Config { Branches = { { "support", new BranchConfig { IsReleaseBranch = true } } } })
                          .Build();
 
-            var strategy = GetVersionStrategy(fixture.RepositoryPath, fixture.Repository, branchName, config);
+            var strategy = GetVersionStrategy(fixture.RepositoryPath, new GitRepository(fixture.Repository), branchName, config);
 
             var baseVersion = strategy.GetVersions().Single();
 
@@ -75,13 +76,13 @@ public void CanTakeVersionFromNameOfRemoteReleaseBranch(string branchName, strin
             Commands.Fetch((Repository)fixture.LocalRepositoryFixture.Repository, fixture.LocalRepositoryFixture.Repository.Network.Remotes.First().Name, new string[0], new FetchOptions(), null);
             fixture.LocalRepositoryFixture.Checkout($"origin/{branchName}");
 
-            var strategy = GetVersionStrategy(fixture.RepositoryPath, fixture.Repository, branchName);
+            var strategy = GetVersionStrategy(fixture.RepositoryPath, new GitRepository(fixture.Repository), branchName);
             var baseVersion = strategy.GetVersions().Single();
 
             baseVersion.SemanticVersion.ToString().ShouldBe(expectedBaseVersion);
         }
 
-        private static IVersionStrategy GetVersionStrategy(string workingDirectory, IRepository repository, string branch, Config config = null)
+        private static IVersionStrategy GetVersionStrategy(string workingDirectory, IGitRepository repository, string branch, Config config = null)
         {
             var sp = BuildServiceProvider(workingDirectory, repository, branch, config);
             return sp.GetServiceForType<IVersionStrategy, VersionInBranchNameVersionStrategy>();
diff --git a/src/GitVersionCore.Tests/VersionCalculation/VersionSourceTests.cs b/src/GitVersionCore.Tests/VersionCalculation/VersionSourceTests.cs
@@ -1,4 +1,5 @@
 using GitTools.Testing;
+using GitVersion;
 using GitVersion.VersionCalculation;
 using GitVersionCore.Tests.Helpers;
 using LibGit2Sharp;
@@ -66,7 +67,7 @@ public void VersionSourceShaUsingTag()
 
         private static INextVersionCalculator GetNextVersionCalculator(RepositoryFixtureBase fixture)
         {
-            var sp = BuildServiceProvider(fixture.RepositoryPath, fixture.Repository, fixture.Repository.Head.CanonicalName);
+            var sp = BuildServiceProvider(fixture.RepositoryPath, new GitRepository(fixture.Repository), fixture.Repository.Head.CanonicalName);
             return sp.GetService<INextVersionCalculator>();
         }
     }
diff --git a/src/GitVersionCore/Core/GitRepository.cs b/src/GitVersionCore/Core/GitRepository.cs
@@ -15,6 +15,12 @@ public GitRepository(IOptions<GitVersionOptions> options)
         {
         }
 
+        public GitRepository(IRepository repository)
+        {
+            repositoryLazy = new Lazy<IRepository>(() => repository);
+            Commands = new GitRepositoryCommands(repositoryLazy);
+        }
+
         public GitRepository(Func<string> getGitRootDirectory)
         {
             repositoryLazy = new Lazy<IRepository>(() => new Repository(getGitRootDirectory()));
diff --git a/src/GitVersionCore/Core/RepositoryMetadataProvider.cs b/src/GitVersionCore/Core/RepositoryMetadataProvider.cs
@@ -20,9 +20,9 @@ public class RepositoryMetadataProvider : IRepositoryMetadataProvider
         private const string MissingTipFormat = "{0} has no tip. Please see http://example.com/docs for information on how to fix this.";
 
         private readonly ILog log;
-        private readonly IRepository repository;
+        private readonly IGitRepository repository;
 
-        public RepositoryMetadataProvider(ILog log, IRepository repository)
+        public RepositoryMetadataProvider(ILog log, IGitRepository repository)
         {
             this.log = log ?? throw new ArgumentNullException(nameof(log));
             this.repository = repository ?? throw new ArgumentNullException(nameof(log));
diff --git a/src/GitVersionCore/Extensions/RepositoryExtensions.cs b/src/GitVersionCore/Extensions/RepositoryExtensions.cs
diff --git a/src/GitVersionCore/GitVersionCoreModule.cs b/src/GitVersionCore/GitVersionCoreModule.cs
diff --git a/src/GitVersionCore/VersionCalculation/IncrementStrategyFinder.cs b/src/GitVersionCore/VersionCalculation/IncrementStrategyFinder.cs

Original file line number	Diff line number	Diff line change
`@@ -255,7 +255,7 @@ public void CacheFileIsMissing()`
`255`	`255`	`var gitVersionOptions = new GitVersionOptions { WorkingDirectory = fixture.RepositoryPath };`
`256`	`256`
`257`	`257`	`fixture.Repository.MakeACommit();`
`258`		`- var gitVersionCalculator = GetGitVersionCalculator(gitVersionOptions, log, fixture.Repository);`
	`258`	`+ var gitVersionCalculator = GetGitVersionCalculator(gitVersionOptions, log, new GitRepository(fixture.Repository));`
`259`	`259`
`260`	`260`	`gitVersionCalculator.CalculateVersionVariables();`
`261`	`261`
`@@ -299,7 +299,7 @@ public void ConfigChangeInvalidatesCache()`
`299`	`299`	`CommitsSinceVersionSource: 19`
`300`	`300`	`CommitsSinceVersionSourcePadded: 0019`
`301`	`301`	`CommitDate: 2015-11-10`
`302`		`- UncommittedChanges: 0`
	`302`	`+ UncommittedChanges: 0`
`303`	`303`	`";`
`304`	`304`
`305`	`305`	`using var fixture = new EmptyRepositoryFixture();`
`@@ -483,7 +483,7 @@ public void DynamicRepositoriesShouldNotErrorWithFailedToFindGitDirectory()`
`483`	`483`	`}`
`484`	`484`	`};`
`485`	`485`
`486`		`- var gitVersionCalculator = GetGitVersionCalculator(gitVersionOptions, repository: fixture.Repository);`
	`486`	`+ var gitVersionCalculator = GetGitVersionCalculator(gitVersionOptions, repository: new GitRepository(fixture.Repository));`
`487`	`487`	`gitPreparer.Prepare();`
`488`	`488`	`gitVersionCalculator.CalculateVersionVariables();`
`489`	`489`	`}`
`@@ -566,7 +566,7 @@ public void CalculateVersionFromWorktreeHead()`
`566`	`566`	`version.Sha.ShouldBe(commits.First().Sha);`
`567`	`567`	`}`
`568`	`568`
`569`		`- private IGitVersionCalculateTool GetGitVersionCalculator(GitVersionOptions gitVersionOptions, ILog logger = null, IRepository repository = null, IFileSystem fs = null)`
	`569`	`+ private IGitVersionCalculateTool GetGitVersionCalculator(GitVersionOptions gitVersionOptions, ILog logger = null, IGitRepository repository = null, IFileSystem fs = null)`
`570`	`570`	`{`
`571`	`571`	`sp = GetServiceProvider(gitVersionOptions, logger, repository, fs);`
`572`	`572`
`@@ -578,7 +578,7 @@ private IGitVersionCalculateTool GetGitVersionCalculator(GitVersionOptions gitVe`
`578`	`578`	`return sp.GetService<IGitVersionCalculateTool>();`
`579`	`579`	`}`
`580`	`580`
`581`		`- private static IServiceProvider GetServiceProvider(GitVersionOptions gitVersionOptions, ILog log = null, IRepository repository = null, IFileSystem fileSystem = null, IEnvironment environment = null)`
	`581`	`+ private static IServiceProvider GetServiceProvider(GitVersionOptions gitVersionOptions, ILog log = null, IGitRepository repository = null, IFileSystem fileSystem = null, IEnvironment environment = null)`
`582`	`582`	`{`
`583`	`583`	`return ConfigureServices(services =>`
`584`	`584`	`{`
Original file line number	Diff line number	Diff line change
`@@ -33,9 +33,9 @@ private IGitRepository MockRepository()`
`33`	`33`
`34`	`34`	`private Remote MockRemote(IGitRepository repository)`
`35`	`35`	`{`
`36`		`- var branches = new TestableBranchCollection(repository);`
	`36`	`+ var branches = new TestableBranchCollection();`
`37`	`37`	`var tipId = new ObjectId("c6d8764d20ff16c0df14c73680e52b255b608926");`
`38`		`- var tip = new TestableCommit(repository, tipId);`
	`38`	`+ var tip = new TestableCommit(tipId);`
`39`	`39`	`var head = branches.Add("refs/heads/feature/feat-test", tip);`
`40`	`40`	`var remote = new TesatbleRemote("origin");`
`41`	`41`	`var references = new TestableReferenceCollection();`
`@@ -49,12 +49,6 @@ private Remote MockRemote(IGitRepository repository)`
`49`	`49`
`50`	`50`	`private class TestableBranchCollection : BranchCollection`
`51`	`51`	`{`
`52`		`- private readonly IRepository repository;`
`53`		`- public TestableBranchCollection(IRepository repository)`
`54`		`- {`
`55`		`- this.repository = repository;`
`56`		`- }`
`57`		`-`
`58`	`52`	`IDictionary<string, Branch> branches = new Dictionary<string, Branch>();`
`59`	`53`
`60`	`54`	`public override Branch this[string name] =>`
`@@ -72,7 +66,7 @@ public override Branch Add(string name, Commit commit)`
`72`	`66`	`public override Branch Add(string name, string committish)`
`73`	`67`	`{`
`74`	`68`	`var id = new ObjectId(committish);`
`75`		`- var commit = new TestableCommit(this.repository, id);`
	`69`	`+ var commit = new TestableCommit(id);`
`76`	`70`	`return Add(name, commit);`
`77`	`71`	`}`
`78`	`72`
`@@ -127,19 +121,16 @@ public TestableBranch(string canonicalName, Commit tip)`
`127`	`121`	`public override Commit Tip => this.tip;`
`128`	`122`	`}`
`129`	`123`
`130`		`- private class TestableCommit : Commit, IBelongToARepository`
	`124`	`+ private class TestableCommit : Commit`
`131`	`125`	`{`
`132`		`- private IRepository repository;`
`133`	`126`	`private ObjectId id;`
`134`	`127`
`135`		`- public TestableCommit(IRepository repository, ObjectId id)`
	`128`	`+ public TestableCommit(ObjectId id)`
`136`	`129`	`{`
`137`		`- this.repository = repository;`
`138`	`130`	`this.id = id;`
`139`	`131`	`}`
`140`	`132`
`141`	`133`	`public override ObjectId Id => this.id;`
`142`		`- public IRepository Repository => this.repository;`
`143`	`134`	`}`
`144`	`135`
`145`	`136`	`private class TesatbleRemote : Remote`
Original file line number	Diff line number	Diff line change
`@@ -6,20 +6,19 @@`
`6`	`6`	`using GitVersion.Model.Configuration;`
`7`	`7`	`using GitVersionCore.Tests.Helpers;`
`8`	`8`	`using GitVersionCore.Tests.Mocks;`
`9`		`-using LibGit2Sharp;`
`10`	`9`	`using Microsoft.Extensions.DependencyInjection;`
`11`	`10`	`using Microsoft.Extensions.Options;`
`12`	`11`
`13`	`12`	`namespace GitVersionCore.Tests`
`14`	`13`	`{`
`15`	`14`	`public class GitVersionContextBuilder`
`16`	`15`	`{`
`17`		`- private IRepository repository;`
	`16`	`+ private IGitRepository repository;`
`18`	`17`	`private Config configuration;`
`19`	`18`	`public IServiceProvider ServicesProvider;`
`20`	`19`	`private Action<IServiceCollection> overrideServices;`
`21`	`20`
`22`		`- public GitVersionContextBuilder WithRepository(IRepository gitRepository)`
	`21`	`+ public GitVersionContextBuilder WithRepository(IGitRepository gitRepository)`
`23`	`22`	`{`
`24`	`23`	`repository = gitRepository;`
`25`	`24`	`return this;`
`@@ -95,7 +94,7 @@ public void Build()`
`95`	`94`	`});`
`96`	`95`	`}`
`97`	`96`
`98`		`- private static IRepository CreateRepository()`
	`97`	`+ private static IGitRepository CreateRepository()`
`99`	`98`	`{`
`100`	`99`	`var mockBranch = new MockBranch("master") { new MockCommit { CommitterEx = Generate.SignatureNow() } };`
`101`	`100`	`var mockRepository = new MockRepository`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`	`using GitVersion.Configuration;`
`4`	`4`	`using GitVersion.Extensions;`
`5`	`5`	`using GitVersion.Model.Configuration;`
`6`		`-using LibGit2Sharp;`
`7`	`6`	`using Microsoft.Extensions.DependencyInjection;`
`8`	`7`	`using Microsoft.Extensions.Options;`
`9`	`8`
`@@ -25,7 +24,7 @@ protected static IServiceProvider ConfigureServices(Action<IServiceCollection> o`
`25`	`24`	`return services.BuildServiceProvider();`
`26`	`25`	`}`
`27`	`26`
`28`		`- protected static IServiceProvider BuildServiceProvider(string workingDirectory, IRepository repository, string branch, Config config = null)`
	`27`	`+ protected static IServiceProvider BuildServiceProvider(string workingDirectory, IGitRepository repository, string branch, Config config = null)`
`29`	`28`	`{`
`30`	`29`	`config ??= new ConfigurationBuilder().Build();`
`31`	`30`	`var options = Options.Create(new GitVersionOptions`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using GitTools.Testing;`
`2`		`-using GitVersion.Extensions;`
`3`	`2`	`using GitVersionCore.Tests.Helpers;`
`4`	`3`	`using LibGit2Sharp;`
`5`	`4`	`using NUnit.Framework;`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,12 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.Generic;`
	`3`	`+using GitVersion;`
`3`	`4`	`using LibGit2Sharp;`
`4`	`5`	`using Index = LibGit2Sharp.Index;`
`5`	`6`
`6`	`7`	`namespace GitVersionCore.Tests.Mocks`
`7`	`8`	`{`
`8`		`- public class MockRepository : IRepository`
	`9`	`+ public class MockRepository : IGitRepository`
`9`	`10`	`{`
`10`	`11`	`private IQueryableCommitLog commits;`
`11`	`12`
`@@ -221,5 +222,6 @@ public IQueryableCommitLog Commits`
`221`	`222`	`public Network Network { get; set; }`
`222`	`223`
`223`	`224`	`public StashCollection Stashes => throw new NotImplementedException();`
	`225`	`+ public IGitRepositoryCommands Commands { get; }`
`224`	`226`	`}`
`225`	`227`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public void CanInheritIncrement(IncrementStrategy increment, IncrementStrategy?`
`62`	`62`	`fixture.BranchTo(dummyBranchName);`
`63`	`63`	`fixture.MakeACommit();`
`64`	`64`
`65`		`- var context = GetGitVersionContext(fixture.RepositoryPath, fixture.Repository, dummyBranchName, config);`
	`65`	`+ var context = GetGitVersionContext(fixture.RepositoryPath, new GitRepository(fixture.Repository), dummyBranchName, config);`
`66`	`66`
`67`	`67`	`context.Configuration.Increment.ShouldBe(alternateExpected ?? increment);`
`68`	`68`	`}`
`@@ -176,12 +176,12 @@ public void CanFindParentBranchForInheritingIncrementStrategy()`
`176`	`176`	`Commands.Checkout(fixture.Repository, featureBranch);`
`177`	`177`	`fixture.Repository.MakeACommit();`
`178`	`178`
`179`		`- var context = GetGitVersionContext(fixture.RepositoryPath, fixture.Repository, "develop", config);`
	`179`	`+ var context = GetGitVersionContext(fixture.RepositoryPath, new GitRepository(fixture.Repository), "develop", config);`
`180`	`180`
`181`	`181`	`context.Configuration.Increment.ShouldBe(IncrementStrategy.Major);`
`182`	`182`	`}`
`183`	`183`
`184`		`- private static GitVersionContext GetGitVersionContext(string workingDirectory, IRepository repository, string branch, Config config = null)`
	`184`	`+ private static GitVersionContext GetGitVersionContext(string workingDirectory, IGitRepository repository, string branch, Config config = null)`
`185`	`185`	`{`
`186`	`186`	`var options = Options.Create(new GitVersionOptions`
`187`	`187`	`{`