replace GitRepository usage with ToGitRepository

arturcic · arturcic · commit 6e94b65d3f02 · 2021-01-19T17:12:49.000+02:00
diff --git a/src/GitTools.Testing/Fixtures/RepositoryFixtureBase.cs b/src/GitTools.Testing/Fixtures/RepositoryFixtureBase.cs
@@ -24,7 +24,7 @@ protected RepositoryFixtureBase(IRepository repository)
             Repository.Config.Set("user.email", "test@email.com");
         }
 
-        public IRepository Repository { get; private set; }
+        public IRepository Repository { get; }
 
         public string RepositoryPath
         {
diff --git a/src/GitVersion.LibGit2Sharp/AssemblyInfo.cs b/src/GitVersion.LibGit2Sharp/AssemblyInfo.cs
diff --git a/src/GitVersion.LibGit2Sharp/RepositoryExtensions.cs b/src/GitVersion.LibGit2Sharp/RepositoryExtensions.cs
@@ -0,0 +1,11 @@
+﻿using LibGit2Sharp;
+using Microsoft.Extensions.Options;
+
+namespace GitVersion
+{
+    public static class RepositoryExtensions
+    {
+        public static IGitRepository ToGitRepository(this IRepository repository) => new GitRepository(repository);
+        public static IGitRepositoryInfo ToGitRepositoryInfo(IOptions<GitVersionOptions> options) => new GitRepositoryInfo(options);
+    }
+}
diff --git a/src/GitVersionCore.Tests/Core/GitVersionExecutorTests.cs b/src/GitVersionCore.Tests/Core/GitVersionExecutorTests.cs
@@ -16,6 +16,7 @@
 using NUnit.Framework;
 using Shouldly;
 using Environment = System.Environment;
+using RepositoryExtensions = GitVersion.RepositoryExtensions;
 
 namespace GitVersionCore.Tests
 {
@@ -255,7 +256,7 @@ public void CacheFileIsMissing()
             var gitVersionOptions = new GitVersionOptions { WorkingDirectory = fixture.RepositoryPath };
 
             fixture.Repository.MakeACommit();
-            var gitVersionCalculator = GetGitVersionCalculator(gitVersionOptions, log, new GitRepository(fixture.Repository));
+            var gitVersionCalculator = GetGitVersionCalculator(gitVersionOptions, log, fixture.Repository.ToGitRepository());
 
             gitVersionCalculator.CalculateVersionVariables();
 
@@ -484,7 +485,7 @@ public void DynamicRepositoriesShouldNotErrorWithFailedToFindGitDirectory()
                 }
             };
 
-            var gitVersionCalculator = GetGitVersionCalculator(gitVersionOptions, repository: new GitRepository(fixture.Repository));
+            var gitVersionCalculator = GetGitVersionCalculator(gitVersionOptions, repository: fixture.Repository.ToGitRepository());
             gitPreparer.Prepare();
             gitVersionCalculator.CalculateVersionVariables();
         }
@@ -591,7 +592,7 @@ private static IServiceProvider GetServiceProvider(GitVersionOptions gitVersionO
                 if (environment != null) services.AddSingleton(environment);
                 var options = Options.Create(gitVersionOptions);
                 services.AddSingleton(options);
-                services.AddSingleton<IGitRepositoryInfo>(new GitRepositoryInfo(options));
+                services.AddSingleton(RepositoryExtensions.ToGitRepositoryInfo(options));
             });
         }
     }
diff --git a/src/GitVersionCore.Tests/Core/RepositoryMetadataProviderTests.cs b/src/GitVersionCore.Tests/Core/RepositoryMetadataProviderTests.cs
@@ -36,7 +36,7 @@ public void FindsCorrectMergeBaseForForwardMerge()
             using var fixture = new EmptyRepositoryFixture();
             fixture.MakeACommit("initial");
             fixture.BranchTo("develop");
-            var fixtureRepository = new GitRepository(fixture.Repository);
+            var fixtureRepository = fixture.Repository.ToGitRepository();
             var expectedReleaseMergeBase = fixtureRepository.Head.Tip;
 
             // Create release from develop
@@ -90,7 +90,7 @@ public void FindsCorrectMergeBaseForForwardMergeMovesOn()
             using var fixture = new EmptyRepositoryFixture();
             fixture.MakeACommit("initial");
             fixture.BranchTo("develop");
