introduce GitRepository as IRepository implementation

Author: arturcic

src/GitVersionCore/Core/GitRepository.cs

@@ -0,0 +1,168 @@
+using System;
+using System.Collections.Generic;
+using LibGit2Sharp;
+using Microsoft.Extensions.Options;
+
+namespace GitVersion
+{
+    public class GitRepository : IRepository
+    {
+        private Lazy<IRepository> repositoryLazy;
+        private IRepository repositoryInstance => repositoryLazy.Value;
+
+        public GitRepository(IOptions<Arguments> options, IGitPreparer preparer)
+        {
+            repositoryLazy = new Lazy<IRepository>(() => InitRepository(options, preparer));
+        }
+
+        private static IRepository InitRepository(IOptions<Arguments> options, IGitPreparer preparer)
+        {
+            preparer.Prepare(); //we need to prepare the repository before using it for version calculation
+            return new Repository(options.Value.DotGitDirectory);
+        }
+
+        public void Dispose()
+        {
+            repositoryInstance.Dispose();
+        }
+
+        public void Checkout(Tree tree, IEnumerable<string> paths, CheckoutOptions opts)
+        {
+            repositoryInstance.Checkout(tree, paths, opts);
+        }
+
+        public void CheckoutPaths(string committishOrBranchSpec, IEnumerable<string> paths, CheckoutOptions checkoutOptions)
+        {
+            repositoryInstance.CheckoutPaths(committishOrBranchSpec, paths, checkoutOptions);
+        }
+
+        public GitObject Lookup(ObjectId id)
+        {
+            return repositoryInstance.Lookup(id);
+        }
+
+        public GitObject Lookup(string objectish)
+        {
+            return repositoryInstance.Lookup(objectish);
+        }
+
+        public GitObject Lookup(ObjectId id, ObjectType type)
+        {
+            return repositoryInstance.Lookup(id, type);
+        }
+
+        public GitObject Lookup(string objectish, ObjectType type)
+        {
+            return repositoryInstance.Lookup(objectish, type);
+        }
+
+        public Commit Commit(string message, Signature author, Signature committer, CommitOptions options)
+        {
+            return repositoryInstance.Commit(message, author, committer, options);
+        }
+
+        public void Reset(ResetMode resetMode, Commit commit)
+        {
+            repositoryInstance.Reset(resetMode, commit);
+        }
+
+        public void Reset(ResetMode resetMode, Commit commit, CheckoutOptions options)
+        {
+            repositoryInstance.Reset(resetMode, commit, options);
+        }
+
+        public void RemoveUntrackedFiles()
+        {
+            repositoryInstance.RemoveUntrackedFiles();
+        }
+
+        public RevertResult Revert(Commit commit, Signature reverter, RevertOptions options)
+        {
+            return repositoryInstance.Revert(commit, reverter, options);
+        }
+
+        public MergeResult Merge(Commit commit, Signature merger, MergeOptions options)
+        {
+            return repositoryInstance.Merge(commit, merger, options);
+        }
+
+        public MergeResult Merge(Branch branch, Signature merger, MergeOptions options)
+        {
+            return repositoryInstance.Merge(branch, merger, options);
+        }
+
+        public MergeResult Merge(string committish, Signature merger, MergeOptions options)
+        {
+            return repositoryInstance.Merge(committish, merger, options);
+        }
+
+        public MergeResult MergeFetchedRefs(Signature merger, MergeOptions options)
+        {
+            return repositoryInstance.MergeFetchedRefs(merger, options);
+        }
+
+        public CherryPickResult CherryPick(Commit commit, Signature committer, CherryPickOptions options)
+        {
+            return repositoryInstance.CherryPick(commit, committer, options);
+        }
+
+        public BlameHunkCollection Blame(string path, BlameOptions options)
+        {
+            return repositoryInstance.Blame(path, options);
+        }
+
+        public FileStatus RetrieveStatus(string filePath)
+        {
+            return repositoryInstance.RetrieveStatus(filePath);
+        }
+
+        public RepositoryStatus RetrieveStatus(StatusOptions options)
+        {
+            return repositoryInstance.RetrieveStatus(options);
+        }
+
+        public string Describe(Commit commit, DescribeOptions options)
+        {
+            return repositoryInstance.Describe(commit, options);
+        }
+
+        public void RevParse(string revision, out Reference reference, out GitObject obj)
+        {
+            repositoryInstance.RevParse(revision, out reference, out obj);
+        }
+
+        public Branch Head => repositoryInstance.Head;
+
+        public LibGit2Sharp.Configuration Config => repositoryInstance.Config;
+
+        public Index Index => repositoryInstance.Index;
+
+        public ReferenceCollection Refs => repositoryInstance.Refs;
+
+        public IQueryableCommitLog Commits => repositoryInstance.Commits;
+
+        public BranchCollection Branches => repositoryInstance.Branches;
+
+        public TagCollection Tags => repositoryInstance.Tags;
+
+        public RepositoryInformation Info => repositoryInstance.Info;
+
+        public Diff Diff => repositoryInstance.Diff;
+
+        public ObjectDatabase ObjectDatabase => repositoryInstance.ObjectDatabase;
+
+        public NoteCollection Notes => repositoryInstance.Notes;
+
+        public SubmoduleCollection Submodules => repositoryInstance.Submodules;
+
+        public WorktreeCollection Worktrees => repositoryInstance.Worktrees;
+
+        public Rebase Rebase => repositoryInstance.Rebase;
+
+        public Ignore Ignore => repositoryInstance.Ignore;
+
+        public Network Network => repositoryInstance.Network;
+
+        public StashCollection Stashes => repositoryInstance.Stashes;
+    }
+}

