- Fix delete -n when no patches are applied.

9 files changed, 186 insertions, 92 deletions

diff --git a/po/de.po b/po/de.po
index 9b56108..686a461 100644
--- a/po/de.po
+++ b/po/de.po
@@ -173,27 +173,37 @@ msgstr ""
 "\tBenenne den Patch auf patch~, anstatt ihn zu löschen.\n"
 "\tHat nur in Kompination mit -r eine Wirkung.\n"
 
-#: quilt/delete.in:86
+#: quilt/delete.in:89
 msgid "No next patch\\n"
 msgstr "Kein Patch %s\\n"
 
-#: quilt/delete.in:94
+#: quilt/delete.in:95 quilt/scripts/patchfns.in:448
+#, fuzzy
+msgid "No patches in series\\n"
+msgstr "Keine Patches in der series-Datei\\n"
+
+#: quilt/delete.in:101 quilt/scripts/patchfns.in:545
 msgid "Patch %s is currently applied\\n"
 msgstr "Patch %s ist momentan angewandt\\n"
 
-#: quilt/delete.in:102
+#: quilt/delete.in:107
+#, fuzzy
+msgid "Removing patch %s failed\\n"
+msgstr "Entferne patch %s\\n"
+
+#: quilt/delete.in:115
 msgid "Removed patch %s\\n"
 msgstr "Entferne Patch %s\\n"
 
-#: quilt/delete.in:104
+#: quilt/delete.in:117
 msgid "Failed to remove patch %s\\n"
 msgstr "Konnte Patch %s nicht entfernen\\n"
 
-#: quilt/delete.in:115
+#: quilt/delete.in:128
 msgid "Failed to backup patch file \\\"%s\\\"\\n"
 msgstr "Konnte Datei %s nicht sichern\\n"
 
-#: quilt/delete.in:122
+#: quilt/delete.in:135
 msgid "Failed to remove patch file \\\"%s\\\"\\n"
 msgstr "Konnte Patch %s nicht entfernen\\n"
 
@@ -855,7 +865,7 @@ msgstr "Patch %s muss zuerst aufgefrischt werden (Refresh).\\n"
 msgid "No patch removed\\n"
 msgstr "Kein Patch entfernt\\n"
 
-#: quilt/pop.in:269 quilt/scripts/patchfns.in:455
+#: quilt/pop.in:269 quilt/scripts/patchfns.in:461
 msgid "No patches applied\\n"
 msgstr "Keine Patches angewandt\\n"
 
@@ -1197,28 +1207,19 @@ msgstr "Datei %s ist verschwunden\n"
 msgid "Failed to rename %s to %s: %s\n"
 msgstr "Konnte %s nicht auf %s umbenennen: %s\n"
 
-#: quilt/scripts/patchfns.in:442
-#, fuzzy
-msgid "No patches in series\\n"
-msgstr "Keine Patches in der series-Datei\\n"
-
-#: quilt/scripts/patchfns.in:491
+#: quilt/scripts/patchfns.in:497
 msgid "Patch %s is not in series\\n"
 msgstr "Patch %s ist nicht in der series-Datei\\n"
 
-#: quilt/scripts/patchfns.in:518
+#: quilt/scripts/patchfns.in:524
 msgid "Patch %s is not applied\\n"
 msgstr "Patch %s ist nicht angewandt\\n"
 
-#: quilt/scripts/patchfns.in:539
-msgid "Patch %s is already applied\\n"
-msgstr "Patch %s ist bereits angewandt\\n"
-
-#: quilt/scripts/patchfns.in:555
+#: quilt/scripts/patchfns.in:561
 msgid "File series fully applied, ends at patch %s\\n"
 msgstr "series-Datei vollständig angewandt, endet in Patch %s\\n"
 
-#: quilt/scripts/patchfns.in:795
+#: quilt/scripts/patchfns.in:801
 msgid ""
 "The quilt meta-data in this tree has version %s, but this version of quilt "
 "can only handle meta-data formats up to and including version %s. Please pop "
@@ -1231,7 +1232,7 @@ msgstr ""
 "quilt alle Patches mit der Version von quilt, die zur Erstellung des "
 "Arbeitsverzeichnisses verwendet wurde.\\n"
 
