Introduce Stash.Apply and Stash.Drop

libgit2 · Therzok · Apr 6, 2015 · Apr 5, 2015 · Apr 5, 2015 · Apr 5, 2015
commit ec7a71f42decc96ba2d21213faa7b16cd0410796
diff --git a/LibGit2Sharp/Core/NativeMethods.cs b/LibGit2Sharp/Core/NativeMethods.cs
@@ -1325,6 +1325,20 @@ internal static extern int git_stash_foreach(
         [DllImport(libgit2)]
         internal static extern int git_stash_drop(RepositorySafeHandle repo, UIntPtr index);
 
+        [DllImport(libgit2)]
+        internal static extern int git_stash_apply(
+            RepositorySafeHandle repo,
+            UIntPtr index,
+            ref GitCheckoutOpts opts,
+            StashApplyModifiers flags);
+
+        [DllImport(libgit2)]
+        internal static extern int git_stash_pop(
+            RepositorySafeHandle repo,
+            UIntPtr index,
+            ref GitCheckoutOpts opts,
+            StashApplyModifiers flags);
+
         [DllImport(libgit2)]
         internal static extern int git_status_file(
             out FileStatus statusflags,

diff --git a/LibGit2Sharp/Core/Proxy.cs b/LibGit2Sharp/Core/Proxy.cs
@@ -2723,6 +2723,32 @@ public static void git_stash_drop(RepositorySafeHandle repo, int index)
             }
         }
 
+        public static void git_stash_apply(
+            RepositorySafeHandle repo,
+            int index,
+            ref GitCheckoutOpts opts,
+            StashApplyModifiers flags)
+        {
+            using (ThreadAffinity())
+            {
+                int res = NativeMethods.git_stash_apply(repo, (UIntPtr)index, ref opts, flags);
+                Ensure.ZeroResult(res);
+            }
+        }
+
+        public static void git_stash_pop(
+            RepositorySafeHandle repo,
+            int index,
+            ref GitCheckoutOpts opts,
+            StashApplyModifiers flags)
+        {
+            using (ThreadAffinity())
+            {
+                int res = NativeMethods.git_stash_pop(repo, (UIntPtr)index, ref opts, flags);
+                Ensure.ZeroResult(res);
+            }
+        }
+
         #endregion
 
         #region git_status_

diff --git a/LibGit2Sharp/StashCollection.cs b/LibGit2Sharp/StashCollection.cs
@@ -114,6 +114,36 @@ public virtual void Remove(int index)
             Proxy.git_stash_drop(repo.Handle, index);
         }
 
+        /// <summary>
+        /// Applies a single stashed state from the stash list
+        /// </summary>
+        /// <param name="index">the index of the stash to remove (0 being the most recent one).</param>
+        /// <param name="options">the options to use for checking out the stash.</param>
+        /// <param name="flags">the flags to use for applying the changes.</param>
+        public virtual void Apply(int index, CheckoutOptions options = null, StashApplyModifiers flags = StashApplyModifiers.Default)
+        {
+            using (GitCheckoutOptsWrapper checkoutOptionsWrapper = new GitCheckoutOptsWrapper(options))
+            {
+                var opts = checkoutOptionsWrapper.Options;
+                Proxy.git_stash_apply(repo.Handle, index, ref opts, flags);
+            }
+        }
+
+        /// <summary>
+        /// Pops a single stashed state from the stash list
+        /// </summary>
+        /// <param name="index">the index of the stash to remove (0 being the most recent one).</param>
+        /// <param name="options">the options to use for checking out the stash.</param>
+        /// <param name="flags">the flags to use for applying the changes.</param>
+        public virtual void Pop(int index, CheckoutOptions options = null, StashApplyModifiers flags = StashApplyModifiers.Default)
+        {
+            using (GitCheckoutOptsWrapper checkoutOptionsWrapper = new GitCheckoutOptsWrapper(options))
+            {
+                var opts = checkoutOptionsWrapper.Options;
+                Proxy.git_stash_pop(repo.Handle, index, ref opts, flags);
+            }
+        }
+
         private string DebuggerDisplay
         {
             get

diff --git a/LibGit2Sharp/StashModifiers.cs b/LibGit2Sharp/StashModifiers.cs
@@ -31,4 +31,23 @@ public enum StashModifiers
         /// </summary>
         IncludeIgnored = (1 << 2),
     }
+
+    ///<summary>
+    /// Options controlling Stash applying behavior.
+    ///</summary>
+    [Flags]
+    public enum StashApplyModifiers
+    {
+        /// <summary>
+        /// Default. Reinstante working directory stashed
+        /// changes.
+        /// </summary>
+        Default = 0,
+
+        /// <summary>
+        /// Reinstate both index and working directory stashed
+        /// changes.
+        /// </summary>
+        ReinstateIndex = (1 << 0),
+    }
 }