Expose annotated commits

These are what we really use for merges and rebases, so expose them so
we can accept these instead of having multiple variations for the user
to guess.

Author: carlosmn

LibGit2Sharp/AnnotatedCommit.cs

@@ -0,0 +1,65 @@
+using System;
+using LibGit2Sharp.Core;
+using LibGit2Sharp.Core.Handles;
+
+namespace LibGit2Sharp
+{
+    /// <summary>
+    /// A commit with information about its source. Input for merge and rebase functions
+    /// </summary>
+    public class AnnotatedCommit : IDisposable, IAnnotatedCommit
+    {
+        internal readonly Repository repository;
+        internal AnnotatedCommitHandle Handle { get; private set; }
+
+        /// <summary>
+        /// Initialize a <see cref="LibGit2Sharp.AnnotatedCommit"/> from extended SHA-1 syntax
+        /// </summary>
+        /// <param name="repository">The repository in which the commit lives</param>
+        /// <param name="revspec">A string in extended SHA-1 syntax to look up the object</param>
+        public AnnotatedCommit(Repository repository, string revspec)
+        {
+            this.repository = repository;
+            this.Handle = Proxy.git_annotated_commit_from_revspec(repository.Handle, revspec);
+        }
+
+        /// <summary>
+        /// Initialize a <see cref="LibGit2Sharp.AnnotatedCommit"/> from extended SHA-1 syntax
+        /// </summary>
+        /// <param name="repository">The repository in which the commit lives</param>
+        /// <param name="reference">A reference pointing to the commit</param>
+        public AnnotatedCommit(Repository repository, Reference reference)
+        {
+            this.repository = repository;
+            using (var refHandle = Proxy.git_reference_lookup(repository.Handle, reference.CanonicalName, true))
+            {
+                this.Handle = Proxy.git_annotated_commit_from_ref(repository.Handle, refHandle);
+            }
+        }
+
+        /// <summary>
+        /// Initialize a <see cref="LibGit2Sharp.AnnotatedCommit"/> from extended SHA-1 syntax
+        /// </summary>
+        /// <param name="repository">The repository in which the commit lives</param>
+        /// <param name="commit">A commit</param>
+        public AnnotatedCommit(Repository repository, Commit commit)
+        {
+            this.repository = repository;
+            this.Handle = Proxy.git_annotated_commit_lookup(repository.Handle, commit.Id.Oid);
+        }
+
+        /// <summary>
+        /// Releases all resource used by the <see cref="LibGit2Sharp.AnnotatedCommit"/> object.
+        /// </summary>
+        public void Dispose()
+        {
+            Handle.Dispose();
+        }
+
+        AnnotatedCommit IAnnotatedCommit.GetAnnotatedCommit()
+        {
+            return this;
+        }
+    }
+}
+

LibGit2Sharp/Commit.cs

@@ -13,7 +13,7 @@ namespace LibGit2Sharp
     /// A Commit
     /// </summary>
     [DebuggerDisplay("{DebuggerDisplay,nq}")]
-    public class Commit : GitObject
+    public class Commit : GitObject, IAnnotatedCommit
     {
         private readonly GitObjectLazyGroup group1;
         private readonly GitObjectLazyGroup group2;
@@ -138,6 +138,11 @@ private string DebuggerDisplay
             }
         }
 
