Merge pull request #1219 from libgit2/cmn/reset-checkoutoptions

Expose Reset() with checkout options

Author: nulltoken

LibGit2Sharp.Tests/ResetHeadFixture.cs

@@ -235,6 +235,8 @@ public void HardResetInABareRepositoryThrows()
         [Fact]
         public void HardResetUpdatesTheContentOfTheWorkingDirectory()
         {
+            bool progressCalled = false;
+
             string path = SandboxStandardTestRepo();
             using (var repo = new Repository(path))
             {
@@ -245,11 +247,16 @@ public void HardResetUpdatesTheContentOfTheWorkingDirectory()
 
                 Assert.True(names.Count > 4);
 
-                repo.Reset(ResetMode.Hard, "HEAD~3");
+                var commit = repo.Lookup<Commit>("HEAD~3");
+                repo.Reset(ResetMode.Hard, commit, new CheckoutOptions()
+                {
+                    OnCheckoutProgress = (_path, _completed, _total) => { progressCalled = true; },
+                });
 
                 names = new DirectoryInfo(repo.Info.WorkingDirectory).GetFileSystemInfos().Select(fsi => fsi.Name).ToList();
                 names.Sort(StringComparer.Ordinal);
 
+                Assert.Equal(true, progressCalled);
                 Assert.Equal(new[] { ".git", "README", "WillNotBeRemoved.txt", "branch_file.txt", "new.txt", "new_untracked_file.txt" }, names);
             }
         }

LibGit2Sharp/IRepository.cs

@@ -165,6 +165,15 @@ public interface IRepository : IDisposable
         /// <param name="commit">The target commit object.</param>
         void Reset(ResetMode resetMode, Commit commit);
 
+        /// <summary>
+        /// Sets <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="resetMode">Flavor of reset operation to perform.</param>
+        /// <param name="commit">The target commit object.</param>
+        /// <param name="opts">Collection of parameters controlling checkout behavior.</param>
+        void Reset(ResetMode resetMode, Commit commit, CheckoutOptions options);
+
         /// <summary>
         /// Replaces entries in the <see cref="Repository.Index"/> with entries from the specified commit.
         /// </summary>

LibGit2Sharp/Repository.cs

@@ -985,15 +985,16 @@ public void Reset(ResetMode resetMode, Commit commit)
         }
 
         /// <summary>
-        /// Sets the current <see cref="Head"/> to the specified commit and optionally resets the <see cref="Index"/> and
+        /// Sets <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="resetMode">Flavor of reset operation to perform.</param>
         /// <param name="commit">The target commit object.</param>
         /// <param name="opts">Collection of parameters controlling checkout behavior.</param>
-        private void Reset(ResetMode resetMode, Commit commit, IConvertableToGitCheckoutOpts opts)
+        public void Reset(ResetMode resetMode, Commit commit, CheckoutOptions opts)
         {
             Ensure.ArgumentNotNull(commit, "commit");
+            Ensure.ArgumentNotNull(opts, "opts");
 
             using (GitCheckoutOptsWrapper checkoutOptionsWrapper = new GitCheckoutOptsWrapper(opts))
             {