Add Stashes.Remove

Saaman · Saaman · commit 7081cd6ebefc · 2013-03-28T10:29:40.000+01:00
diff --git a/LibGit2Sharp.Tests/StashFixture.cs b/LibGit2Sharp.Tests/StashFixture.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using LibGit2Sharp.Tests.TestHelpers;
 using Xunit;
+using Xunit.Extensions;
 
 namespace LibGit2Sharp.Tests
 {
@@ -21,7 +22,7 @@ public void CannotAddStashAgainstBareRepository()
         }
 
         [Fact]
-        public void CanAddStash()
+        public void CanAddAndRemoveStash()
         {
             TemporaryCloneOfTestRepo path = BuildTemporaryCloneOfTestRepo(StandardTestRepoWorkingDirPath);
             using (var repo = new Repository(path.RepositoryPath))
@@ -61,6 +62,17 @@ public void CanAddStash()
                 // Stash history has been shifted
                 Assert.Equal(repo.Lookup<Commit>("stash@{0}").Sha, secondStash.Target.Sha);
                 Assert.Equal(repo.Lookup<Commit>("stash@{1}").Sha, stash.Target.Sha);
+
+                //Remove one stash
+                repo.Stashes.Remove("stash@{0}");
+                Assert.Equal(1, repo.Stashes.Count());
+                Stash newTopStash = repo.Stashes.First();
+                Assert.Equal("stash@{0}", newTopStash.CanonicalName);
+                Assert.Equal(stash.Target.Sha, newTopStash.Target.Sha);
+
+                // Stash history has been shifted
+                Assert.Equal(stash.Target.Sha, repo.Lookup<Commit>("stash").Sha);
+                Assert.Equal(stash.Target.Sha, repo.Lookup<Commit>("stash@{0}").Sha);
             }
         }
 
@@ -183,5 +195,19 @@ public void CanStashIgnoredFiles()
                 Assert.NotNull(blob);
             }
         }
+
+        [Theory]
+        [InlineData("stah@{0}")]
+        [InlineData("stash@{0")]
+        [InlineData("stash@{fake}")]
+        [InlineData("dummy")]
+        public void RemovingStashWithBadParamShouldThrow(string stashRefLog)
+        {
+            TemporaryCloneOfTestRepo path = BuildTemporaryCloneOfTestRepo(StandardTestRepoWorkingDirPath);
+            using (var repo = new Repository(path.RepositoryPath))
+            {
+                Assert.Throws<ArgumentException>(() => repo.Stashes.Remove(stashRefLog));
+            }
+        }
     }
 }
diff --git a/LibGit2Sharp/Core/NativeMethods.cs b/LibGit2Sharp/Core/NativeMethods.cs
@@ -953,6 +953,9 @@ internal static extern int git_stash_foreach(
             git_stash_cb callback,
             IntPtr payload);
 
+        [DllImport(libgit2)]
+        internal static extern int git_stash_drop(RepositorySafeHandle repo, UIntPtr index);
+
         [DllImport(libgit2)]
         internal static extern int git_status_file(
             out FileStatus statusflags,
diff --git a/LibGit2Sharp/Core/Proxy.cs b/LibGit2Sharp/Core/Proxy.cs
@@ -1801,6 +1801,15 @@ public static ICollection<TResult> git_stash_foreach<TResult>(
                 GitErrorCode.NotFound);
         }
 
+        public static void git_stash_drop(RepositorySafeHandle repo, int index)
+        {
+            using (ThreadAffinity())
+            {
+                int res = NativeMethods.git_stash_drop(repo, (UIntPtr) index);
+                Ensure.BooleanResult(res);
+            }
+        }
+
         #endregion
 
         #region git_status_
diff --git a/LibGit2Sharp/StashCollection.cs b/LibGit2Sharp/StashCollection.cs
@@ -1,4 +1,5 @@
-﻿using System.Collections;
+﻿using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Globalization;
@@ -77,6 +78,42 @@ public virtual Stash Add(Signature stasher, string message = null, StashOptions
             return new Stash(repo, oid, 0);
         }
 