-#: quilt/scripts/patchfns.in:880
+#: quilt/scripts/patchfns.in:886
 msgid ""
 "The working tree was created by an older version of quilt. Please run 'quilt "
 "upgrade'.\\n"
@@ -1434,3 +1435,14 @@ msgstr ""
 "Bitte entfernen Sie alle Patches mit \\`quilt pop -a' der quilt-Version, die "
 "zur Erzeugung des Arbeitsverzeichnis verwendet wurden, oder entfernen Sie "
 "das Verzeichnis %s, und wenden Sie die Patches neu an.\\n"
+
+#, fuzzy
+#~ msgid "Patch s is currently applied\\n"
+#~ msgstr "Patch %s ist momentan angewandt\\n"
+
+#, fuzzy
+#~ msgid "Patch %s is not on top\\n"
+#~ msgstr "Der oberste Patch ist jetzt %s\\n"
+
+#~ msgid "Patch %s is already applied\\n"
+#~ msgstr "Patch %s ist bereits angewandt\\n"
diff --git a/po/fr.po b/po/fr.po
index 8d0048c..2bdc2b1 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -173,27 +173,37 @@ msgstr ""
 "\tRenomme le fichier en patch~ au lieu de le supprimer.\n"
 "\tIgnoré si \\\"-r\\\" n'est pas également utilisé.\n"
 
-#: quilt/delete.in:86
+#: quilt/delete.in:89
 msgid "No next patch\\n"
 msgstr "Pas de patch suivant\\n"
 
-#: quilt/delete.in:94
+#: quilt/delete.in:95 quilt/scripts/patchfns.in:448
+#, fuzzy
+msgid "No patches in series\\n"
+msgstr "Aucun patch n'est appliqué\\n"
+
+#: quilt/delete.in:101 quilt/scripts/patchfns.in:545
 msgid "Patch %s is currently applied\\n"
 msgstr "Le patch %s est actuellement appliqué\\n"
 
-#: quilt/delete.in:102
+#: quilt/delete.in:107
+#, fuzzy
+msgid "Removing patch %s failed\\n"
+msgstr "Retrait de %s\\n"
+
+#: quilt/delete.in:115
 msgid "Removed patch %s\\n"
 msgstr "Patch %s retiré\\n"
 
-#: quilt/delete.in:104
+#: quilt/delete.in:117
 msgid "Failed to remove patch %s\\n"
 msgstr "Impossible de retirer le patch %s\\n"
 
-#: quilt/delete.in:115
+#: quilt/delete.in:128
 msgid "Failed to backup patch file \\\"%s\\\"\\n"
 msgstr "Impossible de faire une copie de sécurité du fichier \\\"%s\\\"\\n"
 
-#: quilt/delete.in:122
+#: quilt/delete.in:135
 msgid "Failed to remove patch file \\\"%s\\\"\\n"
 msgstr "Impossible de retirer le patch \\\"%s\\\"\\n"
 
@@ -864,7 +874,7 @@ msgstr "Le patch %s doit être rafraichi au préalable.\\n"
 msgid "No patch removed\\n"
 msgstr "Aucun patch retiré\\n"
 
-#: quilt/pop.in:269 quilt/scripts/patchfns.in:455
+#: quilt/pop.in:269 quilt/scripts/patchfns.in:461
 msgid "No patches applied\\n"
 msgstr "Aucun patch n'est appliqué\\n"
 
@@ -1209,28 +1219,19 @@ msgstr "Le fichier %s a disparu !\n"
 msgid "Failed to rename %s to %s: %s\n"
 msgstr "Impossible de renommer %s en %s : %s\n"
 
-#: quilt/scripts/patchfns.in:442
-#, fuzzy
-msgid "No patches in series\\n"
-msgstr "Aucun patch n'est appliqué\\n"
-
-#: quilt/scripts/patchfns.in:491
+#: quilt/scripts/patchfns.in:497
 msgid "Patch %s is not in series\\n"
 msgstr "Le patch %s n'est pas dans la série\\n"
 
-#: quilt/scripts/patchfns.in:518
+#: quilt/scripts/patchfns.in:524
 msgid "Patch %s is not applied\\n"
 msgstr "Le patch %s n'est pas appliqué\\n"
 
