Move IGitClient.Compare method to IGitService

github · StanleyGoldman · Mar 26, 2019 · Dec 18, 2018 · Dec 18, 2018 · Dec 18, 2018
commit d95149d57f40a195aaee494e3e0680cbdc9f8546
diff --git a/src/GitHub.App/SampleData/GitServiceDesigner.cs b/src/GitHub.App/SampleData/GitServiceDesigner.cs
@@ -17,5 +17,6 @@ class GitServiceDesigner : IGitService
         public UriString GetUri(IRepository repository, string remote = "origin") => null;
         public Task<Patch> Compare(IRepository repository, string sha1, string sha2, string path) => null;
         public Task<ContentChanges> CompareWith(IRepository repository, string sha1, string sha2, string path, byte[] contents) => null;
+        public Task<TreeChanges> Compare(IRepository repository, string sha1, string sha2, bool detectRenames = false) => null;
     }
 }
diff --git a/src/GitHub.App/Services/GitClient.cs b/src/GitHub.App/Services/GitClient.cs
@@ -22,7 +22,6 @@ public class GitClient : IGitClient
         readonly PullOptions pullOptions;
         readonly PushOptions pushOptions;
         readonly FetchOptions fetchOptions;
-        readonly CompareOptions compareOptions;
 
         [ImportingConstructor]
         public GitClient(IGitHubCredentialProvider credentialProvider, IGitService gitService)
@@ -39,11 +38,6 @@ public GitClient(IGitHubCredentialProvider credentialProvider, IGitService gitSe
                 FetchOptions = fetchOptions,
                 MergeOptions = new MergeOptions(),
             };
-
-            compareOptions = new CompareOptions
-            {
-                IndentHeuristic = true
-            };
         }
 
         public Task Pull(IRepository repository)
@@ -199,38 +193,6 @@ public Task CreateBranch(IRepository repository, string branchName)
             });
         }
 
-        public Task<TreeChanges> Compare(
-            IRepository repository,
-            string sha1,
-            string sha2,
-            bool detectRenames)
-        {
-            Guard.ArgumentNotNull(repository, nameof(repository));
-            Guard.ArgumentNotEmptyString(sha1, nameof(sha1));
-            Guard.ArgumentNotEmptyString(sha2, nameof(sha2));
-
-            return Task.Run(() =>
-            {
-                var options = new CompareOptions
-                {
-                    Similarity = detectRenames ? SimilarityOptions.Renames : SimilarityOptions.None,
-                    IndentHeuristic = compareOptions.IndentHeuristic
-                };
-
-                var commit1 = repository.Lookup<Commit>(sha1);
-                var commit2 = repository.Lookup<Commit>(sha2);
-
-                if (commit1 != null && commit2 != null)
-                {
-                    return repository.Diff.Compare<TreeChanges>(commit1.Tree, commit2.Tree, options);
-                }
-                else
-                {
-                    return null;
-                }
-            });
-        }
-
         public Task<T> GetConfig<T>(IRepository repository, string key)
         {
             Guard.ArgumentNotNull(repository, nameof(repository));
@@ -381,7 +343,7 @@ public Task<bool> IsModified(IRepository repository, string path, byte[] content
                     using (var s = contents != null ? new MemoryStream(contents) : new MemoryStream())
                     {
                         var blob2 = repository.ObjectDatabase.CreateBlob(s, path);
-                        var diff = repository.Diff.Compare(blob1, blob2, compareOptions);
+                        var diff = repository.Diff.Compare(blob1, blob2);
                         return diff.LinesAdded != 0 || diff.LinesDeleted != 0;
                     }
                 }

diff --git a/src/GitHub.App/Services/PullRequestService.cs b/src/GitHub.App/Services/PullRequestService.cs
@@ -631,7 +631,7 @@ public IObservable<TreeChanges> GetTreeChanges(LocalRepositoryModel repository,
                 {
                     var remote = await gitClient.GetHttpRemote(repo, "origin");
                     await gitClient.Fetch(repo, remote.Name);
-                    var changes = await gitClient.Compare(repo, pullRequest.BaseRefSha, pullRequest.HeadRefSha, detectRenames: true);
+                    var changes = await gitService.Compare(repo, pullRequest.BaseRefSha, pullRequest.HeadRefSha, detectRenames: true);
                     return Observable.Return(changes);
                 }
             });

diff --git a/src/GitHub.Exports.Reactive/Services/IGitClient.cs b/src/GitHub.Exports.Reactive/Services/IGitClient.cs
@@ -72,19 +72,6 @@ public interface IGitClient
         /// <returns></returns>
         Task CreateBranch(IRepository repository, string branchName);
 
