Initial Rebase implementation

Author: jamill

LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj

@@ -59,6 +59,7 @@
     <Compile Include="DescribeFixture.cs" />
     <Compile Include="GlobalSettingsFixture.cs" />
     <Compile Include="PatchStatsFixture.cs" />
+    <Compile Include="RebaseFixture.cs" />
     <Compile Include="RefSpecFixture.cs" />
     <Compile Include="EqualityFixture.cs" />
     <Compile Include="RevertFixture.cs" />
@@ -157,4 +158,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>

LibGit2Sharp.Tests/RebaseFixture.cs

@@ -8,6 +8,7 @@ public static class Constants
         public const string UnknownSha = "deadbeefdeadbeefdeadbeefdeadbeefdeadbeef";
         public static readonly Identity Identity = new Identity("A. U. Thor", "thor@valhalla.asgard.com");
         public static readonly Signature Signature = new Signature(Identity, new DateTimeOffset(2011, 06, 16, 10, 58, 27, TimeSpan.FromHours(2)));
+        public static readonly Signature Signature2 = new Signature("nulltoken", "emeric.fermas@gmail.com", DateTimeOffset.Parse("Wed, Dec 14 2011 08:29:03 +0100"));
 
         // Populate these to turn on live credential tests:  set the
         // PrivateRepoUrl to the URL of a repository that requires

LibGit2Sharp.Tests/TestHelpers/Constants.cs

@@ -0,0 +1,52 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace LibGit2Sharp
+{
+    /// <summary>
+    /// Information about a rebase step that was just completed.
+    /// </summary>
+    public class AfterRebaseStepInfo
+    {
+        /// <summary>
+        /// Needed for mocking.
+        /// </summary>
+        protected AfterRebaseStepInfo()
+        { }
+
+        internal AfterRebaseStepInfo(RebaseStepInfo stepInfo, Commit commit)
+        {
+            StepInfo = stepInfo;
+            Commit = commit;
+            WasPatchAlreadyApplied = false;
+        }
+
+        /// <summary>
+        /// Constructor to call when the patch has already been applied for this step.
+        /// </summary>
+        /// <param name="stepInfo"></param>
+        internal AfterRebaseStepInfo(RebaseStepInfo stepInfo)
+            : this (stepInfo, null)
+        {
+            WasPatchAlreadyApplied = true;
+        }
+
+        /// <summary>
+        /// The info on the completed step.
+        /// </summary>
+        public virtual RebaseStepInfo StepInfo { get; private set; }
+
+        /// <summary>
+        /// The commit generated by the step, if any.
+        /// </summary>
+        public virtual Commit Commit { get; private set; }
+
+        /// <summary>
+        /// Was the changes for this step already applied. If so,
+        /// <see cref="AfterRebaseStepInfo.Commit"/> will be null.
+        /// </summary>
+        public virtual bool WasPatchAlreadyApplied { get; private set; }
+    }
+}

LibGit2Sharp/AfterRebaseStepInfo.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace LibGit2Sharp
+{
+    /// <summary>
+    /// Information about a rebase step that is about to be performed.
+    /// </summary>
+    public class BeforeRebaseStepInfo
+    {
+        /// <summary>
+        /// Needed for mocking.
+        /// </summary>
+        protected BeforeRebaseStepInfo()
+        { }
+
+        internal BeforeRebaseStepInfo(RebaseStepInfo stepInfo)
+        {
+            StepInfo = stepInfo;
+        }
+
+        /// <summary>
+        /// Information on the step that is about to be performed.
+        /// </summary>
+        public virtual RebaseStepInfo StepInfo { get; private set; }
+    }
+}

LibGit2Sharp/BeforeRebaseStepInfo.cs

@@ -27,5 +27,13 @@ public static implicit operator ObjectId(GitOid? oid)
         {
             return oid == null ? null : new ObjectId(oid.Value);
         }
