Rebase: fixup meta test warnings

Author: jamill

LibGit2Sharp.Tests/RebaseFixture.cs

@@ -222,6 +222,7 @@ public void RebaseWhileAlreadyRebasingThrows()
                 }
         }
 
+        [Fact]
         public void CurrentRebaseOperationIsNullWhenNotRebasing()
         {
             SelfCleaningDirectory scd = BuildSelfCleaningDirectory();

LibGit2Sharp/AfterRebaseStepInfo.cs

@@ -10,6 +10,12 @@ namespace LibGit2Sharp
     /// </summary>
     public class AfterRebaseStepInfo
     {
+        /// <summary>
+        /// Needed for mocking.
+        /// </summary>
+        protected AfterRebaseStepInfo()
+        { }
+
         internal AfterRebaseStepInfo(RebaseStepInfo stepInfo, ObjectId commitId)
         {
             StepInfo = stepInfo;
@@ -19,11 +25,11 @@ internal AfterRebaseStepInfo(RebaseStepInfo stepInfo, ObjectId commitId)
         /// <summary>
         /// The info on the completed step.
         /// </summary>
-        public RebaseStepInfo StepInfo { get; private set; }
+        public virtual RebaseStepInfo StepInfo { get; private set; }
 
         /// <summary>
         /// The ID of the commit generated by the step, if any.
         /// </summary>
-        public ObjectId CommitId { get; private set; }
+        public virtual ObjectId CommitId { get; private set; }
     }
 }

LibGit2Sharp/BeforeRebaseStepInfo.cs

@@ -10,6 +10,12 @@ namespace LibGit2Sharp
     /// </summary>
     public class BeforeRebaseStepInfo
     {
+        /// <summary>
+        /// Needed for mocking.
+        /// </summary>
+        protected BeforeRebaseStepInfo()
+        { }
+
         internal BeforeRebaseStepInfo(RebaseStepInfo stepInfo)
         {
             StepInfo = stepInfo;
@@ -18,6 +24,6 @@ internal BeforeRebaseStepInfo(RebaseStepInfo stepInfo)
         /// <summary>
         /// Information on the step that is about to be performed.
         /// </summary>
-        public RebaseStepInfo StepInfo { get; private set; }
+        public virtual RebaseStepInfo StepInfo { get; private set; }
     }
 }

LibGit2Sharp/IRepository.cs

@@ -222,6 +222,24 @@ public interface IRepository : IDisposable
         /// <returns>The <see cref="MergeResult"/> of the merge.</returns>
         MergeResult Merge(string committish, Signature merger, MergeOptions options);
 
+        /// <summary>
+        /// Perform a rebase.
+        /// </summary>
+        /// <param name="branch">The branch to rebase.</param>
+        /// <param name="upstream">The starting commit to rebase.</param>
+        /// <param name="onto">The branch to rebase onto.</param>
+        /// <param name="committer"></param>
+        /// <param name="options"></param>
+        /// <returns>true if completed successfully, false if conflicts encountered.</returns>
+        RebaseResult Rebase(Branch branch, Branch upstream, Branch onto, Signature committer, RebaseOptions options);
+
+        /// <summary>
+        /// Get the current rebase operation in progress (if any).
+        /// Currently only returns for rebase merge. If a rebase merge
+        /// operation is not progress, returns null.
+        /// </summary>
+        RebaseOperation CurrentRebaseOperation { get; }
+
         /// <summary>
         /// Merge the reference that was recently fetched. This will merge
         /// the branch on the fetched remote that corresponded to the

LibGit2Sharp/RebaseOperation.cs

@@ -53,6 +53,12 @@ public class RebaseOperation
     {
         internal readonly Repository repository;
 
+        /// <summary>
+        /// Needed for mocking purposes.
+        /// </summary>
+        protected RebaseOperation()
+        { }
+
         internal RebaseOperation(Repository repo)
         {
             this.repository = repo;
@@ -61,7 +67,7 @@ internal RebaseOperation(Repository repo)
         /// <summary>
         /// Continue the current rebase.
         /// </summary>
-        public RebaseResult Continue(Signature committer, RebaseOptions options)
+        public virtual RebaseResult Continue(Signature committer, RebaseOptions options)
         {
             Ensure.ArgumentNotNull(committer, "committer");
 
@@ -104,7 +110,7 @@ public RebaseResult Continue(Signature committer, RebaseOptions options)
         /// <summary>
         /// Abort the rebase operation.
         /// </summary>
-        public void Abort()
+        public virtual void Abort()
         {
             RebaseSafeHandle rebase = null;
             try
@@ -122,15 +128,15 @@ public void Abort()
         /// <summary>
         /// Skip this rebase step.
         /// </summary>
-        public void Skip()
+        public virtual void Skip()
         {
             throw new NotImplementedException();
         }
 
         /// <summary>
         /// The info on the current step.
         /// </summary>
-        public RebaseStepInfo CurrentStepInfo
+        public virtual RebaseStepInfo CurrentStepInfo
         {
             get
             {

LibGit2Sharp/RebaseOptions.cs

@@ -10,7 +10,7 @@ namespace LibGit2Sharp
     /// <summary>
     /// Options controlling rebase behavior.
     /// </summary>
-    public class RebaseOptions : IConvertableToGitCheckoutOpts
+    public sealed class RebaseOptions : IConvertableToGitCheckoutOpts
     {
         /// <summary>
         /// Delegate that is called before each rebase step.

LibGit2Sharp/RebaseResult.cs

@@ -32,6 +32,12 @@ public enum RebaseStatus
     /// </summary>
     public class RebaseResult
     {
+        /// <summary>
+        /// Needed for mocking.
+        /// </summary>
+        protected RebaseResult()
+        { }
+
         internal RebaseResult(RebaseStatus status,
                               int stepNumber,
                               int totalSteps,
@@ -48,23 +54,23 @@ internal RebaseResult(RebaseStatus status,
         /// If the overall Rebase operation has completed successfully, this will
         /// be null.
         /// </summary>
-        public RebaseStepInfo CurrentStepInfo { get; private set; }
+        public virtual RebaseStepInfo CurrentStepInfo { get; private set; }
 
         /// <summary>
         /// Did the rebase operation run until it should stop
         /// (completed the rebase, or the operation for the current step
         /// is one that sequencing should stop.
         /// </summary>
-        public RebaseStatus Status { get; protected set; }
+        public virtual RebaseStatus Status { get; protected set; }
 
         /// <summary>
         /// The number of completed steps.
         /// </summary>
-        public int CompletedStepCount { get; protected set; }
+        public virtual int CompletedStepCount { get; protected set; }
 
         /// <summary>
         /// The total number of steps in the rebase.
         /// </summary>
-        public int TotalStepCount { get; protected set; }
+        public virtual int TotalStepCount { get; protected set; }
     }
 }

LibGit2Sharp/RebaseStepInfo.cs

@@ -11,6 +11,12 @@ namespace LibGit2Sharp
     /// </summary>
     public class RebaseStepInfo
     {
+        /// <summary>
+        /// Needed for mocking purposes.
+        /// </summary>
+        protected RebaseStepInfo()
+        { }
+
         internal RebaseStepInfo(RebaseStepOperation type, ObjectId id, string exec, int stepIndex, int totalStepCount)
         {
             Type = type;
@@ -23,26 +29,26 @@ internal RebaseStepInfo(RebaseStepOperation type, ObjectId id, string exec, int
         /// <summary>
         /// The rebase operation type.
         /// </summary>
-        public RebaseStepOperation Type { get; private set; }
+        public virtual RebaseStepOperation Type { get; private set; }
 
         /// <summary>
         /// The object ID the step is operating on.
         /// </summary>
-        public ObjectId ID { get; private set; }
+        public virtual ObjectId ID { get; private set; }
 
         /// <summary>
         /// Command to execute, if any.
         /// </summary>
-        public string Exec { get; private set; }
+        public virtual string Exec { get; private set; }
 
         /// <summary>
         /// The index of this step.
         /// </summary>
-        public int StepIndex { get; private set; }
+        public virtual int StepIndex { get; private set; }
 
         /// <summary>
         /// The total number of steps.
         /// </summary>
-        public int TotalStepCount { get; private set; }
+        public virtual int TotalStepCount { get; private set; }
     }
 }