moved IGitRepositoryCommands into IGitRepository

arturcic · arturcic · commit edf359315298 · 2021-01-07T15:22:46.000+01:00
diff --git a/src/GitVersionCore.Tests/Core/RepositoryExtensionsTests.cs b/src/GitVersionCore.Tests/Core/RepositoryExtensionsTests.cs
@@ -61,7 +61,7 @@ private static void EnsureLocalBranchExistsForCurrentBranch(IGitRepository repo,
                 repo.Refs.UpdateTarget(localRef, repoTipId);
             }
 
-            repo.Commands.Checkout(localCanonicalName);
+            repo.Checkout(localCanonicalName);
         }
 
         [Test]
@@ -77,8 +77,6 @@ public void EnsureLocalBranchExistsForCurrentBranch_CaseInsensitivelyMatchesBran
         private static IGitRepository MockRepository()
         {
             var repository = Substitute.For<IGitRepository>();
-            var commands = Substitute.For<IGitRepositoryCommands>();
-            repository.Commands.Returns(commands);
             return repository;
         }
 
diff --git a/src/GitVersionCore.Tests/Mocks/MockRepository.cs b/src/GitVersionCore.Tests/Mocks/MockRepository.cs
@@ -8,8 +8,6 @@ namespace GitVersionCore.Tests.Mocks
     public class MockRepository : IGitRepository
     {
         private CommitCollection commits;
-        public IGitRepositoryCommands Commands { get; }
-
         public MockRepository()
         {
             Tags = new MockTagCollection();
@@ -75,6 +73,18 @@ public CommitCollection GetCommitLog(Commit baseVersionSource, Commit currentCom
         {
             throw new NotImplementedException();
         }
+        public void Checkout(string committishOrBranchSpec)
+        {
+            throw new NotImplementedException();
+        }
+        public void Checkout(Branch branch)
+        {
+            throw new NotImplementedException();
+        }
+        public void Fetch(string remote, IEnumerable<string> refspecs, AuthenticationInfo auth, string logMessage)
+        {
+            throw new NotImplementedException();
+        }
         public Remote EnsureOnlyOneRemoteIsDefined(ILog log) => throw new NotImplementedException();
         public void Dispose() => throw new NotImplementedException();
     }
diff --git a/src/GitVersionCore/Core/Abstractions/IGitRepository.cs b/src/GitVersionCore/Core/Abstractions/IGitRepository.cs
@@ -9,7 +9,6 @@ public interface IGitRepository : IDisposable
         string Path { get; }
         string WorkingDirectory { get; }
         bool IsHeadDetached { get; }
-        IGitRepositoryCommands Commands { get; }
         Branch Head { get; }
         CommitCollection Commits { get; }
         BranchCollection Branches { get; }
@@ -31,5 +30,9 @@ public interface IGitRepository : IDisposable
         Commit GetBaseVersionSource(Commit currentBranchTip);
         List<Commit> GetMainlineCommitLog(Commit baseVersionSource, Commit mainlineTip);
         CommitCollection GetCommitLog(Commit baseVersionSource, Commit currentCommit);
+
+        void Checkout(string committishOrBranchSpec);
+        void Checkout(Branch branch);
+        void Fetch(string remote, IEnumerable<string> refspecs, AuthenticationInfo auth, string logMessage);
     }
 }
