Merge branch 'master' into feat/format-fallback

Author: asbjornu

src/GitVersionCore.Tests/DynamicRepositoryTests.cs

@@ -63,7 +63,7 @@ public void FindsVersionInDynamicRepo(string name, string url, string targetBran
             var arguments = new Arguments
             {
                 TargetUrl = url,
-                DynamicRepositoryLocation = dynamicDirectory,
+                DynamicRepositoryClonePath = dynamicDirectory,
                 TargetBranch = targetBranch,
                 NoFetch = false,
                 TargetPath = workingDirectory,
@@ -79,9 +79,10 @@ public void FindsVersionInDynamicRepo(string name, string url, string targetBran
                 services.AddSingleton(options);
             });
 
-
+            var gitPreparer = sp.GetService<IGitPreparer>();
             var gitVersionCalculator = sp.GetService<IGitVersionCalculator>();
 
+            gitPreparer.Prepare();
             var versionVariables = gitVersionCalculator.CalculateVersionVariables();
 
             Assert.AreEqual(expectedFullSemVer, versionVariables.FullSemVer);

src/GitVersionCore.Tests/GitToolsTestingExtensions.cs

@@ -20,7 +20,7 @@ public static class GitToolsTestingExtensions
 
         static GitToolsTestingExtensions() => sp = ConfigureService();
 
-        public static VersionVariables GetVersion(this RepositoryFixtureBase fixture, Config configuration = null, IRepository repository = null, string commitId = null, bool onlyTrackedBranches = true, string targetBranch = null)
+        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)
             {
@@ -32,12 +32,14 @@ public static VersionVariables GetVersion(this RepositoryFixtureBase fixture, Co
             var variableProvider = sp.GetService<IVariableProvider>();
             var nextVersionCalculator = sp.GetService<INextVersionCalculator>();
 
-            var gitVersionContext = new GitVersionContext(repository ?? fixture.Repository, log, targetBranch, configuration, onlyTrackedBranches, commitId);
-            var executeGitVersion = nextVersionCalculator.FindVersion(gitVersionContext);
-            var variables = variableProvider.GetVariablesFor(executeGitVersion, gitVersionContext.Configuration, gitVersionContext.IsCurrentCommitTagged);
-
+            repository ??= fixture.Repository;
+            var targetBranch = repository.GetTargetBranch(branch);
+            var gitVersionContext = new GitVersionContext(repository, log, targetBranch, configuration, onlyTrackedBranches, commitId);
             try
             {
+                var executeGitVersion = nextVersionCalculator.FindVersion(gitVersionContext);
+                var variables = variableProvider.GetVariablesFor(executeGitVersion, gitVersionContext.Configuration, gitVersionContext.IsCurrentCommitTagged);
+
                 return variables;
             }
             catch (Exception)
@@ -91,8 +93,8 @@ public static void InitializeRepo(this RemoteRepositoryFixture fixture)
                 services.AddSingleton(options);
             });
 
-            var gitPreparer = serviceProvider.GetService<IGitPreparer>();
-            gitPreparer.Prepare(true, null);
+            var gitPreparer = serviceProvider.GetService<IGitPreparer>() as GitPreparer;
+            gitPreparer?.PrepareInternal(true, null);
         }
 
         private static IServiceProvider ConfigureService(Action<IServiceCollection> servicesOverrides = null)

src/GitVersionCore.Tests/GitVersionExecutorTests.cs

@@ -5,6 +5,7 @@
 using GitVersion;
 using GitVersion.Cache;
 using GitVersion.Configuration;
+using GitVersion.Extensions;
 using GitVersion.Logging;
 using GitVersionCore.Tests.Helpers;
 using LibGit2Sharp;
@@ -23,6 +24,7 @@ public class GitVersionExecutorTests : TestBase
         private IFileSystem fileSystem;
         private ILog log;
         private IGitVersionCache gitVersionCache;
+        private IGitPreparer gitPreparer;
         private IServiceProvider sp;
 
         [Test]
@@ -40,12 +42,12 @@ public void CacheKeySameAfterReNormalizing()
 
             sp = GetServiceProvider(arguments);
 
-            var gitPreparer = sp.GetService<IGitPreparer>();
+            var preparer = sp.GetService<IGitPreparer>() as GitPreparer;
 
-            gitPreparer.Prepare(true, targetBranch);
+            preparer?.PrepareInternal(true, targetBranch);
             var cacheKeyFactory = sp.GetService<IGitVersionCacheKeyFactory>();
             var cacheKey1 = cacheKeyFactory.Create(null);
