Move reset overloads to extension methods

Saaman · Saaman · commit 4930ffb4c995 · 2012-12-14T17:32:56.000+01:00
diff --git a/LibGit2Sharp/IRepository.cs b/LibGit2Sharp/IRepository.cs
@@ -125,28 +125,13 @@ public interface IRepository : IDisposable
         /// <param name = "commit">The target commit object.</param>
         void Reset(ResetOptions resetOptions, Commit commit);
 
-        /// <summary>
-        ///   Sets the current <see cref = "Repository.Head" /> to the specified commit and optionally resets the <see cref = "Repository.Index" /> and
-        ///   the content of the working tree to match.
-        /// </summary>
-        /// <param name = "resetOptions">Flavor of reset operation to perform.</param>
-        /// <param name = "committish">A revparse spec for the target commit object.</param>
-        void Reset(ResetOptions resetOptions, string committish = "HEAD");
-
         /// <summary>
         ///   Replaces entries in the <see cref="Repository.Index"/> with entries from the specified commit.
         /// </summary>
         /// <param name = "commit">The target commit object.</param>
         /// <param name = "paths">The list of paths (either files or directories) that should be considered.</param>
         void Reset(Commit commit, IEnumerable<string> paths = null);
 
-        /// <summary>
-        ///   Replaces entries in the <see cref="Repository.Index"/> with entries from the specified commit.
-        /// </summary>
-        /// <param name = "committish">A revparse spec for the target commit object.</param>
-        /// <param name = "paths">The list of paths (either files or directories) that should be considered.</param>
-        void Reset(string committish = "HEAD", IEnumerable<string> paths = null);
-
         /// <summary>
         /// Clean the working tree by removing files that are not under version control.
         /// </summary>
diff --git a/LibGit2Sharp/Repository.cs b/LibGit2Sharp/Repository.cs
@@ -539,20 +539,6 @@ public void Reset(ResetOptions resetOptions, Commit commit)
             Proxy.git_reset(handle, commit.Id, resetOptions);
         }
 
-        /// <summary>
-        ///   Sets the current <see cref = "Head" /> to the specified commit and optionally resets the <see cref = "Index" /> and
-        ///   the content of the working tree to match.
-        /// </summary>
-        /// <param name = "resetOptions">Flavor of reset operation to perform.</param>
-        /// <param name = "committish">A revparse spec for the target commit object.</param>
-        public void Reset(ResetOptions resetOptions, string committish = "HEAD")
-        {
-            Ensure.ArgumentNotNullOrEmptyString(committish, "committish");
-
-            Commit commit = LookupCommit(committish);
-            Reset(resetOptions, commit);
-        }
-
         /// <summary>
         ///   Replaces entries in the <see cref="Repository.Index"/> with entries from the specified commit.
         /// </summary>
@@ -571,24 +557,6 @@ public void Reset(Commit commit, IEnumerable<string> paths = null)
             Index.Reset(changes);
         }
 
-        /// <summary>
-        ///   Replaces entries in the <see cref="Index"/> with entries from the specified commit.
-        /// </summary>
-        /// <param name = "committish">A revparse spec for the target commit object.</param>
-        /// <param name = "paths">The list of paths (either files or directories) that should be considered.</param>
-        public void Reset(string committish = "HEAD", IEnumerable<string> paths = null)
-        {
-            if (Info.IsBare)
-            {
-                throw new BareRepositoryException("Reset is not allowed in a bare repository");
-            }
-
-            Ensure.ArgumentNotNullOrEmptyString(committish, "committish");
-
-            Commit commit = LookupCommit(committish);
-            Reset(commit, paths);
-        }
-
         /// <summary>
         ///   Stores the content of the <see cref = "Repository.Index" /> as a new <see cref = "Commit" /> into the repository.
         ///   The tip of the <see cref = "Repository.Head"/> will be used as the parent of this new Commit.
diff --git a/LibGit2Sharp/RepositoryExtensions.cs b/LibGit2Sharp/RepositoryExtensions.cs
@@ -1,4 +1,5 @@
 ﻿using System;
+using System.Collections.Generic;
 using LibGit2Sharp.Core;
 using LibGit2Sharp.Handlers;
 
@@ -111,6 +112,49 @@ public static Branch CreateBranch(this IRepository repository, string branchName
             return repository.Branches.Add(branchName, committish);
         }
 
+        /// <summary>
+        ///   Sets the current <see cref="Repository.Head"/> /> to the specified commit and optionally resets the <see cref = "Index" /> and
+        ///   the content of the working tree to match.
+        /// </summary>
+        /// <param name = "repository">The <see cref = "Repository" /> being worked with.</param>
+        /// <param name = "resetOptions">Flavor of reset operation to perform.</param>
+        /// <param name = "committish">A revparse spec for the target commit object.</param>
+        public static void Reset(this IRepository repository, ResetOptions resetOptions, string committish = "HEAD")
+        {
+            Ensure.ArgumentNotNullOrEmptyString(committish, "committish");
+
+            Commit commit = LookUpCommit(repository, committish);
+
+            repository.Reset(resetOptions, commit);
+        }
+
+        /// <summary>
+        ///   Replaces entries in the <see cref="Index"/> with entries from the specified commit.
+        /// </summary>
+        /// <param name = "repository">The <see cref = "Repository" /> being worked with.</param>
+        /// <param name = "committish">A revparse spec for the target commit object.</param>
+        /// <param name = "paths">The list of paths (either files or directories) that should be considered.</param>
+        public static void Reset(this IRepository repository, string committish = "HEAD", IEnumerable<string> paths = null)
+        {
+            if (repository.Info.IsBare)
+            {
+                throw new BareRepositoryException("Reset is not allowed in a bare repository");
+            }
+
+            Ensure.ArgumentNotNullOrEmptyString(committish, "committish");
+
+            Commit commit = LookUpCommit(repository, committish);
+
+            repository.Reset(commit, paths);
+        }
+
+        private static Commit LookUpCommit(IRepository repository, string committish)
+        {
+            GitObject obj = repository.Lookup(committish);
+            Ensure.GitObjectIsNotNull(obj, committish);
+            return obj.DereferenceToCommit(true);
+        }
+
         /// <summary>
         ///   Stores the content of the <see cref = "Repository.Index" /> as a new <see cref = "LibGit2Sharp.Commit" /> into the repository.
         ///   The tip of the <see cref = "Repository.Head"/> will be used as the parent of this new Commit.
