decouple GitRepository from GitRepositoryInfo

Author: arturcic

src/GitVersion.Core.Tests/Core/GitVersionExecutorTests.cs

@@ -588,6 +588,6 @@ private static IServiceProvider GetServiceProvider(GitVersionOptions gitVersionO
             if (environment != null) services.AddSingleton(environment);
             var options = Options.Create(gitVersionOptions);
             services.AddSingleton(options);
-            services.AddSingleton(RepositoryExtensions.ToGitRepositoryInfo(options));
+            services.AddSingleton<IGitRepositoryInfo>(new GitRepositoryInfo(options));
         });
 }

src/GitVersion.Core.Tests/Extensions/GitToolsTestingExtensions.cs

@@ -1,6 +1,7 @@
 using GitVersion.Configuration;
 using GitVersion.Core.Tests.Helpers;
 using GitVersion.Extensions;
+using GitVersion.Logging;
 using GitVersion.OutputVariables;
 using GitVersion.VersionCalculation;
 using LibGit2Sharp;
@@ -138,6 +139,13 @@ public static void InitializeRepo(this RemoteRepositoryFixture fixture)
         gitPreparer.Prepare();
     }
 
+    internal static IGitRepository ToGitRepository(this IRepository repository)
+    {
+        var gitRepository = new GitRepository(new NullLog());
+        gitRepository.DiscoverRepository(repository.Info.Path);
+        return gitRepository;
+    }
+
     private static IServiceProvider ConfigureServices(Action<IServiceCollection>? servicesOverrides = null)
     {
         var services = new ServiceCollection()

src/GitVersion.Core.Tests/IntegrationTests/HotfixBranchScenarios.cs

@@ -55,7 +55,7 @@ public void CanTakeVersionFromHotfixesBranch()
         });
         // Merge hotfix branch to support
         Commands.Checkout(fixture.Repository, MainBranch);
-        Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("support-1.1", (Commit)fixture.Repository.Tags.Single(t => t.FriendlyName == "1.1.0").Target));
+        Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("support-1.1", (LibGit2Sharp.Commit)fixture.Repository.Tags.Single(t => t.FriendlyName == "1.1.0").Target));
         fixture.AssertFullSemver("1.1.0");
 
         // create hotfix branch
@@ -80,7 +80,7 @@ public void PatchOlderReleaseExample()
         // Merge hotfix branch to support
         Commands.Checkout(fixture.Repository, MainBranch);
         var tag = fixture.Repository.Tags.Single(t => t.FriendlyName == "1.1.0");
-        var supportBranch = fixture.Repository.CreateBranch("support-1.1", (Commit)tag.Target);
+        var supportBranch = fixture.Repository.CreateBranch("support-1.1", (LibGit2Sharp.Commit)tag.Target);
         Commands.Checkout(fixture.Repository, supportBranch);
         fixture.AssertFullSemver("1.1.0");
 

src/GitVersion.Core/Git/IGitRepository.cs

@@ -14,4 +14,5 @@ public interface IGitRepository
 
     ICommit? FindMergeBase(ICommit commit, ICommit otherCommit);
     int GetNumberOfUncommittedChanges();
+    void DiscoverRepository(string? gitDirectory);
 }

src/GitVersion.Core/PublicAPI.Unshipped.txt

@@ -457,6 +457,7 @@ GitVersion.IGitPreparer.Prepare() -> void
 GitVersion.IGitRepository
 GitVersion.IGitRepository.Branches.get -> GitVersion.IBranchCollection!
 GitVersion.IGitRepository.Commits.get -> GitVersion.ICommitCollection!
+GitVersion.IGitRepository.DiscoverRepository(string? gitDirectory) -> void
 GitVersion.IGitRepository.FindMergeBase(GitVersion.ICommit! commit, GitVersion.ICommit! otherCommit) -> GitVersion.ICommit?
 GitVersion.IGitRepository.GetNumberOfUncommittedChanges() -> int
 GitVersion.IGitRepository.Head.get -> GitVersion.IBranch!

src/GitVersion.LibGit2Sharp/Git/GitRepository.cs