-            gitPreparer.Prepare(true, targetBranch);
+            preparer?.PrepareInternal(true, targetBranch);
             var cacheKey2 = cacheKeyFactory.Create(null);
 
             cacheKey2.Value.ShouldBe(cacheKey1.Value);
@@ -240,7 +242,7 @@ public void CacheFileIsMissing()
             var gitVersionCalculator = GetGitVersionCalculator(arguments, log);
 
             fixture.Repository.MakeACommit();
-            _ = gitVersionCalculator.CalculateVersionVariables();
+            gitVersionCalculator.CalculateVersionVariables();
 
             var logsMessages = stringBuilder.ToString();
             logsMessages.ShouldContain("yml not found", () => logsMessages);
@@ -401,9 +403,7 @@ public void GetProjectRootDirectoryWorkingDirectoryWithWorktree()
 
                 sp = GetServiceProvider(arguments);
 
-                var gitPreparer = sp.GetService<IGitPreparer>();
-
-                gitPreparer.GetProjectRootDirectoryInternal().TrimEnd('/', '\\').ShouldBe(worktreePath);
+                arguments.GetProjectRootDirectory().TrimEnd('/', '\\').ShouldBe(worktreePath);
             }
             finally
             {
@@ -425,9 +425,8 @@ public void GetProjectRootDirectoryNoWorktree()
 
             sp = GetServiceProvider(arguments);
 
-            var gitPreparer = sp.GetService<IGitPreparer>();
             var expectedPath = fixture.RepositoryPath.TrimEnd('/', '\\');
-            gitPreparer.GetProjectRootDirectoryInternal().TrimEnd('/', '\\').ShouldBe(expectedPath);
+            arguments.GetProjectRootDirectory().TrimEnd('/', '\\').ShouldBe(expectedPath);
         }
 
         [Test]
@@ -442,7 +441,7 @@ public void DynamicRepositoriesShouldNotErrorWithFailedToFindGitDirectory()
             };
 
             var gitVersionCalculator = GetGitVersionCalculator(arguments);
-
+            gitPreparer.Prepare();
             gitVersionCalculator.CalculateVersionVariables();
         }
 
@@ -460,9 +459,8 @@ public void GetDotGitDirectoryNoWorktree()
 
             sp = GetServiceProvider(arguments);
 
-            var gitPreparer = sp.GetService<IGitPreparer>();
             var expectedPath = Path.Combine(fixture.RepositoryPath, ".git");
-            gitPreparer.GetDotGitDirectory().ShouldBe(expectedPath);
+            arguments.GetDotGitDirectory().ShouldBe(expectedPath);
         }
 
         [Test]
@@ -490,9 +488,8 @@ public void GetDotGitDirectoryWorktree()
 
                 sp = GetServiceProvider(arguments);
 
-                var gitPreparer = sp.GetService<IGitPreparer>();
                 var expectedPath = Path.Combine(fixture.RepositoryPath, ".git");