-            var fixtureRepository = new GitRepository(fixture.Repository);
+            var fixtureRepository = fixture.Repository.ToGitRepository();
             var expectedReleaseMergeBase = fixtureRepository.Head.Tip;
 
             // Create release from develop
@@ -151,7 +151,7 @@ public void FindsCorrectMergeBaseForMultipleForwardMerges()
             using var fixture = new EmptyRepositoryFixture();
             fixture.MakeACommit("initial");
             fixture.BranchTo("develop");
-            var fixtureRepository = new GitRepository(fixture.Repository);
+            var fixtureRepository = fixture.Repository.ToGitRepository();
             var expectedReleaseMergeBase = fixtureRepository.Head.Tip;
 
             // Create release from develop
diff --git a/src/GitVersionCore.Tests/Extensions/GitToolsTestingExtensions.cs b/src/GitVersionCore.Tests/Extensions/GitToolsTestingExtensions.cs
@@ -29,6 +29,11 @@ public static void DumpGraph(this IGitRepository repository, Action<string> writ
             GitExtensions.DumpGraph(repository.Path, writer, maxCommits);
         }
 
+        public static void DumpGraph(this IRepository repository, Action<string> writer = null, int? maxCommits = null)
+        {
+            GitExtensions.DumpGraph(repository.ToGitRepository().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)
         {
             configuration ??= new ConfigurationBuilder().Build();
@@ -56,19 +61,19 @@ public static VersionVariables GetVersion(this RepositoryFixtureBase fixture, Co
             var nextVersionCalculator = sp.GetService<INextVersionCalculator>();
             var contextOptions = sp.GetService<Lazy<GitVersionContext>>();
 
-            var context = contextOptions.Value;
+            var context = contextOptions!.Value;
 
             try
             {
-                var semanticVersion = nextVersionCalculator.FindVersion();
-                var variables = variableProvider.GetVariablesFor(semanticVersion, context.Configuration, context.IsCurrentCommitTagged);
+                var semanticVersion = nextVersionCalculator!.FindVersion();
+                var variables = variableProvider!.GetVariablesFor(semanticVersion, context.Configuration, context.IsCurrentCommitTagged);
 
                 return variables;
             }
             catch (Exception)
             {
                 Console.WriteLine("Test failing, dumping repository graph");
-                new GitRepository(repository).DumpGraph();
+                repository.DumpGraph();
                 throw;
             }
         }
@@ -95,7 +100,7 @@ public static void AssertFullSemver(this RepositoryFixtureBase fixture, string f
             }
             catch (Exception)
             {
-                new GitRepository(repository ?? fixture.Repository).DumpGraph();
+                (repository ?? fixture.Repository).DumpGraph();
                 throw;
             }
             if (commitId == null)
@@ -125,7 +130,7 @@ public static void InitializeRepo(this RemoteRepositoryFixture fixture)
             });
 
             var gitPreparer = serviceProvider.GetService<IGitPreparer>();
-            gitPreparer.Prepare();
+            gitPreparer!.Prepare();
         }
 
         private static IServiceProvider ConfigureServices(Action<IServiceCollection> servicesOverrides = null)
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;
 using GitVersionCore.Tests.Helpers;
 using NUnit.Framework;
 using Shouldly;
@@ -402,8 +401,7 @@ public void GitHubFlowMajorRelease()
             fixture.ApplyTag("2.0.0");
             fixture.AssertFullSemver("2.0.0");
             fixture.MakeACommit();
-            var fixtureRepository = new GitRepository(fixture.Repository);
-            fixtureRepository.DumpGraph();
+            fixture.Repository.DumpGraph();
             fixture.AssertFullSemver("2.0.1+1");
         }
     }
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;
 using GitVersionCore.Tests.Helpers;
 using LibGit2Sharp;
 using NUnit.Framework;
@@ -19,7 +18,7 @@ public void CanCalculatePullRequestChanges()
 
             fixture.Repository.CreatePullRequestRef("feature/Foo", "master", normalise: true);
 
-            new GitRepository(fixture.Repository).DumpGraph();
+            fixture.Repository.DumpGraph();
             fixture.AssertFullSemver("0.1.1-PullRequest0002.2");
         }
 
@@ -35,7 +34,7 @@ public void CanCalculatePullRequestChangesInheritingConfig()
 
             fixture.Repository.CreatePullRequestRef("feature/Foo", "develop", 44, normalise: true);
 
-            new GitRepository(fixture.Repository).DumpGraph();
+            fixture.Repository.DumpGraph();
             fixture.AssertFullSemver("0.2.0-PullRequest0044.3");
         }
 