diff --git a/src/GitVersionCore/Core/Abstractions/IGitRepositoryCommands.cs b/src/GitVersionCore/Core/Abstractions/IGitRepositoryCommands.cs
diff --git a/src/GitVersionCore/Core/GitPreparer.cs b/src/GitVersionCore/Core/GitPreparer.cs
@@ -157,7 +157,7 @@ private void NormalizeGitDirectory(string gitDirectory, bool noFetch, string cur
                 else
                 {
                     log.Info($"Fetching from remote '{remote.Name}' using the following refspecs: {remote.RefSpecs}.");
-                    repository.Commands.Fetch(remote.Name, new string[0], authentication, null);
+                    repository.Fetch(remote.Name, new string[0], authentication, null);
                 }
 
                 EnsureLocalBranchExistsForCurrentBranch(repository, log, remote, currentBranch);
@@ -198,7 +198,7 @@ private void NormalizeGitDirectory(string gitDirectory, bool noFetch, string cur
                 if (matchingCurrentBranch != null)
                 {
                     log.Info($"Checking out local branch '{currentBranch}'.");
-                    repository.Commands.Checkout(matchingCurrentBranch);
+                    repository.Checkout(matchingCurrentBranch);
                 }
                 else if (localBranchesWhereCommitShaIsHead.Count > 1)
                 {
@@ -211,7 +211,7 @@ private void NormalizeGitDirectory(string gitDirectory, bool noFetch, string cur
                     if (master != null)
                     {
                         log.Warning("Because one of the branches is 'master', will build master." + moveBranchMsg);
-                        repository.Commands.Checkout(master);
+                        repository.Checkout(master);
                     }
                     else
                     {
@@ -220,7 +220,7 @@ private void NormalizeGitDirectory(string gitDirectory, bool noFetch, string cur
                         {
                             var branchWithoutSeparator = branchesWithoutSeparators[0];
                             log.Warning($"Choosing {branchWithoutSeparator.CanonicalName} as it is the only branch without / or - in it. " + moveBranchMsg);
-                            repository.Commands.Checkout(branchWithoutSeparator);
+                            repository.Checkout(branchWithoutSeparator);
                         }
                         else
                         {
@@ -236,7 +236,7 @@ private void NormalizeGitDirectory(string gitDirectory, bool noFetch, string cur
                 else
                 {
                     log.Info($"Checking out local branch 'refs/heads/{localBranchesWhereCommitShaIsHead[0].FriendlyName}'.");
-                    repository.Commands.Checkout(repository.Branches[localBranchesWhereCommitShaIsHead[0].FriendlyName]);
+                    repository.Checkout(repository.Branches[localBranchesWhereCommitShaIsHead[0].FriendlyName]);
                 }
             }
             finally
@@ -343,7 +343,7 @@ private static void EnsureLocalBranchExistsForCurrentBranch(IGitRepository repo,
                 repo.Refs.UpdateTarget(localRef, repoTipId);
             }
 
-            repo.Commands.Checkout(localCanonicalName);
+            repo.Checkout(localCanonicalName);
         }
     }
 }
diff --git a/src/GitVersionCore/Core/GitRepository.cs b/src/GitVersionCore/Core/GitRepository.cs
@@ -10,7 +10,6 @@ namespace GitVersion
 {
     public class GitRepository : IGitRepository
     {
-        public IGitRepositoryCommands Commands { get; }
         private Lazy<IRepository> repositoryLazy;
         private IRepository repositoryInstance => repositoryLazy.Value;
 
@@ -26,13 +25,11 @@ internal GitRepository(string gitRootDirectory)
         internal GitRepository(IRepository repository)
         {
             repositoryLazy = new Lazy<IRepository>(() => repository);
-            Commands = new GitRepositoryCommands(repositoryLazy);
         }
 
         private GitRepository(Func<string> getGitRootDirectory)
         {
             repositoryLazy = new Lazy<IRepository>(() => new Repository(getGitRootDirectory()));
-            Commands = new GitRepositoryCommands(repositoryLazy);
         }
 
         public static string Discover(string path) => Repository.Discover(path);
@@ -156,7 +153,7 @@ public void CreateBranchForPullRequestBranch(ILog log, AuthenticationInfo auth)
             if (canonicalName.StartsWith("refs/tags"))
             {
                 log.Info($"Checking out tag '{canonicalName}'");
-                Commands.Checkout(reference.Target.Sha);
+                Checkout(reference.Target.Sha);
                 return;
             }
 
@@ -172,7 +169,7 @@ public void CreateBranchForPullRequestBranch(ILog log, AuthenticationInfo auth)
             Refs.Add(fakeBranchName, new ObjectId(headTipSha));
 
             log.Info($"Checking local branch '{fakeBranchName}' out.");
-            Commands.Checkout(fakeBranchName);
+            Checkout(fakeBranchName);
         }
         public bool GitRepoHasMatchingRemote(string targetUrl)
         {
@@ -362,5 +359,19 @@ public CommitCollection GetCommitLog(Commit baseVersionSource, Commit currentCom
 
             return commitCollection;
         }
+        public void Checkout(string committishOrBranchSpec)
+        {
+            Commands.Checkout(repositoryInstance, committishOrBranchSpec);
+        }
+
+        public void Checkout(Branch branch)
+        {
+            Commands.Checkout(repositoryInstance, branch);
+        }
+
+        public void Fetch(string remote, IEnumerable<string> refspecs, AuthenticationInfo auth, string logMessage)
+        {
+            Commands.Fetch((Repository)repositoryInstance, remote, refspecs, GitRepository.GetFetchOptions(auth), logMessage);
+        }
     }
 }
diff --git a/src/GitVersionCore/Core/GitRepositoryCommands.cs b/src/GitVersionCore/Core/GitRepositoryCommands.cs

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ private static void EnsureLocalBranchExistsForCurrentBranch(IGitRepository repo,`
`61`	`61`	`repo.Refs.UpdateTarget(localRef, repoTipId);`
`62`	`62`	`}`
`63`	`63`
`64`		`- repo.Commands.Checkout(localCanonicalName);`
	`64`	`+ repo.Checkout(localCanonicalName);`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`[Test]`
`@@ -77,8 +77,6 @@ public void EnsureLocalBranchExistsForCurrentBranch_CaseInsensitivelyMatchesBran`
`77`	`77`	`private static IGitRepository MockRepository()`
`78`	`78`	`{`
`79`	`79`	`var repository = Substitute.For<IGitRepository>();`
`80`		`- var commands = Substitute.For<IGitRepositoryCommands>();`
`81`		`- repository.Commands.Returns(commands);`
`82`	`80`	`return repository;`
`83`	`81`	`}`
`84`	`82`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,6 @@ namespace GitVersionCore.Tests.Mocks`
`8`	`8`	`public class MockRepository : IGitRepository`
`9`	`9`	`{`
`10`	`10`	`private CommitCollection commits;`
`11`		`- public IGitRepositoryCommands Commands { get; }`
`12`		`-`
`13`	`11`	`public MockRepository()`
`14`	`12`	`{`
`15`	`13`	`Tags = new MockTagCollection();`
`@@ -75,6 +73,18 @@ public CommitCollection GetCommitLog(Commit baseVersionSource, Commit currentCom`
`75`	`73`	`{`
`76`	`74`	`throw new NotImplementedException();`
`77`	`75`	`}`
	`76`	`+ public void Checkout(string committishOrBranchSpec)`
	`77`	`+ {`
	`78`	`+ throw new NotImplementedException();`
	`79`	`+ }`
	`80`	`+ public void Checkout(Branch branch)`
	`81`	`+ {`
	`82`	`+ throw new NotImplementedException();`
	`83`	`+ }`
	`84`	`+ public void Fetch(string remote, IEnumerable<string> refspecs, AuthenticationInfo auth, string logMessage)`
	`85`	`+ {`
	`86`	`+ throw new NotImplementedException();`
	`87`	`+ }`
`78`	`88`	`public Remote EnsureOnlyOneRemoteIsDefined(ILog log) => throw new NotImplementedException();`
`79`	`89`	`public void Dispose() => throw new NotImplementedException();`
`80`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ private void NormalizeGitDirectory(string gitDirectory, bool noFetch, string cur`
`157`	`157`	`else`
`158`	`158`	`{`
`159`	`159`	`log.Info($"Fetching from remote '{remote.Name}' using the following refspecs: {remote.RefSpecs}.");`
`160`		`- repository.Commands.Fetch(remote.Name, new string[0], authentication, null);`
	`160`	`+ repository.Fetch(remote.Name, new string[0], authentication, null);`
`161`	`161`	`}`
`162`	`162`
`163`	`163`	`EnsureLocalBranchExistsForCurrentBranch(repository, log, remote, currentBranch);`
`@@ -198,7 +198,7 @@ private void NormalizeGitDirectory(string gitDirectory, bool noFetch, string cur`
`198`	`198`	`if (matchingCurrentBranch != null)`
`199`	`199`	`{`
`200`	`200`	`log.Info($"Checking out local branch '{currentBranch}'.");`
`201`		`- repository.Commands.Checkout(matchingCurrentBranch);`
	`201`	`+ repository.Checkout(matchingCurrentBranch);`
`202`	`202`	`}`
`203`	`203`	`else if (localBranchesWhereCommitShaIsHead.Count > 1)`
`204`	`204`	`{`
`@@ -211,7 +211,7 @@ private void NormalizeGitDirectory(string gitDirectory, bool noFetch, string cur`
`211`	`211`	`if (master != null)`
`212`	`212`	`{`
`213`	`213`	`log.Warning("Because one of the branches is 'master', will build master." + moveBranchMsg);`
`214`		`- repository.Commands.Checkout(master);`
	`214`	`+ repository.Checkout(master);`
`215`	`215`	`}`
`216`	`216`	`else`
`217`	`217`	`{`
`@@ -220,7 +220,7 @@ private void NormalizeGitDirectory(string gitDirectory, bool noFetch, string cur`
`220`	`220`	`{`
`221`	`221`	`var branchWithoutSeparator = branchesWithoutSeparators[0];`
`222`	`222`	`log.Warning($"Choosing {branchWithoutSeparator.CanonicalName} as it is the only branch without / or - in it. " + moveBranchMsg);`
`223`		`- repository.Commands.Checkout(branchWithoutSeparator);`
	`223`	`+ repository.Checkout(branchWithoutSeparator);`
`224`	`224`	`}`
`225`	`225`	`else`
`226`	`226`	`{`
`@@ -236,7 +236,7 @@ private void NormalizeGitDirectory(string gitDirectory, bool noFetch, string cur`
`236`	`236`	`else`
`237`	`237`	`{`
`238`	`238`	`log.Info($"Checking out local branch 'refs/heads/{localBranchesWhereCommitShaIsHead[0].FriendlyName}'.");`
`239`		`- repository.Commands.Checkout(repository.Branches[localBranchesWhereCommitShaIsHead[0].FriendlyName]);`
	`239`	`+ repository.Checkout(repository.Branches[localBranchesWhereCommitShaIsHead[0].FriendlyName]);`
`240`	`240`	`}`
`241`	`241`	`}`
`242`	`242`	`finally`
`@@ -343,7 +343,7 @@ private static void EnsureLocalBranchExistsForCurrentBranch(IGitRepository repo,`
`343`	`343`	`repo.Refs.UpdateTarget(localRef, repoTipId);`
`344`	`344`	`}`
`345`	`345`
`346`		`- repo.Commands.Checkout(localCanonicalName);`
	`346`	`+ repo.Checkout(localCanonicalName);`
`347`	`347`	`}`
`348`	`348`	`}`
`349`	`349`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@ namespace GitVersion`
`10`	`10`	`{`
`11`	`11`	`public class GitRepository : IGitRepository`
`12`	`12`	`{`
`13`		`- public IGitRepositoryCommands Commands { get; }`
`14`	`13`	`private Lazy<IRepository> repositoryLazy;`
`15`	`14`	`private IRepository repositoryInstance => repositoryLazy.Value;`
`16`	`15`
`@@ -26,13 +25,11 @@ internal GitRepository(string gitRootDirectory)`
`26`	`25`	`internal GitRepository(IRepository repository)`
`27`	`26`	`{`
`28`	`27`	`repositoryLazy = new Lazy<IRepository>(() => repository);`
`29`		`- Commands = new GitRepositoryCommands(repositoryLazy);`
`30`	`28`	`}`
`31`	`29`
`32`	`30`	`private GitRepository(Func<string> getGitRootDirectory)`
`33`	`31`	`{`
`34`	`32`	`repositoryLazy = new Lazy<IRepository>(() => new Repository(getGitRootDirectory()));`
`35`		`- Commands = new GitRepositoryCommands(repositoryLazy);`
`36`	`33`	`}`
`37`	`34`
`38`	`35`	`public static string Discover(string path) => Repository.Discover(path);`
`@@ -156,7 +153,7 @@ public void CreateBranchForPullRequestBranch(ILog log, AuthenticationInfo auth)`
`156`	`153`	`if (canonicalName.StartsWith("refs/tags"))`
`157`	`154`	`{`
`158`	`155`	`log.Info($"Checking out tag '{canonicalName}'");`
`159`		`- Commands.Checkout(reference.Target.Sha);`
	`156`	`+ Checkout(reference.Target.Sha);`
`160`	`157`	`return;`
`161`	`158`	`}`
`162`	`159`
`@@ -172,7 +169,7 @@ public void CreateBranchForPullRequestBranch(ILog log, AuthenticationInfo auth)`
`172`	`169`	`Refs.Add(fakeBranchName, new ObjectId(headTipSha));`
`173`	`170`
`174`	`171`	`log.Info($"Checking local branch '{fakeBranchName}' out.");`
`175`		`- Commands.Checkout(fakeBranchName);`
	`172`	`+ Checkout(fakeBranchName);`
`176`	`173`	`}`
`177`	`174`	`public bool GitRepoHasMatchingRemote(string targetUrl)`
`178`	`175`	`{`
`@@ -362,5 +359,19 @@ public CommitCollection GetCommitLog(Commit baseVersionSource, Commit currentCom`
`362`	`359`
`363`	`360`	`return commitCollection;`
`364`	`361`	`}`
	`362`	`+ public void Checkout(string committishOrBranchSpec)`
	`363`	`+ {`
	`364`	`+ Commands.Checkout(repositoryInstance, committishOrBranchSpec);`
	`365`	`+ }`
	`366`	`+`
	`367`	`+ public void Checkout(Branch branch)`
	`368`	`+ {`
	`369`	`+ Commands.Checkout(repositoryInstance, branch);`
	`370`	`+ }`
	`371`	`+`
	`372`	`+ public void Fetch(string remote, IEnumerable<string> refspecs, AuthenticationInfo auth, string logMessage)`
	`373`	`+ {`
	`374`	`+ Commands.Fetch((Repository)repositoryInstance, remote, refspecs, GitRepository.GetFetchOptions(auth), logMessage);`
	`375`	`+ }`
`365`	`376`	`}`
`366`	`377`	`}`