-        /// <summary>
-        /// Compares two commits.
-        /// </summary>
-        /// <param name="repository">The repository</param>
-        /// <param name="sha1">The SHA of the first commit.</param>
-        /// <param name="sha2">The SHA of the second commit.</param>
-        /// <param name="detectRenames">Whether to detect renames</param>
-        /// <returns>
-        /// A <see cref="TreeChanges"/> object or null if one of the commits could not be found in the repository,
-        /// (e.g. it is from a fork).
-        /// </returns>
-        Task<TreeChanges> Compare(IRepository repository, string sha1, string sha2, bool detectRenames = false);
-
         /// <summary>
         /// Gets the value of a configuration key.
         /// </summary>

diff --git a/src/GitHub.Exports/Services/GitService.cs b/src/GitHub.Exports/Services/GitService.cs
@@ -289,5 +289,37 @@ public Task<ContentChanges> CompareWith(IRepository repository, string sha1, str
                 return null;
             });
         }
+
+        public Task<TreeChanges> Compare(
+            IRepository repository,
+            string sha1,
+            string sha2,
+            bool detectRenames)
+        {
+            Guard.ArgumentNotNull(repository, nameof(repository));
+            Guard.ArgumentNotEmptyString(sha1, nameof(sha1));
+            Guard.ArgumentNotEmptyString(sha2, nameof(sha2));
+
+            return Task.Run(() =>
+            {
+                var options = new CompareOptions
+                {
+                    Similarity = detectRenames ? SimilarityOptions.Renames : SimilarityOptions.None,
+                    IndentHeuristic = defaultCompareOptions.IndentHeuristic
+                };
+
+                var commit1 = repository.Lookup<Commit>(sha1);
+                var commit2 = repository.Lookup<Commit>(sha2);
+
+                if (commit1 != null && commit2 != null)
+                {
+                    return repository.Diff.Compare<TreeChanges>(commit1.Tree, commit2.Tree, options);
+                }
+                else
+                {
+                    return null;
+                }
+            });
+        }
     }
 }
diff --git a/src/GitHub.Exports/Services/IGitService.cs b/src/GitHub.Exports/Services/IGitService.cs
@@ -96,5 +96,18 @@ public interface IGitService
         /// A <see cref="Patch"/> object or null if the commit could not be found in the repository.
         /// </returns>
         Task<ContentChanges> CompareWith(IRepository repository, string sha1, string sha2, string path, byte[] contents);
+
+        /// <summary>
+        /// Compares two commits.
+        /// </summary>
+        /// <param name="repository">The repository</param>
+        /// <param name="sha1">The SHA of the first commit.</param>
+        /// <param name="sha2">The SHA of the second commit.</param>
+        /// <param name="detectRenames">Whether to detect renames</param>
+        /// <returns>
+        /// A <see cref="TreeChanges"/> object or null if one of the commits could not be found in the repository,
+        /// (e.g. it is from a fork).
+        /// </returns>
+        Task<TreeChanges> Compare(IRepository repository, string sha1, string sha2, bool detectRenames = false);
     }
 }
diff --git a/test/GitHub.App.UnitTests/Services/GitClientTests.cs b/test/GitHub.App.UnitTests/Services/GitClientTests.cs
@@ -82,7 +82,7 @@ public async Task ContentChangesAsync(int linesAdded, int linesDeleted, bool exp
             var changes = Substitute.For<ContentChanges>();
             changes.LinesAdded.Returns(linesAdded);
             changes.LinesDeleted.Returns(linesDeleted);
-            repo.Diff.Compare(null as Blob, null as Blob, null as CompareOptions).ReturnsForAnyArgs(changes);
+            repo.Diff.Compare(null as Blob, null as Blob).ReturnsForAnyArgs(changes);
             var gitClient = CreateGitClient();
 
             var modified = await gitClient.IsModified(repo, path, null);

diff --git a/test/GitHub.TeamFoundation.UnitTests/VSGitExtTests.cs b/test/GitHub.TeamFoundation.UnitTests/VSGitExtTests.cs
@@ -321,5 +321,6 @@ public LocalRepositoryModel CreateLocalRepositoryModel(string localPath)
         public UriString GetUri(string path, string remote = "origin") => throw new NotImplementedException();
         public Task<Patch> Compare(IRepository repository, string sha1, string sha2, string path) => throw new NotImplementedException();
         public Task<ContentChanges> CompareWith(IRepository repository, string sha1, string sha2, string path, byte[] contents) => throw new NotImplementedException();
+        public Task<TreeChanges> Compare(IRepository repository, string sha1, string sha2, bool detectRenames = false) => throw new NotImplementedException();
     }
 }