@@ -50,7 +49,7 @@ public void CanCalculatePullRequestChangesFromRemoteRepo()
 
             fixture.Repository.CreatePullRequestRef("feature/Foo", "master", normalise: true);
 
-            new GitRepository(fixture.Repository).DumpGraph();
+            fixture.Repository.DumpGraph();
             fixture.AssertFullSemver("0.1.1-PullRequest0002.2");
         }
 
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, new GitRepository(fixture.Repository), dummyBranchName, config);
+            var context = GetGitVersionContext(fixture.RepositoryPath, fixture.Repository.ToGitRepository(), dummyBranchName, config);
 
             context.Configuration.Increment.ShouldBe(alternateExpected ?? increment);
         }
@@ -176,7 +176,7 @@ public void CanFindParentBranchForInheritingIncrementStrategy()
             Commands.Checkout(fixture.Repository, featureBranch);
             fixture.Repository.MakeACommit();
 
-            var context = GetGitVersionContext(fixture.RepositoryPath, new GitRepository(fixture.Repository), "develop", config);
+            var context = GetGitVersionContext(fixture.RepositoryPath, fixture.Repository.ToGitRepository(), "develop", config);
 
             context.Configuration.Increment.ShouldBe(IncrementStrategy.Major);
         }
diff --git a/src/GitVersionCore.Tests/VersionCalculation/NextVersionCalculatorTests.cs b/src/GitVersionCore.Tests/VersionCalculation/NextVersionCalculatorTests.cs
@@ -301,7 +301,7 @@ public void PreReleaseNumberShouldBeScopeToPreReleaseLabelInContinuousDelivery()
             fixture.AssertFullSemver("0.1.0-test.2+2", config);
 
             Commands.Checkout(fixture.Repository, "master");
-            fixture.Repository.Merge((Branch)new GitRepository(fixture.Repository).FindBranch("feature/test"), Generate.SignatureNow());
+            fixture.Repository.Merge("feature/test", Generate.SignatureNow());
 
             fixture.AssertFullSemver("0.1.0-beta.1+2", config);
         }
