Made changes requested in code review on github.

Author: Jeremy Koritzinsky

LibGit2Sharp.Tests/CherryPickFixture.cs

@@ -138,7 +138,7 @@ public void CanCherryPickCommit()
 
                 var result = repo.ObjectDatabase.CherryPickCommit(commitToMerge, ours, 0, null);
 
-                Assert.Equal(CherryPickStatus.CherryPicked, result.Status);
+                Assert.Equal(MergeTreeStatus.Succeeded, result.Status);
                 Assert.Equal(0, result.Conflicts.Count());
             }
         }
@@ -156,9 +156,9 @@ public void CherryPickWithConflictsReturnsConflicts()
 
                 var result = repo.ObjectDatabase.CherryPickCommit(branch.Tip, repo.Head.Tip, 0, null);
 
-                Assert.Equal(CherryPickStatus.Conflicts, result.Status);
+                Assert.Equal(MergeTreeStatus.Conflicts, result.Status);
                 Assert.NotEmpty(result.Conflicts);
-                
+
             }
         }
 

LibGit2Sharp.Tests/RevertFixture.cs

@@ -512,15 +512,14 @@ public void RevertWithConflictReportsConflict()
         [Fact]
         public void CanRevertInObjectDatabase()
         {
-            // The branch name to perform the revert on,
-            // and the file whose contents we expect to be reverted.
+            // The branch name to perform the revert on
             const string revertBranchName = "refs/heads/revert";
 
             string path = SandboxRevertTestRepo();
             using (var repo = new Repository(path))
             {
 
-                
+
                 // Checkout the revert branch.
                 Branch branch = Commands.Checkout(repo, revertBranchName);
                 Assert.NotNull(branch);

LibGit2Sharp/CherryPickTreeResult.cs

@@ -6,7 +6,7 @@
 namespace LibGit2Sharp
 {
     /// <summary>
-    /// Class to report the result of a cherry picked.
+    /// Class to report the result of a cherry pick.
     /// </summary>
     public class CherryPickTreeResult
     {
@@ -19,14 +19,14 @@ protected CherryPickTreeResult()
         internal CherryPickTreeResult(Tree tree)
         {
             this.Tree = tree;
-            this.Status = CherryPickStatus.CherryPicked;
+            this.Status = MergeTreeStatus.Succeeded;
             this.Conflicts = new List<Conflict>();
         }
 
         internal CherryPickTreeResult(IEnumerable<Conflict> conflicts)
         {
             this.Conflicts = conflicts;
-            this.Status = CherryPickStatus.Conflicts;
+            this.Status = MergeTreeStatus.Conflicts;
         }
 
         /// <summary>
@@ -43,6 +43,7 @@ internal CherryPickTreeResult(IEnumerable<Conflict> conflicts)
         /// <summary>
         /// The status of the cherry pick.
         /// </summary>
-        public virtual CherryPickStatus Status { get; private set; }
+        public virtual MergeTreeStatus Status { get; private set; }
     }
 }
+

LibGit2Sharp/LibGit2Sharp.csproj

@@ -395,4 +395,4 @@
   </Target>
   -->
   <ItemGroup />
-</Project>
+</Project>

LibGit2Sharp/ObjectDatabase.cs

@@ -542,17 +542,17 @@ public virtual HistoryDivergence CalculateHistoryDivergence(Commit one, Commit a
         }
 
         /// <summary>
-        /// Performs a cherry-pick of <paramref name="cherryPickCommit"/> onto <paramref name="ours"/> commit.
+        /// Performs a cherry-pick of <paramref name="cherryPickCommit"/> onto <paramref name="cherryPickOnto"/> commit.
         /// </summary>
         /// <param name="cherryPickCommit">The commit to cherry-pick.</param>
-        /// <param name="ours">The commit to cherry-pick onto.</param>
+        /// <param name="cherryPickOnto">The commit to cherry-pick onto.</param>
         /// <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 ours, int mainline, MergeOptions options)
+        public virtual CherryPickTreeResult CherryPickCommit(Commit cherryPickCommit, Commit cherryPickOnto, int mainline, MergeOptions options)
         {
             Ensure.ArgumentNotNull(cherryPickCommit, "cherryPickCommit");
-            Ensure.ArgumentNotNull(ours, "ours");
+            Ensure.ArgumentNotNull(cherryPickOnto, "ours");
 
             options = options ?? new MergeOptions();
 
@@ -579,10 +579,10 @@ public virtual CherryPickTreeResult CherryPickCommit(Commit cherryPickCommit, Co
             };
 
             bool earlyStop;
-            
-            using (var ourHandle = Proxy.git_object_lookup(repo.Handle, ours.Id, GitObjectType.Commit))
+
+            using (var cherryPickOntoHandle = Proxy.git_object_lookup(repo.Handle, cherryPickOnto.Id, GitObjectType.Commit))
             using (var cherryPickCommitHandle = Proxy.git_object_lookup(repo.Handle, cherryPickCommit.Id, GitObjectType.Commit))
-            using (var indexHandle = Proxy.git_cherrypick_commit(repo.Handle, cherryPickCommitHandle, ourHandle, (uint)mainline, opts, out earlyStop))
+            using (var indexHandle = Proxy.git_cherrypick_commit(repo.Handle, cherryPickCommitHandle, cherryPickOntoHandle, (uint)mainline, opts, out earlyStop))
             {
                 CherryPickTreeResult cherryPickResult;
 
@@ -882,17 +882,17 @@ private PackBuilderResults InternalPack(PackBuilderOptions options, Action<PackB
         }
 
         /// <summary>
-        /// Performs a revert of <paramref name="revertCommit"/> onto <paramref name="ours"/> commit.
+        /// Performs a revert of <paramref name="revertCommit"/> onto <paramref name="revertOnto"/> commit.
         /// </summary>
         /// <param name="revertCommit">The commit to revert.</param>
-        /// <param name="ours">The commit to revert onto.</param>
+        /// <param name="revertOnto">The commit to revert onto.</param>
         /// <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 ours, int mainline, MergeOptions options)
+        public virtual RevertTreeResult RevertCommit(Commit revertCommit, Commit revertOnto, int mainline, MergeOptions options)
         {
             Ensure.ArgumentNotNull(revertCommit, "revertCommit");
-            Ensure.ArgumentNotNull(ours, "ours");
+            Ensure.ArgumentNotNull(revertOnto, "ours");
 
             options = options ?? new MergeOptions();
 
@@ -920,9 +920,9 @@ public virtual RevertTreeResult RevertCommit(Commit revertCommit, Commit ours, i
 
             bool earlyStop;
 
-            using (var ourHandle = Proxy.git_object_lookup(repo.Handle, ours.Id, GitObjectType.Commit))
-            using (var cherryPickCommitHandle = Proxy.git_object_lookup(repo.Handle, revertCommit.Id, GitObjectType.Commit))
-            using (var indexHandle = Proxy.git_revert_commit(repo.Handle, cherryPickCommitHandle, ourHandle, (uint)mainline, opts, out earlyStop))
+            using (var revertOntoHandle = Proxy.git_object_lookup(repo.Handle, revertOnto.Id, GitObjectType.Commit))
+            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;
 

LibGit2Sharp/RevertTreeResult.cs

@@ -2,6 +2,9 @@
 
 namespace LibGit2Sharp
 {
+    /// <summary>
+    /// The result of a revert of one tree onto another tree.
+    /// </summary>
     public class RevertTreeResult
     {
         /// <summary>
@@ -24,19 +27,19 @@ internal RevertTreeResult(IEnumerable<Conflict> conflicts)
         }
 
         /// <summary>
-        /// The resulting tree of the cherry-pick.
-        /// <para>This will return <code>null</code> if the cherry-pick has been unsuccessful due to conflicts.</para>
+        /// The resulting tree of the revert.
+        /// <para>This will return <code>null</code> if the revert has been unsuccessful due to conflicts.</para>
         /// </summary>
         public virtual Tree Tree { get; private set; }
 
         /// <summary>
-        /// The resulting conflicts from the cherry-pick.
+        /// The resulting conflicts from the revert.
         /// </summary>
         public virtual IEnumerable<Conflict> Conflicts { get; private set; }
 
         /// <summary>
-        /// The status of the cherry pick.
+        /// The status of the revert.
         /// </summary>
         public virtual MergeTreeStatus Status { get; private set; }
     }
-}
+}