-                gitPreparer.GetDotGitDirectory().ShouldBe(expectedPath);
+                arguments.GetDotGitDirectory().ShouldBe(expectedPath);
             }
             finally
             {
@@ -507,6 +504,7 @@ private IGitVersionCalculator GetGitVersionCalculator(Arguments arguments, ILog
             fileSystem = sp.GetService<IFileSystem>();
             log = sp.GetService<ILog>();
             gitVersionCache = sp.GetService<IGitVersionCache>();
+            gitPreparer = sp.GetService<IGitPreparer>();
 
             return sp.GetService<IGitVersionCalculator>();
         }

src/GitVersionCore/Arguments.cs

@@ -19,7 +19,8 @@ public class Arguments
         public string TargetUrl;
         public string TargetBranch;
         public string CommitId;
-        public string DynamicRepositoryLocation;
+        public string DynamicRepositoryClonePath;
+        public string DynamicGitRepositoryPath;
 
         public bool Init;
         public bool Diag;
@@ -50,6 +51,7 @@ public class Arguments
         public bool UpdateAssemblyInfo;
         public ISet<string> UpdateAssemblyInfoFileName = new HashSet<string>();
         public bool EnsureAssemblyInfo;
+
         public void AddAssemblyInfoFileName(string fileName)
         {
             UpdateAssemblyInfoFileName.Add(fileName);

src/GitVersionCore/BranchCommit.cs

@@ -5,7 +5,7 @@ namespace GitVersion
     /// <summary>
     /// A commit, together with the branch to which the commit belongs.
     /// </summary>
-    public struct BranchCommit
+    public readonly struct BranchCommit
     {
         public static readonly BranchCommit Empty = new BranchCommit();
 
@@ -18,7 +18,7 @@ public BranchCommit(Commit commit, Branch branch) : this()
         public Branch Branch { get; }
         public Commit Commit { get; }
 
-        public bool Equals(BranchCommit other)
+        private bool Equals(BranchCommit other)
         {
             return Equals(Branch, other.Branch) && Equals(Commit, other.Commit);
         }

src/GitVersionCore/Cache/GitVersionCache.cs

@@ -2,9 +2,11 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using GitVersion.Extensions;
 using GitVersion.Helpers;
 using GitVersion.Logging;
 using GitVersion.OutputVariables;
+using Microsoft.Extensions.Options;
 using YamlDotNet.Serialization;
 
 namespace GitVersion.Cache
@@ -13,13 +15,13 @@ public class GitVersionCache : IGitVersionCache
     {
         private readonly IFileSystem fileSystem;
         private readonly ILog log;
-        private readonly IGitPreparer gitPreparer;
+        private readonly IOptions<Arguments> options;
 
-        public GitVersionCache(IFileSystem fileSystem, ILog log, IGitPreparer gitPreparer)
+        public GitVersionCache(IFileSystem fileSystem, ILog log, IOptions<Arguments> options)
         {
             this.fileSystem = fileSystem ?? throw new ArgumentNullException(nameof(fileSystem));
             this.log = log ?? throw new ArgumentNullException(nameof(log));
-            this.gitPreparer = gitPreparer ?? throw new ArgumentNullException(nameof(gitPreparer));
+            this.options = options ?? throw new ArgumentNullException(nameof(options));
         }
 
         public void WriteVariablesToDiskCache(GitVersionCacheKey cacheKey, VersionVariables variablesFromCache)
@@ -52,7 +54,7 @@ void WriteCacheOperation()
 
         public string GetCacheDirectory()
         {
-            var gitDir = gitPreparer.GetDotGitDirectory();
+            var gitDir = options.Value.GetDotGitDirectory();
             var cacheDir = Path.Combine(gitDir, "gitversion_cache");
             return cacheDir;
         }

src/GitVersionCore/Cache/GitVersionCacheKeyFactory.cs

@@ -5,8 +5,10 @@
 using System.Security.Cryptography;
 using System.Text;
 using GitVersion.Configuration;
+using GitVersion.Extensions;
 using GitVersion.Logging;
 using LibGit2Sharp;
+using Microsoft.Extensions.Options;
 
 namespace GitVersion.Cache
 {
@@ -19,15 +21,15 @@ public class GitVersionCacheKeyFactory : IGitVersionCacheKeyFactory
     {
         private readonly IFileSystem fileSystem;
         private readonly ILog log;
-        private readonly IGitPreparer gitPreparer;
+        private readonly IOptions<Arguments> options;
         private readonly IConfigFileLocator configFileLocator;
 
-        public GitVersionCacheKeyFactory(IFileSystem fileSystem, ILog log, IGitPreparer gitPreparer, IConfigFileLocator configFileLocator)
+        public GitVersionCacheKeyFactory(IFileSystem fileSystem, ILog log, IOptions<Arguments> options, IConfigFileLocator configFileLocator)
         {
-            this.fileSystem = fileSystem;
-            this.log = log;
-            this.gitPreparer = gitPreparer;
-            this.configFileLocator = configFileLocator;
+            this.fileSystem = fileSystem ?? throw new ArgumentNullException(nameof(fileSystem));
+            this.log = log ?? throw new ArgumentNullException(nameof(log));
+            this.options = options ?? throw new ArgumentNullException(nameof(options));
+            this.configFileLocator = configFileLocator ?? throw new ArgumentNullException(nameof(configFileLocator));
         }
 
         public GitVersionCacheKey Create(Config overrideConfig)
@@ -43,7 +45,7 @@ public GitVersionCacheKey Create(Config overrideConfig)
 
         private string GetGitSystemHash()
         {
-            var dotGitDirectory = gitPreparer.GetDotGitDirectory();
+            var dotGitDirectory = options.Value.GetDotGitDirectory();
 
             // traverse the directory and get a list of files, use that for GetHash
             var contents = CalculateDirectoryContents(Path.Combine(dotGitDirectory, "refs"));
@@ -80,13 +82,13 @@ private List<string> CalculateDirectoryContents(string root)
                     subDirs = Directory.GetDirectories(currentDir);
                 }
                 // An UnauthorizedAccessException exception will be thrown if we do not have
-                // discovery permission on a folder or file. It may or may not be acceptable 
-                // to ignore the exception and continue enumerating the remaining files and 
-                // folders. It is also possible (but unlikely) that a DirectoryNotFound exception 
+                // discovery permission on a folder or file. It may or may not be acceptable
+                // to ignore the exception and continue enumerating the remaining files and
+                // folders. It is also possible (but unlikely) that a DirectoryNotFound exception
                 // will be raised. This will happen if currentDir has been deleted by
-                // another application or thread after our call to Directory.Exists. The 
-                // choice of which exceptions to catch depends entirely on the specific task 
-                // you are intending to perform and also on how much you know with certainty 
+                // another application or thread after our call to Directory.Exists. The
+                // choice of which exceptions to catch depends entirely on the specific task
+                // you are intending to perform and also on how much you know with certainty
                 // about the systems on which this code will run.
                 catch (UnauthorizedAccessException e)
                 {
@@ -143,7 +145,7 @@ private List<string> CalculateDirectoryContents(string root)
 
         private string GetRepositorySnapshotHash()
         {
-            using var repo = new Repository(gitPreparer.GetDotGitDirectory());
+            using var repo = new Repository(options.Value.GetDotGitDirectory());
 
             var head = repo.Head;
             if (head.Tip == null)
@@ -161,7 +163,7 @@ private static string GetOverrideConfigHash(Config overrideConfig)
                 return string.Empty;
             }
 
-            // Doesn't depend on command line representation and 
+            // Doesn't depend on command line representation and
             // includes possible changes in default values of Config per se.
             var stringBuilder = new StringBuilder();
             using (var stream = new StringWriter(stringBuilder))
@@ -176,9 +178,9 @@ private static string GetOverrideConfigHash(Config overrideConfig)
 
         private string GetConfigFileHash()
         {
-            // will return the same hash even when config file will be moved 
+            // will return the same hash even when config file will be moved
             // from workingDirectory to rootProjectDirectory. It's OK. Config essentially is the same.
-            var configFilePath = configFileLocator.SelectConfigFilePath(gitPreparer);
+            var configFilePath = configFileLocator.SelectConfigFilePath(options.Value);
             if (!fileSystem.Exists(configFilePath))
             {
                 return string.Empty;

src/GitVersionCore/Configuration/ConfigFileLocator.cs

@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using GitVersion.Extensions;
 
 namespace GitVersion.Configuration
 {
@@ -18,10 +19,10 @@ protected ConfigFileLocator(IFileSystem fileSystem)
 
         public abstract void Verify(string workingDirectory, string projectRootDirectory);
 
-        public string SelectConfigFilePath(IGitPreparer gitPreparer)
+        public string SelectConfigFilePath(Arguments arguments)
         {
-            var workingDirectory = gitPreparer.GetWorkingDirectory();
-            var projectRootDirectory = gitPreparer.GetProjectRootDirectory();
+            var workingDirectory = arguments.GetWorkingDirectory();
+            var projectRootDirectory = arguments.GetProjectRootDirectory();
 
             return GetConfigFilePath(HasConfigFileAt(workingDirectory) ? workingDirectory : projectRootDirectory);
         }
@@ -39,17 +40,17 @@ public Config ReadConfig(string workingDirectory)
             return new Config();
         }
 
-        public void Verify(IGitPreparer gitPreparer)
+        public void Verify(Arguments arguments)
         {
-            if (!string.IsNullOrWhiteSpace(gitPreparer.GetTargetUrl()))
+            if (!string.IsNullOrWhiteSpace(arguments.GetTargetUrl()))
             {
                 // Assuming this is a dynamic repository. At this stage it's unsure whether we have
                 // any .git info so we need to skip verification
                 return;
             }
 
-            var workingDirectory = gitPreparer.GetWorkingDirectory();
-            var projectRootDirectory = gitPreparer.GetProjectRootDirectory();
+            var workingDirectory = arguments.GetWorkingDirectory();
+            var projectRootDirectory = arguments.GetProjectRootDirectory();
 
             Verify(workingDirectory, projectRootDirectory);
         }