diff --git a/src/GitVersionCore.Tests/VersionCalculation/Strategies/VersionInBranchNameBaseVersionStrategyTests.cs b/src/GitVersionCore.Tests/VersionCalculation/Strategies/VersionInBranchNameBaseVersionStrategyTests.cs
@@ -23,7 +23,7 @@ public void CanTakeVersionFromNameOfReleaseBranch(string branchName, string expe
             fixture.Repository.MakeACommit();
             fixture.Repository.CreateBranch(branchName);
 
-            var strategy = GetVersionStrategy(fixture.RepositoryPath, new GitRepository(fixture.Repository), branchName);
+            var strategy = GetVersionStrategy(fixture.RepositoryPath, fixture.Repository.ToGitRepository(), branchName);
             var baseVersion = strategy.GetVersions().Single();
 
             baseVersion.SemanticVersion.ToString().ShouldBe(expectedBaseVersion);
@@ -39,7 +39,7 @@ public void ShouldNotTakeVersionFromNameOfNonReleaseBranch(string branchName)
             fixture.Repository.MakeACommit();
             fixture.Repository.CreateBranch(branchName);
 
-            var strategy = GetVersionStrategy(fixture.RepositoryPath, new GitRepository(fixture.Repository), branchName);
+            var strategy = GetVersionStrategy(fixture.RepositoryPath, fixture.Repository.ToGitRepository(), branchName);
             var baseVersions = strategy.GetVersions();
 
             baseVersions.ShouldBeEmpty();
@@ -57,7 +57,7 @@ public void CanTakeVersionFromNameOfConfiguredReleaseBranch(string branchName, s
                          .Add(new Config { Branches = { { "support", new BranchConfig { IsReleaseBranch = true } } } })
                          .Build();
 
-            var strategy = GetVersionStrategy(fixture.RepositoryPath, new GitRepository(fixture.Repository), branchName, config);
+            var strategy = GetVersionStrategy(fixture.RepositoryPath, fixture.Repository.ToGitRepository(), branchName, config);
 
             var baseVersion = strategy.GetVersions().Single();
 
@@ -76,7 +76,7 @@ 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, new GitRepository(fixture.Repository), branchName);
+            var strategy = GetVersionStrategy(fixture.RepositoryPath, fixture.Repository.ToGitRepository(), branchName);
             var baseVersion = strategy.GetVersions().Single();
 
             baseVersion.SemanticVersion.ToString().ShouldBe(expectedBaseVersion);
diff --git a/src/GitVersionCore.Tests/VersionCalculation/VersionSourceTests.cs b/src/GitVersionCore.Tests/VersionCalculation/VersionSourceTests.cs
@@ -67,7 +67,7 @@ public void VersionSourceShaUsingTag()
 
         private static INextVersionCalculator GetNextVersionCalculator(RepositoryFixtureBase fixture)
         {
-            var sp = BuildServiceProvider(fixture.RepositoryPath, new GitRepository(fixture.Repository), fixture.Repository.Head.CanonicalName);
+            var sp = BuildServiceProvider(fixture.RepositoryPath, fixture.Repository.ToGitRepository(), fixture.Repository.Head.CanonicalName);
             return sp.GetService<INextVersionCalculator>();
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ protected RepositoryFixtureBase(IRepository repository)`
`24`	`24`	`Repository.Config.Set("user.email", "[email protected]");`
`25`	`25`	`}`
`26`	`26`
`27`		`- public IRepository Repository { get; private set; }`
	`27`	`+ public IRepository Repository { get; }`
`28`	`28`
`29`	`29`	`public string RepositoryPath`
`30`	`30`	`{`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`	`using NUnit.Framework;`
`17`	`17`	`using Shouldly;`
`18`	`18`	`using Environment = System.Environment;`
	`19`	`+using RepositoryExtensions = GitVersion.RepositoryExtensions;`
`19`	`20`
`20`	`21`	`namespace GitVersionCore.Tests`
`21`	`22`	`{`
`@@ -255,7 +256,7 @@ public void CacheFileIsMissing()`
`255`	`256`	`var gitVersionOptions = new GitVersionOptions { WorkingDirectory = fixture.RepositoryPath };`
`256`	`257`
`257`	`258`	`fixture.Repository.MakeACommit();`
`258`		`- var gitVersionCalculator = GetGitVersionCalculator(gitVersionOptions, log, new GitRepository(fixture.Repository));`
	`259`	`+ var gitVersionCalculator = GetGitVersionCalculator(gitVersionOptions, log, fixture.Repository.ToGitRepository());`
`259`	`260`
`260`	`261`	`gitVersionCalculator.CalculateVersionVariables();`
`261`	`262`
`@@ -484,7 +485,7 @@ public void DynamicRepositoriesShouldNotErrorWithFailedToFindGitDirectory()`
`484`	`485`	`}`
`485`	`486`	`};`
`486`	`487`
`487`		`- var gitVersionCalculator = GetGitVersionCalculator(gitVersionOptions, repository: new GitRepository(fixture.Repository));`
	`488`	`+ var gitVersionCalculator = GetGitVersionCalculator(gitVersionOptions, repository: fixture.Repository.ToGitRepository());`
`488`	`489`	`gitPreparer.Prepare();`
`489`	`490`	`gitVersionCalculator.CalculateVersionVariables();`
`490`	`491`	`}`
`@@ -591,7 +592,7 @@ private static IServiceProvider GetServiceProvider(GitVersionOptions gitVersionO`
`591`	`592`	`if (environment != null) services.AddSingleton(environment);`
`592`	`593`	`var options = Options.Create(gitVersionOptions);`
`593`	`594`	`services.AddSingleton(options);`
`594`		`- services.AddSingleton<IGitRepositoryInfo>(new GitRepositoryInfo(options));`
	`595`	`+ services.AddSingleton(RepositoryExtensions.ToGitRepositoryInfo(options));`
`595`	`596`	`});`
`596`	`597`	`}`
`597`	`598`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,11 @@ public static void DumpGraph(this IGitRepository repository, Action<string> writ`
`29`	`29`	`GitExtensions.DumpGraph(repository.Path, writer, maxCommits);`
`30`	`30`	`}`
`31`	`31`
	`32`	`+ public static void DumpGraph(this IRepository repository, Action<string> writer = null, int? maxCommits = null)`
	`33`	`+ {`
	`34`	`+ GitExtensions.DumpGraph(repository.ToGitRepository().Path, writer, maxCommits);`
	`35`	`+ }`
	`36`	`+`
`32`	`37`	`public static VersionVariables GetVersion(this RepositoryFixtureBase fixture, Config configuration = null, IRepository repository = null, string commitId = null, bool onlyTrackedBranches = true, string branch = null)`
`33`	`38`	`{`
`34`	`39`	`configuration ??= new ConfigurationBuilder().Build();`
`@@ -56,19 +61,19 @@ public static VersionVariables GetVersion(this RepositoryFixtureBase fixture, Co`
`56`	`61`	`var nextVersionCalculator = sp.GetService<INextVersionCalculator>();`
`57`	`62`	`var contextOptions = sp.GetService<Lazy<GitVersionContext>>();`
`58`	`63`
`59`		`- var context = contextOptions.Value;`
	`64`	`+ var context = contextOptions!.Value;`
`60`	`65`
`61`	`66`	`try`
`62`	`67`	`{`
`63`		`- var semanticVersion = nextVersionCalculator.FindVersion();`
`64`		`- var variables = variableProvider.GetVariablesFor(semanticVersion, context.Configuration, context.IsCurrentCommitTagged);`
	`68`	`+ var semanticVersion = nextVersionCalculator!.FindVersion();`
	`69`	`+ var variables = variableProvider!.GetVariablesFor(semanticVersion, context.Configuration, context.IsCurrentCommitTagged);`
`65`	`70`
`66`	`71`	`return variables;`
`67`	`72`	`}`
`68`	`73`	`catch (Exception)`
`69`	`74`	`{`
`70`	`75`	`Console.WriteLine("Test failing, dumping repository graph");`
`71`		`- new GitRepository(repository).DumpGraph();`
	`76`	`+ repository.DumpGraph();`
`72`	`77`	`throw;`
`73`	`78`	`}`
`74`	`79`	`}`
`@@ -95,7 +100,7 @@ public static void AssertFullSemver(this RepositoryFixtureBase fixture, string f`
`95`	`100`	`}`
`96`	`101`	`catch (Exception)`
`97`	`102`	`{`
`98`		`- new GitRepository(repository ?? fixture.Repository).DumpGraph();`
	`103`	`+ (repository ?? fixture.Repository).DumpGraph();`
`99`	`104`	`throw;`
`100`	`105`	`}`
`101`	`106`	`if (commitId == null)`
`@@ -125,7 +130,7 @@ public static void InitializeRepo(this RemoteRepositoryFixture fixture)`
`125`	`130`	`});`
`126`	`131`
`127`	`132`	`var gitPreparer = serviceProvider.GetService<IGitPreparer>();`
`128`		`- gitPreparer.Prepare();`
	`133`	`+ gitPreparer!.Prepare();`
`129`	`134`	`}`
`130`	`135`
`131`	`136`	`private static IServiceProvider ConfigureServices(Action<IServiceCollection> servicesOverrides = null)`
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, new GitRepository(fixture.Repository), dummyBranchName, config);`
	`65`	`+ var context = GetGitVersionContext(fixture.RepositoryPath, fixture.Repository.ToGitRepository(), dummyBranchName, config);`