-#: quilt/scripts/patchfns.in:539
-msgid "Patch %s is already applied\\n"
-msgstr "Le patch %s est déjà appliqué.\\n"
-
-#: quilt/scripts/patchfns.in:555
+#: quilt/scripts/patchfns.in:561
 msgid "File series fully applied, ends at patch %s\\n"
 msgstr "La série est complètement appliquée. Le dernier patch est %s.\\n"
 
-#: quilt/scripts/patchfns.in:795
+#: quilt/scripts/patchfns.in:801
 msgid ""
 "The quilt meta-data in this tree has version %s, but this version of quilt "
 "can only handle meta-data formats up to and including version %s. Please pop "
@@ -1242,7 +1243,7 @@ msgstr ""
 "format %s (inclus). Veuillez retirer vos patches avec la version \n"
 "utilisée pour les appliquer avant d'installer une version plus ancienne.\\n"
 
-#: quilt/scripts/patchfns.in:880
+#: quilt/scripts/patchfns.in:886
 msgid ""
 "The working tree was created by an older version of quilt. Please run 'quilt "
 "upgrade'.\\n"
@@ -1447,6 +1448,17 @@ msgstr ""
 "version utilisée pour créer cet arbre de travail, ou effacez le répertoire\n"
 "%s et réappliquez complètement vos patchs.\\n"
 
+#, fuzzy
+#~ msgid "Patch s is currently applied\\n"
+#~ msgstr "Le patch %s est actuellement appliqué\\n"
+
+#, fuzzy
+#~ msgid "Patch %s is not on top\\n"
+#~ msgstr "Le patch %s est maintenant au sommet\\n"
+
+#~ msgid "Patch %s is already applied\\n"
+#~ msgstr "Le patch %s est déjà appliqué.\\n"
+
 #~ msgid "Patch is not applied\\n"
 #~ msgstr "Le patch n'est pas appliqué\\n"
 
diff --git a/po/ja.po b/po/ja.po
index cb68f0c..7937e03 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -170,27 +170,37 @@ msgstr ""
 "\tパッ�を削除���パッ�~���を変更���。オプション\\\"-r\\\"�\n"
 "\t有効�������無視�れる。\n"
 
-#: quilt/delete.in:86
+#: quilt/delete.in:89
 msgid "No next patch\\n"
 msgstr "次�パッ���り��ん\\n"
 
-#: quilt/delete.in:94
+#: quilt/delete.in:95 quilt/scripts/patchfns.in:448
+#, fuzzy
+msgid "No patches in series\\n"
+msgstr "�用�れ��るパッ���り��ん\\n"
+
+#: quilt/delete.in:101 quilt/scripts/patchfns.in:545
 msgid "Patch %s is currently applied\\n"
 msgstr "パッ� %s ��在�用�れ����\\n"
 
-#: quilt/delete.in:102
+#: quilt/delete.in:107
+#, fuzzy
+msgid "Removing patch %s failed\\n"
+msgstr "パッ� %s を�����\\n"
+
+#: quilt/delete.in:115
 msgid "Removed patch %s\\n"
 msgstr "パッ� %s �削除�れ���\\n"
 
-#: quilt/delete.in:104
+#: quilt/delete.in:117
 msgid "Failed to remove patch %s\\n"
 msgstr "パッ� %s を削除�る���失敗����\\n"
 
-#: quilt/delete.in:115
+#: quilt/delete.in:128
 msgid "Failed to backup patch file \\\"%s\\\"\\n"
 msgstr "ファイル \\\"%s\\\" ��ックアップ�失敗����\\n"
 
-#: quilt/delete.in:122
+#: quilt/delete.in:135
 msgid "Failed to remove patch file \\\"%s\\\"\\n"
 msgstr "パッ� \\\"%s\\\" を削除�る���失敗����\\n"
 
@@ -838,7 +848,7 @@ msgstr "最���パッ� %s �リフレッシュ�必���。\\n"
 msgid "No patch removed\\n"
 msgstr "�用�れ��るパッ���り��ん\\n"
 
-#: quilt/pop.in:269 quilt/scripts/patchfns.in:455
+#: quilt/pop.in:269 quilt/scripts/patchfns.in:461
 msgid "No patches applied\\n"
 msgstr "�用�れ��るパッ���り��ん\\n"
 
