Stop leaking rebase operation handles.

jamill · jamill · commit 573bddf7bc02 · 2015-02-19T21:10:56.000-05:00
diff --git a/LibGit2Sharp/RebaseOperation.cs b/LibGit2Sharp/RebaseOperation.cs
@@ -96,8 +96,7 @@ public virtual RebaseResult Continue(Signature committer, RebaseOptions options)
                     options.RebaseStepCompleted(new AfterRebaseStepInfo(stepInfo, new ObjectId(id)));
                 }
 
-                var rebaseDriver = new RebaseOperationImpl(rebase, repository, committer, options);
-                RebaseResult rebaseResult = rebaseDriver.Run();
+                RebaseResult rebaseResult = RebaseOperationImpl.Run(rebase, repository, committer, options);
                 return rebaseResult;
             }
             finally
diff --git a/LibGit2Sharp/RebaseOperationImpl.cs b/LibGit2Sharp/RebaseOperationImpl.cs
@@ -9,30 +9,25 @@ namespace LibGit2Sharp
 {
     internal class RebaseOperationImpl
     {
-        private RebaseSafeHandle rebaseOperationHandle;
-        private Repository repository;
-        private Signature committer;
-        private RebaseOptions options;
 
-        public RebaseOperationImpl(RebaseSafeHandle rebaseOp, Repository repo, Signature committer, RebaseOptions options)
+        /// <summary>
+        /// Run a rebase to completion, a conflict, or a requested stop point.
+        /// </summary>
+        /// <param name="rebaseOperationHandle">Handle to the rebase operation.</param>
+        /// <param name="repository">Repository in which rebase operation is being run.</param>
+        /// <param name="committer">Committer signature to use for the rebased commits.</param>
+        /// <param name="options">Options controlling rebase behavior.</param>
+        /// <returns>RebaseResult - describing the result of the rebase operation.</returns>
+        public static RebaseResult Run(RebaseSafeHandle rebaseOperationHandle,
+            Repository repository,
+            Signature committer,
+            RebaseOptions options)
         {
-            Ensure.ArgumentNotNull(rebaseOp, "rebaseOp");
-            Ensure.ArgumentNotNull(repo, "repo");
+            Ensure.ArgumentNotNull(rebaseOperationHandle, "rebaseOperationHandle");
+            Ensure.ArgumentNotNull(repository, "repository");
             Ensure.ArgumentNotNull(committer, "committer");
             Ensure.ArgumentNotNull(options, "options");
 
-            this.rebaseOperationHandle = rebaseOp;
-            this.repository = repo;
-            this.committer = committer;
-            this.options = options;
-        }
-
-        /// <summary>
-        /// Run a rebase to completion or conflict.
-        /// </summary>
-        /// <returns>true if completed successfully, false if conflicts encountered.</returns>
-        public RebaseResult Run()
-        {
             GitCheckoutOptsWrapper checkoutOptionsWrapper = new GitCheckoutOptsWrapper(options);
             GitCheckoutOpts gitCheckoutOpts = checkoutOptionsWrapper.Options;
             RebaseResult rebaseResult = null;
diff --git a/LibGit2Sharp/Repository.cs b/LibGit2Sharp/Repository.cs
@@ -1112,6 +1112,8 @@ public RebaseResult Rebase(Branch branch, Branch upstream, Branch onto, Signatur
             GitAnnotatedCommitHandle annotatedUpstreamRefPtrCommitHandle = null;
             GitAnnotatedCommitHandle annotatedOntoRefPtrCommitHandle = null;
 
+            RebaseSafeHandle rebaseOperationHandle = null;
+
             try
             {
                 branchRefPtr = (branch == null) ?
@@ -1141,15 +1143,13 @@ public RebaseResult Rebase(Branch branch, Branch upstream, Branch onto, Signatur
                     version = 1,
                 };
 
-                RebaseSafeHandle rebaseOperationHandle = Proxy.git_rebase_init(this.Handle,
+                rebaseOperationHandle = Proxy.git_rebase_init(this.Handle,
                     annotatedBranchCommitHandle,
                     annotatedUpstreamRefPtrCommitHandle,
                     annotatedOntoRefPtrCommitHandle,
                     null, ref gitRebaseOptions);
 
-                var rebaseDriver = new RebaseOperationImpl(rebaseOperationHandle, this, committer, options);
-                RebaseResult rebaseResult = rebaseDriver.Run();
-
+                RebaseResult rebaseResult = RebaseOperationImpl.Run(rebaseOperationHandle, this, committer, options);
                 return rebaseResult;
             }
             finally
@@ -1167,6 +1167,9 @@ public RebaseResult Rebase(Branch branch, Branch upstream, Branch onto, Signatur
                 annotatedUpstreamRefPtrCommitHandle = null;
                 annotatedOntoRefPtrCommitHandle.SafeDispose();
                 annotatedOntoRefPtrCommitHandle = null;
+
+                rebaseOperationHandle.SafeDispose();
+                rebaseOperationHandle = null;
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -96,8 +96,7 @@ public virtual RebaseResult Continue(Signature committer, RebaseOptions options)`
`96`	`96`	`options.RebaseStepCompleted(new AfterRebaseStepInfo(stepInfo, new ObjectId(id)));`
`97`	`97`	`}`
`98`	`98`
`99`		`- var rebaseDriver = new RebaseOperationImpl(rebase, repository, committer, options);`
`100`		`- RebaseResult rebaseResult = rebaseDriver.Run();`
	`99`	`+ RebaseResult rebaseResult = RebaseOperationImpl.Run(rebase, repository, committer, options);`
`101`	`100`	`return rebaseResult;`
`102`	`101`	`}`
`103`	`102`	`finally`