`66`	`66`
`67`	`67`	`context.Configuration.Increment.ShouldBe(alternateExpected ?? increment);`
`68`	`68`	`}`
`@@ -176,7 +176,7 @@ public void CanFindParentBranchForInheritingIncrementStrategy()`
`176`	`176`	`Commands.Checkout(fixture.Repository, featureBranch);`
`177`	`177`	`fixture.Repository.MakeACommit();`
`178`	`178`
`179`		`- var context = GetGitVersionContext(fixture.RepositoryPath, new GitRepository(fixture.Repository), "develop", config);`
	`179`	`+ var context = GetGitVersionContext(fixture.RepositoryPath, fixture.Repository.ToGitRepository(), "develop", config);`
`180`	`180`
`181`	`181`	`context.Configuration.Increment.ShouldBe(IncrementStrategy.Major);`
`182`	`182`	`}`
Original file line number	Diff line number	Diff line change
`@@ -301,7 +301,7 @@ public void PreReleaseNumberShouldBeScopeToPreReleaseLabelInContinuousDelivery()`
`301`	`301`	`fixture.AssertFullSemver("0.1.0-test.2+2", config);`
`302`	`302`
`303`	`303`	`Commands.Checkout(fixture.Repository, "master");`
`304`		`- fixture.Repository.Merge((Branch)new GitRepository(fixture.Repository).FindBranch("feature/test"), Generate.SignatureNow());`
	`304`	`+ fixture.Repository.Merge("feature/test", Generate.SignatureNow());`
`305`	`305`
`306`	`306`	`fixture.AssertFullSemver("0.1.0-beta.1+2", config);`
`307`	`307`	`}`