+        /// <summary>
+        ///   Remove a single stashed state from the stash list.
+        /// </summary>
+        /// <param name = "stashRefLog">The log reference of the stash to delete. Pattern is "stash@{i}" where i is the index of the stash to remove</param>
+        public virtual void Remove(string stashRefLog)
+        {
+            Ensure.ArgumentNotNullOrEmptyString(stashRefLog, "stashRefLog");
+
+            int index;
+            if(!TryExtractStashIndexFromRefLog(stashRefLog, out index) || index < 0)
+            {
+                throw new ArgumentException("must be a valid stash log reference. Pattern is 'stash@{i}' where 'i' is an integer", "stashRefLog");
+            }
+
+            Proxy.git_stash_drop(repo.Handle, index);
+        }
+
+        private static bool TryExtractStashIndexFromRefLog(string stashRefLog, out int index)
+        {
+            index = -1;
+
+            if (!stashRefLog.StartsWith("stash@{"))
+            {
+                return false;
+            }
+
+            if (!stashRefLog.EndsWith("}"))
+            {
+                return false;
+            }
+
+            var indexAsString = stashRefLog.Substring(7, stashRefLog.Length - 8);
+
+            return int.TryParse(indexAsString, out index);
+        }
+
         private string DebuggerDisplay
         {
             get

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`using System.Linq;`
`4`	`4`	`using LibGit2Sharp.Tests.TestHelpers;`
`5`	`5`	`using Xunit;`
	`6`	`+using Xunit.Extensions;`
`6`	`7`
`7`	`8`	`namespace LibGit2Sharp.Tests`
`8`	`9`	`{`
`@@ -21,7 +22,7 @@ public void CannotAddStashAgainstBareRepository()`
`21`	`22`	`}`
`22`	`23`
`23`	`24`	`[Fact]`
`24`		`- public void CanAddStash()`
	`25`	`+ public void CanAddAndRemoveStash()`
`25`	`26`	`{`
`26`	`27`	`TemporaryCloneOfTestRepo path = BuildTemporaryCloneOfTestRepo(StandardTestRepoWorkingDirPath);`
`27`	`28`	`using (var repo = new Repository(path.RepositoryPath))`
`@@ -61,6 +62,17 @@ public void CanAddStash()`
`61`	`62`	`// Stash history has been shifted`
`62`	`63`	`Assert.Equal(repo.Lookup<Commit>("stash@{0}").Sha, secondStash.Target.Sha);`
`63`	`64`	`Assert.Equal(repo.Lookup<Commit>("stash@{1}").Sha, stash.Target.Sha);`
	`65`	`+`
	`66`	`+ //Remove one stash`
	`67`	`+ repo.Stashes.Remove("stash@{0}");`
	`68`	`+ Assert.Equal(1, repo.Stashes.Count());`
	`69`	`+ Stash newTopStash = repo.Stashes.First();`
	`70`	`+ Assert.Equal("stash@{0}", newTopStash.CanonicalName);`
	`71`	`+ Assert.Equal(stash.Target.Sha, newTopStash.Target.Sha);`
	`72`	`+`
	`73`	`+ // Stash history has been shifted`
	`74`	`+ Assert.Equal(stash.Target.Sha, repo.Lookup<Commit>("stash").Sha);`
	`75`	`+ Assert.Equal(stash.Target.Sha, repo.Lookup<Commit>("stash@{0}").Sha);`
`64`	`76`	`}`
`65`	`77`	`}`
`66`	`78`
`@@ -183,5 +195,19 @@ public void CanStashIgnoredFiles()`
`183`	`195`	`Assert.NotNull(blob);`
`184`	`196`	`}`
`185`	`197`	`}`
	`198`	`+`
	`199`	`+ [Theory]`
	`200`	`+ [InlineData("stah@{0}")]`
	`201`	`+ [InlineData("stash@{0")]`
	`202`	`+ [InlineData("stash@{fake}")]`
	`203`	`+ [InlineData("dummy")]`
	`204`	`+ public void RemovingStashWithBadParamShouldThrow(string stashRefLog)`
	`205`	`+ {`
	`206`	`+ TemporaryCloneOfTestRepo path = BuildTemporaryCloneOfTestRepo(StandardTestRepoWorkingDirPath);`
	`207`	`+ using (var repo = new Repository(path.RepositoryPath))`
	`208`	`+ {`
	`209`	`+ Assert.Throws<ArgumentException>(() => repo.Stashes.Remove(stashRefLog));`
	`210`	`+ }`
	`211`	`+ }`
`186`	`212`	`}`
`187`	`213`	`}`