Convert repo.Checkout() overloads into extensions methods

nulltoken · nulltoken · commit 27346201a003 · 2012-12-06T08:42:35.000Z
diff --git a/LibGit2Sharp/Branch.cs b/LibGit2Sharp/Branch.cs
@@ -193,7 +193,7 @@ public virtual Remote Remote
         /// </summary>
         public virtual void Checkout()
         {
-            repo.CheckoutInternal(CanonicalName, CheckoutOptions.None, null);
+            repo.Checkout(this);
         }
 
         /// <summary>
@@ -203,7 +203,7 @@ public virtual void Checkout()
         /// <param name="onCheckoutProgress">Callback method to report checkout progress updates through.</param>
         public virtual void Checkout(CheckoutOptions checkoutOptions, CheckoutProgressHandler onCheckoutProgress)
         {
-            repo.CheckoutInternal(CanonicalName, checkoutOptions, onCheckoutProgress);
+            repo.Checkout(this, checkoutOptions, onCheckoutProgress);
         }
 
         private Branch ResolveTrackedBranch()
diff --git a/LibGit2Sharp/Repository.cs b/LibGit2Sharp/Repository.cs
@@ -440,16 +440,6 @@ public static Repository Clone(string sourceUrl, string workdirPath,
             return new Repository(workdirPath);
         }
 
-        /// <summary>
-        ///   Checkout the specified <see cref = "Branch" />, reference or SHA.
-        /// </summary>
-        /// <param name = "commitOrBranchSpec">A revparse spec for the commit or branch to checkout.</param>
-        /// <returns>The <see cref = "Branch" /> that was checked out.</returns>
-        public Branch Checkout(string commitOrBranchSpec)
-        {
-            return Checkout(commitOrBranchSpec, CheckoutOptions.None, null);
-        }
-
         /// <summary>
         ///   Checkout the specified <see cref = "Branch" />, reference or SHA.
         /// </summary>
@@ -470,16 +460,6 @@ public Branch Checkout(string commitishOrBranchSpec, CheckoutOptions checkoutOpt
             return CheckoutInternal(commitId.Sha, checkoutOptions, onCheckoutProgress);
         }
 
-        /// <summary>
-        ///   Checkout the specified <see cref = "Branch" />.
-        /// </summary>
-        /// <param name="branch">The <see cref = "Branch" /> to check out.</param>
-        /// <returns>The <see cref = "Branch" /> that was checked out.</returns>
-        public Branch Checkout(Branch branch)
-        {
-            return Checkout(branch, CheckoutOptions.None, null);
-        }
-
         /// <summary>
         ///   Checkout the specified <see cref = "Branch" />.
         /// </summary>
@@ -502,7 +482,7 @@ public Branch Checkout(Branch branch, CheckoutOptions checkoutOptions, CheckoutP
         /// <param name="checkoutOptions"><see cref = "CheckoutOptions" /> controlling checkout behavior.</param>
         /// <param name="onCheckoutProgress"><see cref = "CheckoutProgressHandler" /> that checkout progress is reported through.</param>
         /// <returns>The <see cref = "Branch" /> that was checked out.</returns>
-        internal Branch CheckoutInternal(string commitIdOrCanonicalBranchName, CheckoutOptions checkoutOptions, CheckoutProgressHandler onCheckoutProgress)
+        private Branch CheckoutInternal(string commitIdOrCanonicalBranchName, CheckoutOptions checkoutOptions, CheckoutProgressHandler onCheckoutProgress)
         {
             if (Info.IsBare)
             {
diff --git a/LibGit2Sharp/RepositoryExtensions.cs b/LibGit2Sharp/RepositoryExtensions.cs
@@ -183,5 +183,28 @@ private static Signature BuildSignatureFromGlobalConfiguration(IRepository repos
 
             return new Signature(name.Value, email.Value, now);
         }
+
+        /// <summary>
+        ///   Checkout the specified <see cref = "Branch" />, reference or SHA.
+        /// </summary>
+        /// <param name="repository">The <see cref = "Repository" /> being worked with.</param>
+        /// <param name = "commitOrBranchSpec">A revparse spec for the commit or branch to checkout.</param>
+        /// <returns>The <see cref = "Branch" /> that was checked out.</returns>
+        public static Branch Checkout(this IRepository repository, string commitOrBranchSpec)
+        {
+            return repository.Checkout(commitOrBranchSpec, CheckoutOptions.None, null);
+        }
+
+
+        /// <summary>
+        ///   Checkout the specified <see cref = "Branch" />.
+        /// </summary>
+        /// <param name="repository">The <see cref = "Repository" /> being worked with.</param>
+        /// <param name="branch">The <see cref = "Branch" /> to check out.</param>
+        /// <returns>The <see cref = "Branch" /> that was checked out.</returns>
+        public static Branch Checkout(this IRepository repository, Branch branch)
+        {
+            return repository.Checkout(branch, CheckoutOptions.None, null);
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@ public virtual Remote Remote`
`193`	`193`	`/// </summary>`
`194`	`194`	`public virtual void Checkout()`
`195`	`195`	`{`
`196`		`- repo.CheckoutInternal(CanonicalName, CheckoutOptions.None, null);`
	`196`	`+ repo.Checkout(this);`
`197`	`197`	`}`
`198`	`198`
`199`	`199`	`/// <summary>`
`@@ -203,7 +203,7 @@ public virtual void Checkout()`
`203`	`203`	`/// <param name="onCheckoutProgress">Callback method to report checkout progress updates through.</param>`
`204`	`204`	`public virtual void Checkout(CheckoutOptions checkoutOptions, CheckoutProgressHandler onCheckoutProgress)`
`205`	`205`	`{`
`206`		`- repo.CheckoutInternal(CanonicalName, checkoutOptions, onCheckoutProgress);`
	`206`	`+ repo.Checkout(this, checkoutOptions, onCheckoutProgress);`
`207`	`207`	`}`
`208`	`208`
`209`	`209`	`private Branch ResolveTrackedBranch()`