+        AnnotatedCommit IAnnotatedCommit.GetAnnotatedCommit()
+        {
+            return repo.LookupAnnotatedCommit(this);
+        }
+
         private class ParentsCollection : ICollection<Commit>
         {
             private readonly Lazy<ICollection<Commit>> _parents;

LibGit2Sharp/IAnnotatedCommit.cs

@@ -0,0 +1,16 @@
+using System;
+
+namespace LibGit2Sharp
+{
+    /// <summary>
+    /// Interface to retrieve an annotated commit from another type
+    /// </summary>
+    public interface IAnnotatedCommit
+    {
+        /// <summary>
+        /// Retrieve an annotated commit from this object
+        /// </summary>
+        AnnotatedCommit GetAnnotatedCommit();
+    }
+}
+

LibGit2Sharp/IRepository.cs

@@ -436,5 +436,23 @@ public interface IRepository : IDisposable
         /// <param name="reference">The reference mentioned in the revision (if any)</param>
         /// <param name="obj">The object which the revision resolves to</param>
         void RevParse(string revision, out Reference reference, out GitObject obj);
+
+        /// <summary>
+        /// Initialize a <see cref="LibGit2Sharp.AnnotatedCommit"/> from extended SHA-1 syntax
+        /// </summary>
+        /// <param name="revspec">A string in extended SHA-1 syntax to look up the object</param>
+        AnnotatedCommit LookupAnnotatedCommit(string revspec);
+
+        /// <summary>
+        /// Initialize a <see cref="LibGit2Sharp.AnnotatedCommit"/> from extended SHA-1 syntax
+        /// </summary>
+        /// <param name="reference">A reference pointing to the commit</param>
+        AnnotatedCommit LookupAnnotatedCommit(Reference reference);
+
+        /// <summary>
+        /// Initialize a <see cref="LibGit2Sharp.AnnotatedCommit"/> from extended SHA-1 syntax
+        /// </summary>
+        /// <param name="commit">A commit</param>
+        AnnotatedCommit LookupAnnotatedCommit(Commit commit);
     }
 }

LibGit2Sharp/LibGit2Sharp.csproj

@@ -359,6 +359,8 @@
     <Compile Include="Commands\Remove.cs" />
     <Compile Include="Commands\Checkout.cs" />
     <Compile Include="Core\DisposableArray.cs" />
+    <Compile Include="IAnnotatedCommit.cs" />
+    <Compile Include="AnnotatedCommit.cs" />
   </ItemGroup>
   <ItemGroup>
     <CodeAnalysisDictionary Include="CustomDictionary.xml" />

LibGit2Sharp/Reference.cs

@@ -10,7 +10,7 @@ namespace LibGit2Sharp
     /// A Reference to another git object
     /// </summary>
     [DebuggerDisplay("{DebuggerDisplay,nq}")]
-    public abstract class Reference : IEquatable<Reference>, IBelongToARepository
+    public abstract class Reference : IEquatable<Reference>, IBelongToARepository, IAnnotatedCommit
     {
         private static readonly LambdaEqualityHelper<Reference> equalityHelper =
             new LambdaEqualityHelper<Reference>(x => x.CanonicalName, x => x.TargetIdentifier);
@@ -255,5 +255,10 @@ IRepository IBelongToARepository.Repository
                 return repo;
             }
         }
+
+        AnnotatedCommit IAnnotatedCommit.GetAnnotatedCommit()
+        {
+            return repo.LookupAnnotatedCommit(this);
+        }
     }
 }

LibGit2Sharp/Repository.cs

@@ -1925,5 +1925,32 @@ private string DebuggerDisplay
                                      Info.IsBare ? Info.Path : Info.WorkingDirectory);
             }
         }
+
+        /// <summary>
+        /// Initialize a <see cref="LibGit2Sharp.AnnotatedCommit"/> from extended SHA-1 syntax
+        /// </summary>
+        /// <param name="revspec">A string in extended SHA-1 syntax to look up the object</param>
+        public AnnotatedCommit LookupAnnotatedCommit(string revspec)
+        {
+            return new AnnotatedCommit(this, revspec);
+        }
+
+        /// <summary>
+        /// Initialize a <see cref="LibGit2Sharp.AnnotatedCommit"/> from extended SHA-1 syntax
+        /// </summary>
+        /// <param name="reference">A reference pointing to the commit</param>
+        public AnnotatedCommit LookupAnnotatedCommit(Reference reference)
+        {
+            return new AnnotatedCommit(this, reference);
+        }
+
+        /// <summary>
+        /// Initialize a <see cref="LibGit2Sharp.AnnotatedCommit"/> from extended SHA-1 syntax
+        /// </summary>
+        /// <param name="commit">A commit</param>
+        public AnnotatedCommit LookupAnnotatedCommit(Commit commit)
+        {
+            return new AnnotatedCommit(this, commit);
+        }
     }
 }