Rebase: introduce a Rebase class

Introduce a Rebase class that maps to the rebase object in libgit2 more directly.

Author: ethomson

LibGit2Sharp/Commands/Rebase.cs

@@ -12,45 +12,6 @@ public static partial class Commands
 /// </summary>
 publicstaticclassRebase
 {
-/// <summary>
-/// The type of operation to be performed in a rebase step.
-/// </summary>
-publicenumRebaseStepOperation
-{
-/// <summary>
-/// Commit is to be cherry-picked.
-/// </summary>
-Pick=0,
-
-/// <summary>
-/// Cherry-pick the commit and edit the commit message.
-/// </summary>
-Reword,
-
-/// <summary>
-/// Cherry-pick the commit but allow user to edit changes.
-/// </summary>
-Edit,
-
-/// <summary>
-/// Commit is to be squashed into previous commit. The commit
-/// message will be merged with the previous message.
-/// </summary>
-Squash,
-
-/// <summary>
-/// Commit is to be squashed into previous commit. The commit
-/// message will be discarded.
-/// </summary>
-Fixup,
-
-// <summary>
-// No commit to cherry-pick. Run the given command and continue
-// if successful.
-// </summary>
-// Exec
-}
-
 privateunsafestaticAnnotatedCommitHandleAnnotatedCommitHandleFromRefHandle(Repositoryrepository,ReferenceHandlerefHandle)
 {
 return(refHandle==null)?
@@ -70,6 +31,7 @@ private unsafe static AnnotatedCommitHandle AnnotatedCommitHandleFromRefHandle(R
 /// <returns>true if completed successfully, false if conflicts encountered.</returns>
 publicstaticRebaseResultStart(Repositoryrepository,Branchbranch,Branchupstream,Branchonto,Identitycommitter,RebaseOptionsoptions)
 {
+Ensure.ArgumentNotNull(repository,"repository");
 Ensure.ArgumentNotNull(upstream,"upstream");
 
 options=options??newRebaseOptions();
@@ -145,7 +107,7 @@ public static unsafe RebaseResult Continue(Repository repository, Identity commi
 // TODO: Should we check the pre-conditions for committing here
 // for instance - what if we had failed on the git_rebase_finish call,
 // do we want continue to be able to restart afterwords...
-varrebaseCommitResult=Proxy.git_rebase_commit(rebase,null,committer);
+varrebaseCommitResult=Proxy.git_rebase_commit(rebase,null,committer,null);
 
 // Report that we just completed the step
 if(options.RebaseStepCompleted!=null)

LibGit2Sharp/Core/NativeMethods.cs

@@ -208,8 +208,8 @@ internal static extern unsafe int git_rebase_commit(
 git_rebase*rebase,
 git_signature*author,
 git_signature*committer,
-IntPtrmessage_encoding,
-IntPtrmessage);
+[MarshalAs(UnmanagedType.CustomMarshaler,MarshalCookie=UniqueId.UniqueIdentifier,MarshalTypeRef=typeof(StrictUtf8Marshaler))]stringmessage_encoding,
+[MarshalAs(UnmanagedType.CustomMarshaler,MarshalCookie=UniqueId.UniqueIdentifier,MarshalTypeRef=typeof(StrictUtf8Marshaler))]stringmessage);
 
 [DllImport(libgit2)]
 internalstaticexternunsafeintgit_rebase_abort(

LibGit2Sharp/Core/Proxy.cs

@@ -1792,7 +1792,8 @@ private static UIntPtr GIT_REBASE_NO_OPERATION
 publicstaticunsafeGitRebaseCommitResultgit_rebase_commit(
 RebaseHandlerebase,
 Identityauthor,
-Identitycommitter)
+Identitycommitter,
+stringmessage)
 {
 Ensure.ArgumentNotNull(rebase,"rebase");
 Ensure.ArgumentNotNull(committer,"committer");
@@ -1802,7 +1803,7 @@ public static unsafe GitRebaseCommitResult git_rebase_commit(
 {
 GitRebaseCommitResultcommitResult=newGitRebaseCommitResult();
 
-intresult=NativeMethods.git_rebase_commit(refcommitResult.CommitId,rebase,authorHandle,committerHandle,IntPtr.Zero,IntPtr.Zero);
+intresult=NativeMethods.git_rebase_commit(refcommitResult.CommitId,rebase,authorHandle,committerHandle,null,message);
 
 if(result==(int)GitErrorCode.Applied)
 {

LibGit2Sharp/ObjectDatabase.cs

@@ -819,7 +819,7 @@ public virtual MergeTreeResult MergeCommits(Commit ours, Commit theirs, MergeTre
 returnmergeResult;
 }
 }
-
+
 /// <summary>
 /// Packs all the objects in the <see cref="ObjectDatabase"/> and write a pack (.pack) and index (.idx) files for them.
 /// </summary>