Changed methods to use MergeTreeResult and fixed incorrect name in argument validation.

Author: Jeremy Koritzinsky

LibGit2Sharp/CherryPickTreeResult.cs

@@ -70,7 +70,6 @@
     <Compile Include="CheckoutOptions.cs" />
     <Compile Include="CherryPickOptions.cs" />
     <Compile Include="CherryPickResult.cs" />
-    <Compile Include="CherryPickTreeResult.cs" />
     <Compile Include="CloneOptions.cs" />
     <Compile Include="CommitFilter.cs" />
     <Compile Include="CommitOptions.cs" />
@@ -161,7 +160,6 @@
     <Compile Include="RenameDetails.cs" />
     <Compile Include="RevertResult.cs" />
     <Compile Include="RevertOptions.cs" />
-    <Compile Include="RevertTreeResult.cs" />
     <Compile Include="SecureUsernamePasswordCredentials.cs" />
     <Compile Include="StageOptions.cs" />
     <Compile Include="StatusOptions.cs" />
@@ -395,4 +393,4 @@
   </Target>
   -->
   <ItemGroup />
-</Project>
+</Project>

LibGit2Sharp/LibGit2Sharp.csproj

@@ -549,7 +549,7 @@ public virtual HistoryDivergence CalculateHistoryDivergence(Commit one, Commit a
         /// <param name="mainline">Which commit to consider the parent for the diff when cherry-picking a merge commit.</param>
         /// <param name="options">The options for the merging in the cherry-pick operation.</param>
         /// <returns>A result containing a <see cref="Tree"/> if the cherry-pick was successful and a list of <see cref="Conflict"/>s if it is not.</returns>
-        public virtual CherryPickTreeResult CherryPickCommit(Commit cherryPickCommit, Commit cherryPickOnto, int mainline, MergeOptions options)
+        public virtual MergeTreeResult CherryPickCommit(Commit cherryPickCommit, Commit cherryPickOnto, int mainline, MergeOptions options)
         {
             Ensure.ArgumentNotNull(cherryPickCommit, "cherryPickCommit");
             Ensure.ArgumentNotNull(cherryPickOnto, "ours");
@@ -584,12 +584,12 @@ public virtual CherryPickTreeResult CherryPickCommit(Commit cherryPickCommit, Co
             using (var cherryPickCommitHandle = Proxy.git_object_lookup(repo.Handle, cherryPickCommit.Id, GitObjectType.Commit))
             using (var indexHandle = Proxy.git_cherrypick_commit(repo.Handle, cherryPickCommitHandle, cherryPickOntoHandle, (uint)mainline, opts, out earlyStop))
             {
-                CherryPickTreeResult cherryPickResult;
+                MergeTreeResult cherryPickResult;
 
                 // Stopped due to FailOnConflict so there's no index or conflict list
                 if (earlyStop)
                 {
-                    return new CherryPickTreeResult(new Conflict[] { });
+                    return new MergeTreeResult(new Conflict[] { });
                 }
 
                 if (Proxy.git_index_has_conflicts(indexHandle))
@@ -603,12 +603,12 @@ public virtual CherryPickTreeResult CherryPickCommit(Commit cherryPickCommit, Co
                             conflicts.Add(conflict);
                         }
                     }
-                    cherryPickResult = new CherryPickTreeResult(conflicts);
+                    cherryPickResult = new MergeTreeResult(conflicts);
                 }
                 else
                 {
                     var treeId = Proxy.git_index_write_tree_to(indexHandle, repo.Handle);
-                    cherryPickResult = new CherryPickTreeResult(this.repo.Lookup<Tree>(treeId));
+                    cherryPickResult = new MergeTreeResult(this.repo.Lookup<Tree>(treeId));
                 }
 
                 return cherryPickResult;
@@ -889,10 +889,10 @@ private PackBuilderResults InternalPack(PackBuilderOptions options, Action<PackB
         /// <param name="mainline">Which commit to consider the parent for the diff when reverting a merge commit.</param>
         /// <param name="options">The options for the merging in the revert operation.</param>
         /// <returns>A result containing a <see cref="Tree"/> if the revert was successful and a list of <see cref="Conflict"/>s if it is not.</returns>
-        public virtual RevertTreeResult RevertCommit(Commit revertCommit, Commit revertOnto, int mainline, MergeOptions options)
+        public virtual MergeTreeResult RevertCommit(Commit revertCommit, Commit revertOnto, int mainline, MergeOptions options)
         {
             Ensure.ArgumentNotNull(revertCommit, "revertCommit");
-            Ensure.ArgumentNotNull(revertOnto, "ours");
+            Ensure.ArgumentNotNull(revertOnto, "revertOnto");
 
             options = options ?? new MergeOptions();
 
@@ -924,12 +924,12 @@ public virtual RevertTreeResult RevertCommit(Commit revertCommit, Commit revertO
             using (var revertCommitHandle = Proxy.git_object_lookup(repo.Handle, revertCommit.Id, GitObjectType.Commit))
             using (var indexHandle = Proxy.git_revert_commit(repo.Handle, revertCommitHandle, revertOntoHandle, (uint)mainline, opts, out earlyStop))
             {
-                RevertTreeResult revertTreeResult;
+                MergeTreeResult revertTreeResult;
 
                 // Stopped due to FailOnConflict so there's no index or conflict list
                 if (earlyStop)
                 {
-                    return new RevertTreeResult(new Conflict[] { });
+                    return new MergeTreeResult(new Conflict[] { });
                 }
 
                 if (Proxy.git_index_has_conflicts(indexHandle))
@@ -943,12 +943,12 @@ public virtual RevertTreeResult RevertCommit(Commit revertCommit, Commit revertO
                             conflicts.Add(conflict);
                         }
                     }
-                    revertTreeResult = new RevertTreeResult(conflicts);
+                    revertTreeResult = new MergeTreeResult(conflicts);
                 }
                 else
                 {
                     var treeId = Proxy.git_index_write_tree_to(indexHandle, repo.Handle);
-                    revertTreeResult = new RevertTreeResult(this.repo.Lookup<Tree>(treeId));
+                    revertTreeResult = new MergeTreeResult(this.repo.Lookup<Tree>(treeId));
                 }
 
                 return revertTreeResult;