@@ -1172,29 +1182,20 @@ msgstr "ファイル %s �消����!\n"
 msgid "Failed to rename %s to %s: %s\n"
 msgstr "パッ� %s �ら %s�����変更�失敗����: %s\n"
 
-#: quilt/scripts/patchfns.in:442
-#, fuzzy
-msgid "No patches in series\\n"
-msgstr "�用�れ��るパッ���り��ん\\n"
-
-#: quilt/scripts/patchfns.in:491
+#: quilt/scripts/patchfns.in:497
 msgid "Patch %s is not in series\\n"
 msgstr "パッ� %s � series�中��り��ん\\n"
 
-#: quilt/scripts/patchfns.in:518
+#: quilt/scripts/patchfns.in:524
 msgid "Patch %s is not applied\\n"
 msgstr "パッ� %s ��用�れ����ん\\n"
 
-#: quilt/scripts/patchfns.in:539
-msgid "Patch %s is already applied\\n"
-msgstr "パッ� %s ������用済��\\n"
-
-#: quilt/scripts/patchfns.in:555
+#: quilt/scripts/patchfns.in:561
 msgid "File series fully applied, ends at patch %s\\n"
 msgstr ""
 "seriesファイル�パッ������用�れ����。最終パッ�� %s ��。\\n"
 
-#: quilt/scripts/patchfns.in:795
+#: quilt/scripts/patchfns.in:801
 msgid ""
 "The quilt meta-data in this tree has version %s, but this version of quilt "
 "can only handle meta-data formats up to and including version %s. Please pop "
@@ -1206,7 +1207,7 @@ msgstr ""
 "����ん。ダウングレード�る���push���ージョン� quiltを使���\n"
 "����パッ�を pop ������。\\n"
 
-#: quilt/scripts/patchfns.in:880
+#: quilt/scripts/patchfns.in:886
 msgid ""
 "The working tree was created by an older version of quilt. Please run 'quilt "
 "upgrade'.\\n"
@@ -1409,6 +1410,17 @@ msgstr ""
 "pop -a'を実行������パッ�を��������。����%s ディレク\n"
 "トリを削除��最��らパッ�を��直������。\\n"
 
+#, fuzzy
+#~ msgid "Patch s is currently applied\\n"
+#~ msgstr "パッ� %s ��在�用�れ����\\n"
+
+#, fuzzy
+#~ msgid "Patch %s is not on top\\n"
+#~ msgstr "パッ� %s を最上������\\n"
+
+#~ msgid "Patch %s is already applied\\n"
+#~ msgstr "パッ� %s ������用済��\\n"
+
 #~ msgid "Patch is not applied\\n"
 #~ msgstr "パッ���用�れ����ん\\n"
 
diff --git a/po/quilt.pot b/po/quilt.pot
index 6151b1d..c2263ec 100644
--- a/po/quilt.pot
+++ b/po/quilt.pot
@@ -113,27 +113,35 @@ msgid ""
 "\tIgnored if not used with \\\"-r\\\".\n"
 msgstr ""
 
-#: quilt/delete.in:86
+#: quilt/delete.in:89
 msgid "No next patch\\n"
 msgstr ""
 
-#: quilt/delete.in:94
+#: quilt/delete.in:95 quilt/scripts/patchfns.in:448
+msgid "No patches in series\\n"
+msgstr ""
+
+#: quilt/delete.in:101 quilt/scripts/patchfns.in:545
 msgid "Patch %s is currently applied\\n"
 msgstr ""
 
-#: quilt/delete.in:102
+#: quilt/delete.in:107
+msgid "Removing patch %s failed\\n"
+msgstr ""
+
+#: quilt/delete.in:115
 msgid "Removed patch %s\\n"
 msgstr ""
 
-#: quilt/delete.in:104
+#: quilt/delete.in:117
 msgid "Failed to remove patch %s\\n"
 msgstr ""
 
-#: quilt/delete.in:115
+#: quilt/delete.in:128
 msgid "Failed to backup patch file \\\"%s\\\"\\n"
 msgstr ""
 
-#: quilt/delete.in:122
+#: quilt/delete.in:135
 msgid "Failed to remove patch file \\\"%s\\\"\\n"
 msgstr ""
 
@@ -577,7 +585,7 @@ msgstr ""
 msgid "No patch removed\\n"
 msgstr ""
 
