- Fix delete -n when no patches are applied.

2 files changed, 41 insertions, 1 deletions

diff --git a/test/delete.test b/test/delete.test
index 7fd3255..bbeb3e9 100644
--- a/test/delete.test
+++ b/test/delete.test
@@ -4,6 +4,9 @@ Test the delete command.
 	$ mkdir -p d/patches
 	$ cd d
 
+	$ quilt delete
+	> No patches in series
+
 	$ cat > test.txt
 	< Calling pci_match_id() would be more feasible.
 
@@ -31,6 +34,9 @@ Test the delete command.
 	$ quilt refresh
 	> Refreshed patch %{P}test2
 
+	$ quilt delete test1
+	> Patch %{P}test1 is currently applied
+
 	$ quilt pop
 	> Removing patch %{P}test2
 	> Restoring test.txt
@@ -58,5 +64,39 @@ Test the delete command.
 
 	$ quilt series
 
+	$ echo "test1" > %{P}series
+	$ quilt delete -n
+	> Removed patch %{P}test1
+
+	$ quilt series
+
+	# Force the pop operaton to fail
+	$ echo "test3" > %{P}/series
+	$ echo "test3" > .pc/applied-patches
+	$ mkdir -p .pc/test3/dir
+	$ touch .pc/test3/dir/file
+	$ chmod a-rx .pc/test3/dir
+
+	$ quilt delete "test3"
+	> Removing patch %{P}test3
+	> .pc/test3/dir: Permission denied
+	> Removing patch %{P}test3 failed
+
+	$ chmod a+rx .pc/test3/dir
+
+	$ find .pc/test3
+	> .pc/test3
+	> .pc/test3/dir
+	> .pc/test3/dir/file
+
+	$ quilt applied
+	> No patches applied
+
+	$ quilt series
+	> %{P}test3
+
+	$ quilt delete test3
+	> Removed patch %{P}test3
+
 	$ cd ..
 	$ rm -rf d
diff --git a/test/three.test b/test/three.test
index 44daabc..07bdb33 100644
--- a/test/three.test
+++ b/test/three.test
@@ -132,7 +132,7 @@
 	> Now at patch patches/patch2.diff
 
 	$ quilt push patch2
-	> Patch patches/patch2.diff is already applied
+	> Patch patches/patch2.diff is currently applied
 
 	$ quilt push
 	> File series fully applied, ends at patch patches/patch2.diff