Accept IAnnotatedCommit in AnalyzeMerge

carlosmn · carlosmn · commit 5e60873a7c62 · 2016-04-26T10:42:23.000+02:00
Instead of the multiple overloads, accept IAnnotatedCommit so the user
can provide commits or references.
diff --git a/LibGit2Sharp/IRepository.cs b/LibGit2Sharp/IRepository.cs
@@ -228,18 +228,14 @@ public interface IRepository : IDisposable
 
         /// <summary>
         /// Analyze the possibilities of updating HEAD with the given commit(s).
+        /// <para>
+        /// It expects objects convertible to annotated commits, so <see cref="LibGit2Sharp.Reference"/> and
+        /// <see cref="LibGit2Sharp.Commit"/> also work as inputs.
+        /// </para>
         /// </summary>
         /// <param name="commits">Commits to merge into HEAD</param>
         /// <returns>Which update methods are possible and which preference the user has specified</returns>
-        MergeAnalysisResult AnalyzeMerge(params Commit[] commits);
-
-
-        /// <summary>
-        /// Analyze the possibilities of updating HEAD with the given reference(s)
-        /// </summary>
-        /// <param name="references">References to merge into HEAD</param>
-        /// <returns>Which update methods are possible and which preference the user has specified</returns>
-        MergeAnalysisResult AnalyzeMerge(params Reference[] references);
+        MergeAnalysisResult AnalyzeMerge(params IAnnotatedCommit[] commits);
 
         /// <summary>
         /// Access to Rebase functionality.
diff --git a/LibGit2Sharp/Repository.cs b/LibGit2Sharp/Repository.cs
@@ -1423,29 +1423,18 @@ private MergeAnalysisResult AnalyzeMerge(AnnotatedCommitHandle[] annotatedCommit
 
         /// <summary>
         /// Analyze the possibilities of updating HEAD with the given commit(s).
+        /// <para>
+        /// It expects objects convertible to annotated commits, so <see cref="LibGit2Sharp.Reference"/> and
+        /// <see cref="LibGit2Sharp.Commit"/> also work as inputs.
+        /// </para>
         /// </summary>
         /// <param name="commits">Commits to merge into HEAD</param>
         /// <returns>Which update methods are possible and which preference the user has specified</returns>
-        public MergeAnalysisResult AnalyzeMerge(params Commit[] commits)
-        {
-            using (var handles = new DisposableArray<AnnotatedCommitHandle>(commits.Select(commit =>
-                Proxy.git_annotated_commit_lookup(Handle, commit.Id.Oid)).ToArray()))
-            {
-                return AnalyzeMerge(handles);
-            }
-        }
-
-        /// <summary>
-        /// Analyze the possibilities of updating HEAD with the given reference(s)
-        /// </summary>
-        /// <param name="references">References to merge into HEAD</param>
-        /// <returns>Which update methods are possible and which preference the user has specified</returns>
-        public MergeAnalysisResult AnalyzeMerge(params Reference[] references)
+        public MergeAnalysisResult AnalyzeMerge(params IAnnotatedCommit[] commits)
         {
-            using (var refHandles = new DisposableArray<ReferenceHandle>(references.Select(r => refs.RetrieveReferencePtr(r.CanonicalName))))
-            using (var handles = new DisposableArray<AnnotatedCommitHandle>(refHandles.Array.Select(rh => Proxy.git_annotated_commit_from_ref(Handle, rh))))
+            using (var annotated = new DisposableArray<AnnotatedCommit>(commits.Select(c => c.GetAnnotatedCommit())))
             {
-                return AnalyzeMerge(handles);
+                return AnalyzeMerge(annotated.Array.Select(c => c.Handle).ToArray());
             }
         }
 