-#: quilt/pop.in:269 quilt/scripts/patchfns.in:455
+#: quilt/pop.in:269 quilt/scripts/patchfns.in:461
 msgid "No patches applied\\n"
 msgstr ""
 
@@ -822,27 +830,19 @@ msgstr ""
 msgid "Failed to rename %s to %s: %s\n"
 msgstr ""
 
-#: quilt/scripts/patchfns.in:442
-msgid "No patches in series\\n"
-msgstr ""
-
-#: quilt/scripts/patchfns.in:491
+#: quilt/scripts/patchfns.in:497
 msgid "Patch %s is not in series\\n"
 msgstr ""
 
-#: quilt/scripts/patchfns.in:518
+#: quilt/scripts/patchfns.in:524
 msgid "Patch %s is not applied\\n"
 msgstr ""
 
-#: quilt/scripts/patchfns.in:539
-msgid "Patch %s is already applied\\n"
-msgstr ""
-
-#: quilt/scripts/patchfns.in:555
+#: quilt/scripts/patchfns.in:561
 msgid "File series fully applied, ends at patch %s\\n"
 msgstr ""
 
-#: quilt/scripts/patchfns.in:795
+#: quilt/scripts/patchfns.in:801
 msgid ""
 "The quilt meta-data in this tree has version %s, but this version of quilt "
 "can only handle meta-data formats up to and including version %s. Please pop "
@@ -850,7 +850,7 @@ msgid ""
 "downgrading.\\n"
 msgstr ""
 
-#: quilt/scripts/patchfns.in:880
+#: quilt/scripts/patchfns.in:886
 msgid ""
 "The working tree was created by an older version of quilt. Please run 'quilt "
 "upgrade'.\\n"
diff --git a/quilt.changes b/quilt.changes
index 94eb142..7693e60 100644
--- a/quilt.changes
+++ b/quilt.changes
@@ -1,4 +1,9 @@
 -------------------------------------------------------------------
+Sat Jan 21 19:23:19 CET 2006 - agruen@suse.de
+
+- Fix delete -n when no patches are applied.
+
+-------------------------------------------------------------------
 Fri Jan 20 02:47:35 CET 2006 - jayvdb@gmail.com
 
 - Tru64 /bin/sh complains when $(call ) is used without ; on each
diff --git a/quilt/delete.in b/quilt/delete.in
index b4b8d5c..a2b818f 100644
--- a/quilt/delete.in
+++ b/quilt/delete.in
@@ -77,22 +77,35 @@ then
 	usage
 fi
 
-patch=$(find_patch_in_series "$1") || exit 1
-
+if [ -n "$1" ]; then
+	patch=$(find_patch "$1") || exit 1
+else
+	patch=$(top_patch)
+fi
 if [ -n "$opt_next" ]
 then
-	if ! patch="$(patch_after "$patch")"
+	if ! patch=$(patch_after "$patch")
 	then
 		printf $"No next patch\n" >&2
 		exit 1
 	fi
-elif is_applied "$patch"
+fi
+if [ -z "$patch" ]
 then
-	if [ "$patch" != "$(top_patch)" ] || \
-	   ! quilt_command pop -fq
+	printf $"No patches in series\n" >&2
+	exit 1
+fi
+if is_applied "$patch"; then
+	if [ "$patch" != "$(top_patch)" ]
 	then
 		printf $"Patch %s is currently applied\n" \
-		       "$(print_patch $patch)" >&2
+		       "$(print_patch "$patch")" >&2
+		exit 1
+	fi
+	if ! quilt_command pop -fq
+	then
+		printf $"Removing patch %s failed\n" \
+			"$(print_patch "$patch")" >&2
 		exit 1
 	fi
 fi
diff --git a/quilt/scripts/patchfns.in b/quilt/scripts/patchfns.in
index c529b47..a269fc4 100644
--- a/quilt/scripts/patchfns.in
+++ b/quilt/scripts/patchfns.in
@@ -536,7 +536,7 @@ find_unapplied_patch()
 		patch=$(find_patch "$name") || return 1
 	        if is_applied "$patch"
 	        then
-			printf $"Patch %s is already applied\n" \
+			printf $"Patch %s is currently applied\n" \
 				"$(print_patch $patch)" >&2
                		return 1
 	        fi
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