+
+        /// <summary>
+        /// Static convenience property to return an id (all zeros).
+        /// </summary>
+        public static GitOid Empty
+        {
+            get { return new GitOid(); }
+        }
     }
 }

LibGit2Sharp/Core/GitOid.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace LibGit2Sharp.Core
+{
+    [StructLayout(LayoutKind.Sequential)]
+    internal class GitRebaseOperation
+    {
+        internal RebaseStepOperation type;
+        internal GitOid id;
+        internal IntPtr exec;
+    }
+}

LibGit2Sharp/Core/GitRebaseOperation.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace LibGit2Sharp.Core
+{
+    [StructLayout(LayoutKind.Sequential)]
+    struct GitRebaseOptions
+    {
+        public uint version;
+
+        public int quiet;
+
+        public IntPtr rewrite_notes_ref;
+    }
+}

LibGit2Sharp/Core/GitRebaseOptions.cs

@@ -0,0 +1,13 @@
+using LibGit2Sharp.Core.Handles;
+
+namespace LibGit2Sharp.Core
+{
+    internal class RebaseSafeHandle : SafeHandleBase
+    {
+        protected override bool ReleaseHandleImpl()
+        {
+            Proxy.git_rebase_free(handle);
+            return true;
+        }
+    }
+}

LibGit2Sharp/Core/Handles/RebaseSafeHandle.cs

@@ -191,6 +191,62 @@ internal static extern int git_branch_remote_name(
             RepositorySafeHandle repo,
             [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string canonical_branch_name);
 
+        [DllImport(libgit2)]
+        internal static extern int git_rebase_init(
+            out RebaseSafeHandle rebase,
+            RepositorySafeHandle repo,
+            GitAnnotatedCommitHandle branch,
+            GitAnnotatedCommitHandle upstream,
+            GitAnnotatedCommitHandle onto,
+            ref GitRebaseOptions options);
+
+        [DllImport(libgit2)]
+        internal static extern int git_rebase_open(
+            out RebaseSafeHandle rebase,
+            RepositorySafeHandle repo);
+
+        [DllImport(libgit2)]
+        internal static extern UIntPtr git_rebase_operation_entrycount(
+            RebaseSafeHandle rebase);
+
+        [DllImport(libgit2)]
+        internal static extern UIntPtr git_rebase_operation_current(
+            RebaseSafeHandle rebase);
+
+        [DllImport(libgit2)]
+        internal static extern IntPtr git_rebase_operation_byindex(
+            RebaseSafeHandle rebase,
+            UIntPtr index);
+
+        [DllImport(libgit2)]
+        internal static extern int git_rebase_next(
+            out IntPtr operation,
+            RebaseSafeHandle rebase,
+            ref GitCheckoutOpts options);
+
+        [DllImport(libgit2)]
+        internal static extern int git_rebase_commit(
+            ref GitOid id,
+            RebaseSafeHandle rebase,
+            SignatureSafeHandle author,
+            SignatureSafeHandle committer,
+            IntPtr message_encoding,
+            IntPtr message);
+
+        [DllImport(libgit2)]
+        internal static extern int git_rebase_abort(
+            RebaseSafeHandle rebase);
+
+        [DllImport(libgit2)]
+        internal static extern int git_rebase_finish(
+            RebaseSafeHandle repo,
+            SignatureSafeHandle signature,
+            ref GitRebaseOptions options);
+
+        [DllImport(libgit2)]
+        internal static extern void git_rebase_free(
+            IntPtr rebase);
+
         [DllImport(libgit2)]
         internal static extern int git_remote_rename(
             ref GitStrArray problems,
@@ -202,7 +258,6 @@ internal delegate int git_remote_rename_problem_cb(
             [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(LaxUtf8NoCleanupMarshaler))] string problematic_refspec,
             IntPtr payload);
 
-
         [DllImport(libgit2)]
         internal static extern int git_branch_upstream_name(
             GitBuf buf,