src/GitVersionCore/GitVersionCoreModule.cs

@@ -16,9 +16,11 @@ public class GitVersionCoreModule : IGitVersionModule
     {
         public void RegisterTypes(IServiceCollection services)
         {
+            services.AddSingleton<ILog, Log>();
             services.AddSingleton<IFileSystem, FileSystem>();
             services.AddSingleton<IEnvironment, Environment>();
-            services.AddSingleton<ILog, Log>();
+            services.AddSingleton<IRepository, GitRepository>();
+
             services.AddSingleton<IConsole, ConsoleAdapter>();
             services.AddSingleton<IGitVersionCache, GitVersionCache>();
 
@@ -41,12 +43,6 @@ public void RegisterTypes(IServiceCollection services)
 
             services.AddSingleton(sp => sp.GetService<IConfigFileLocatorFactory>().Create());
 
-            services.AddSingleton<IRepository>(sp =>
-            {
-                var options = sp.GetService<IOptions<Arguments>>();
-                return new Repository(options.Value.DotGitDirectory);
-            });
-
             services.AddSingleton(sp =>
             {
                 var options = sp.GetService<IOptions<Arguments>>();

src/GitVersionExe/GitVersionExecutor.cs

@@ -16,20 +16,18 @@ public class GitVersionExecutor : IGitVersionExecutor
         private readonly IExecCommand execCommand;
         private readonly IConfigProvider configProvider;
         private readonly IBuildServerResolver buildServerResolver;
-        private readonly IGitPreparer gitPreparer;
         private readonly IGitVersionCalculator gitVersionCalculator;
         private readonly IVersionWriter versionWriter;
 
         public GitVersionExecutor(ILog log, IConfigFileLocator configFileLocator, IConfigProvider configProvider,
-            IBuildServerResolver buildServerResolver, IGitPreparer gitPreparer, IGitVersionCalculator gitVersionCalculator,
+            IBuildServerResolver buildServerResolver, IGitVersionCalculator gitVersionCalculator,
             IVersionWriter versionWriter, IHelpWriter helpWriter, IExecCommand execCommand)
         {
             this.log = log ?? throw new ArgumentNullException(nameof(log));
             this.configFileLocator = configFileLocator ?? throw new ArgumentNullException(nameof(configFileLocator));
             this.configProvider = configProvider ?? throw new ArgumentNullException(nameof(configFileLocator));
 
             this.buildServerResolver = buildServerResolver ?? throw new ArgumentNullException(nameof(buildServerResolver));
-            this.gitPreparer = gitPreparer ?? throw new ArgumentNullException(nameof(gitPreparer));
             this.gitVersionCalculator = gitVersionCalculator ?? throw new ArgumentNullException(nameof(gitVersionCalculator));
 
             this.versionWriter = versionWriter ?? throw new ArgumentNullException(nameof(versionWriter));
@@ -56,7 +54,6 @@ private int VerifyArgumentsAndRun(Arguments arguments)
             {
                 if (HandleNonMainCommand(arguments, out var exitCode)) return exitCode;
 
-                gitPreparer.Prepare();
                 var variables = gitVersionCalculator.CalculateVersionVariables();
                 execCommand.Execute(variables);
             }

src/GitVersionTask/GitVersionTaskExecutor.cs

@@ -15,12 +15,11 @@ public class GitVersionTaskExecutor : IGitVersionTaskExecutor
         private readonly IBuildServerResolver buildServerResolver;
         private VersionVariables versionVariables;
 
-        public GitVersionTaskExecutor(IFileSystem fileSystem, ILog log, IBuildServerResolver buildServerResolver, IGitVersionCalculator gitVersionCalculator, IGitPreparer preparer)
+        public GitVersionTaskExecutor(IFileSystem fileSystem, ILog log, IBuildServerResolver buildServerResolver, IGitVersionCalculator gitVersionCalculator)
         {
             this.fileSystem = fileSystem ?? throw new ArgumentNullException(nameof(fileSystem));
             this.log = log ?? throw new ArgumentNullException(nameof(log));
             this.buildServerResolver = buildServerResolver ?? throw new ArgumentNullException(nameof(buildServerResolver));
-            preparer.Prepare();
             versionVariables = gitVersionCalculator.CalculateVersionVariables();
         }