@@ -9,32 +9,28 @@ namespace GitVersion;
 internal sealed class GitRepository : IMutatingGitRepository
 {
     private readonly ILog log;
-    private readonly Lazy<IRepository> repositoryLazy;
+    private Lazy<IRepository> repositoryLazy;
 
-    public GitRepository(ILog log, IGitRepositoryInfo repositoryInfo)
-        : this(log, () => repositoryInfo.GitRootPath)
-    {
-    }
-
-    internal GitRepository(string gitRootDirectory)
-        : this(new NullLog(), () => gitRootDirectory)
-    {
-    }
+    public GitRepository(ILog log) => this.log = log;
 
-    internal GitRepository(IRepository repository)
+    public void DiscoverRepository(string? gitDirectory)
     {
-        repository = repository.NotNull();
-        this.log = new NullLog();
-        this.repositoryLazy = new Lazy<IRepository>(() => repository);
+        if (gitDirectory != null && !gitDirectory.EndsWith(".git"))
+        {
+            gitDirectory = Repository.Discover(gitDirectory);
+        }
+        this.repositoryLazy = new Lazy<IRepository>(() => new Repository(gitDirectory));
     }
 
-    private GitRepository(ILog log, Func<string?> getGitRootDirectory)
+    private IRepository RepositoryInstance
     {
-        this.log = log.NotNull();
-        this.repositoryLazy = new Lazy<IRepository>(() => new Repository(getGitRootDirectory()));
+        get
+        {
+            var lazy = this.repositoryLazy ?? throw new NullReferenceException("Repository not initialized. Call DiscoverRepository() first.");
+            return lazy.Value;
+        }
     }
 
-    private IRepository RepositoryInstance => this.repositoryLazy.Value;
     public string Path => RepositoryInstance.Info.Path;
     public string WorkingDirectory => RepositoryInstance.Info.WorkingDirectory;
     public bool IsHeadDetached => RepositoryInstance.Info.IsHeadDetached;

src/GitVersion.LibGit2Sharp/Git/GitRepositoryInfo.cs

@@ -1,5 +1,6 @@
 using GitVersion.Extensions;
 using GitVersion.Helpers;
+using LibGit2Sharp;
 using Microsoft.Extensions.Options;
 
 namespace GitVersion;
@@ -90,7 +91,7 @@ private string GetProjectRootDirectory()
         if (gitDirectory.IsNullOrEmpty())
             throw new DirectoryNotFoundException("Cannot find the .git directory");
 
-        return new GitRepository(gitDirectory).WorkingDirectory;
+        return new Repository(gitDirectory).Info.WorkingDirectory;
     }
 
     private string? GetGitRootPath()
@@ -105,8 +106,8 @@ private static bool GitRepoHasMatchingRemote(string possiblePath, string targetU
     {
         try
         {
-            var gitRepository = new GitRepository(possiblePath);
-            return gitRepository.Remotes.Any(r => r.Url == targetUrl);
+            var gitRepository = new Repository(possiblePath);
+            return gitRepository.Network.Remotes.Any(r => r.Url == targetUrl);
         }
         catch (Exception)
         {

src/GitVersion.LibGit2Sharp/GitVersion.LibGit2Sharp.csproj

@@ -7,4 +7,9 @@
     <ItemGroup>
         <ProjectReference Include="..\GitVersion.Core\GitVersion.Core.csproj"/>
     </ItemGroup>
+
+    <ItemGroup>
+        <InternalsVisibleTo Include="GitVersion.Core.Tests" />
+        <InternalsVisibleTo Include="GitVersion.MsBuild.Tests" />
+    </ItemGroup>
 </Project>

src/GitVersion.LibGit2Sharp/GitVersionLibGit2SharpModule.cs

@@ -1,3 +1,4 @@
+using GitVersion.Logging;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace GitVersion;
@@ -6,8 +7,16 @@ public class GitVersionLibGit2SharpModule : IGitVersionModule
 {
     public void RegisterTypes(IServiceCollection services)
     {
-        services.AddSingleton<IGitRepository, GitRepository>();
-        services.AddSingleton<IMutatingGitRepository, GitRepository>();
+        services.AddSingleton<IGitRepository>(sp =>
+        {
+            var repositoryInfo = sp.GetRequiredService<IGitRepositoryInfo>();
+            var log = sp.GetRequiredService<ILog>();
+            IGitRepository gitRepository = new GitRepository(log);
+            gitRepository.DiscoverRepository(repositoryInfo.GitRootPath);
+            return gitRepository;
+        });
+
+        services.AddSingleton<IMutatingGitRepository>(sp => (IMutatingGitRepository)sp.GetRequiredService<IGitRepository>());
         services.AddSingleton<IGitRepositoryInfo, GitRepositoryInfo>();
     }
 }

src/GitVersion.LibGit2Sharp/PublicAPI.Unshipped.txt

@@ -3,7 +3,3 @@ GitVersion.GitVersionLibGit2SharpModule
 GitVersion.GitVersionLibGit2SharpModule.GitVersionLibGit2SharpModule() -> void
 GitVersion.GitVersionLibGit2SharpModule.RegisterTypes(Microsoft.Extensions.DependencyInjection.IServiceCollection! services) -> void
 GitVersion.RepositoryExtensions
-static GitVersion.RepositoryExtensions.RunSafe(System.Action! operation) -> void
-static GitVersion.RepositoryExtensions.RunSafe<T>(System.Func<T>! operation) -> T
-static GitVersion.RepositoryExtensions.ToGitRepository(this LibGit2Sharp.IRepository! repository) -> GitVersion.IGitRepository!
-static GitVersion.RepositoryExtensions.ToGitRepositoryInfo(Microsoft.Extensions.Options.IOptions<GitVersion.GitVersionOptions!>! options) -> GitVersion.IGitRepositoryInfo!