- quilt/pop.in: Delete .pc/$patch directory when popping empty

  patches. Report and original patch by Arnaud Patard.
- quilt/push.in: Create .pc/$patch directory when pushing missing
  or empty patches. If we don't, some commands such as rename can
  fail later.
- test/missing.test: Test rename command on missing patches.
- test/empty.test: New test case similar to missing.test, but for
  empty patches. Somewhat based on a contribution by Arnaud
  Patard.

9 files changed, 104 insertions, 46 deletions

diff --git a/po/de.po b/po/de.po
index a4dfe1e..56a5442 100644
--- a/po/de.po
+++ b/po/de.po
@@ -929,23 +929,23 @@ msgstr ""
 msgid "Patch %s appears to be empty, removing\\n"
 msgstr "Patch %s scheint leer zu sein; wird entfernt\\n"
 
-#: quilt/pop.in:169
+#: quilt/pop.in:170
 msgid "Removing patch %s\\n"
 msgstr "Entferne patch %s\\n"
 
-#: quilt/pop.in:240
+#: quilt/pop.in:241
 msgid "Patch %s needs to be refreshed first.\\n"
 msgstr "Patch %s muss zuerst aufgefrischt werden (Refresh).\\n"
 
-#: quilt/pop.in:250
+#: quilt/pop.in:251
 msgid "No patch removed\\n"
 msgstr "Kein Patch entfernt\\n"
 
-#: quilt/pop.in:266 quilt/scripts/patchfns.in:455
+#: quilt/pop.in:267 quilt/scripts/patchfns.in:455
 msgid "No patches applied\\n"
 msgstr "Keine Patches angewandt\\n"
 
-#: quilt/pop.in:273 quilt/push.in:371
+#: quilt/pop.in:274 quilt/push.in:373
 msgid "Now at patch %s\\n"
 msgstr "Jetzt in Patch %s\\n"
 
@@ -1035,27 +1035,27 @@ msgstr "Unterbrechung durch Benutzer; Patch %s wurde nicht angewandt.\\n"
 msgid "Applying patch %s\\n"
 msgstr "Wende Patch %s an\\n"
 
-#: quilt/push.in:209
+#: quilt/push.in:211
 msgid "Patch %s does not exist; applied empty patch\\n"
 msgstr "Patch %s existiert nicht; wende leeren patch an\\n"
 
-#: quilt/push.in:213
+#: quilt/push.in:215
 msgid "Patch %s appears to be empty; applied\\n"
 msgstr "Patch %s scheint leer zu sein; angewandt\\n"
 
-#: quilt/push.in:217
+#: quilt/push.in:219
 msgid "Applied patch %s (forced; needs refresh)\\n"
 msgstr "Patch %s angewandt (erzwungen, muss aufgefrischt werden (Refresh))\\n"
 
-#: quilt/push.in:227
+#: quilt/push.in:229
 msgid "Patch %s can be reverse-applied\\n"
 msgstr "Patch %s kann verkehrt angewandt werden\\n"
 
-#: quilt/push.in:230
+#: quilt/push.in:232
 msgid "Patch %s does not apply (enforce with -f)\\n"
 msgstr "Patch %s lässt sich nicht anwenden (erzwingen mit -f)\\n"
 
-#: quilt/push.in:351
+#: quilt/push.in:353
 msgid "The topmost patch %s needs to be refreshed first.\\n"
 msgstr "Der oberste Patch %s muss zuerst aufgefrischt werden (Refresh).\\n"
 
diff --git a/po/fr.po b/po/fr.po
index 4bf39e8..81baf6c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -941,23 +941,23 @@ msgstr ""
 msgid "Patch %s appears to be empty, removing\\n"
 msgstr "Le patch %s semble vide, enlevé\\n"
 
-#: quilt/pop.in:169
+#: quilt/pop.in:170
 msgid "Removing patch %s\\n"
 msgstr "Retrait de %s\\n"
 
-#: quilt/pop.in:240
+#: quilt/pop.in:241
 msgid "Patch %s needs to be refreshed first.\\n"
 msgstr "Le patch %s doit être rafraichi au préalable.\\n"
 
-#: quilt/pop.in:250
+#: quilt/pop.in:251
 msgid "No patch removed\\n"
 msgstr "Aucun patch retiré\\n"
 
-#: quilt/pop.in:266 quilt/scripts/patchfns.in:455
+#: quilt/pop.in:267 quilt/scripts/patchfns.in:455
 msgid "No patches applied\\n"
 msgstr "Aucun patch n'est appliqué\\n"
 
-#: quilt/pop.in:273 quilt/push.in:371
+#: quilt/pop.in:274 quilt/push.in:373
 msgid "Now at patch %s\\n"
 msgstr "Le patch %s est maintenant au sommet\\n"
 
@@ -1054,28 +1054,28 @@ msgstr "Interrompu par l'utilisateur ; le patch %s n'a pas été appliqué.\\n"
 msgid "Applying patch %s\\n"
 msgstr "Application de %s\\n"
 
-#: quilt/push.in:209
+#: quilt/push.in:211
 msgid "Patch %s does not exist; applied empty patch\\n"
 msgstr "Le patch %s n'existe pas ; patch vide appliqué\\n"
 
-#: quilt/push.in:213
+#: quilt/push.in:215
 msgid "Patch %s appears to be empty; applied\\n"
 msgstr "Le patch %s semble vide. Il a été appliqué.\\n"
 
-#: quilt/push.in:217
+#: quilt/push.in:219
 msgid "Applied patch %s (forced; needs refresh)\\n"
 msgstr "%s a été appliqué (forcé ; vous devriez le rafraîchir)\\n"
 
-#: quilt/push.in:227
+#: quilt/push.in:229
 msgid "Patch %s can be reverse-applied\\n"
 msgstr "Le patch %s peut être appliqué à l'envers\\n"
 
-#: quilt/push.in:230
+#: quilt/push.in:232
 msgid "Patch %s does not apply (enforce with -f)\\n"
 msgstr ""
 "Le patch %s ne s'applique pas proprement (forcez l'application avec -f)\\n"
 
-#: quilt/push.in:351
+#: quilt/push.in:353
 msgid "The topmost patch %s needs to be refreshed first.\\n"
 msgstr "Le patch au sommet %s doit être rafraichi au préalable.\\n"
 
diff --git a/po/ja.po b/po/ja.po
index 5b2c4b7..6aef672 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -907,23 +907,23 @@ msgstr ""
 msgid "Patch %s appears to be empty, removing\\n"
 msgstr "パッ� %s ��空�よ���。�����\\n"
 
-#: quilt/pop.in:169
+#: quilt/pop.in:170
 msgid "Removing patch %s\\n"
 msgstr "パッ� %s を�����\\n"
 
-#: quilt/pop.in:240
+#: quilt/pop.in:241
 msgid "Patch %s needs to be refreshed first.\\n"
 msgstr "最���パッ� %s �リフレッシュ�必���。\\n"
 
-#: quilt/pop.in:250
+#: quilt/pop.in:251
 msgid "No patch removed\\n"
 msgstr "�用�れ��るパッ���り��ん\\n"
 
-#: quilt/pop.in:266 quilt/scripts/patchfns.in:455
+#: quilt/pop.in:267 quilt/scripts/patchfns.in:455
 msgid "No patches applied\\n"
 msgstr "�用�れ��るパッ���り��ん\\n"
 
-#: quilt/pop.in:273 quilt/push.in:371
+#: quilt/pop.in:274 quilt/push.in:373
 msgid "Now at patch %s\\n"
 msgstr "�在�置�パッ� %s ��\\n"
 
@@ -1015,28 +1015,28 @@ msgstr "ユーザã�«ã‚ˆã�£ã�¦ä¸­æ–­ã�•ã‚Œã�¾ã�—ã�Ÿã€‚パッãƒ� %s ã�¯é�©ç”¨ã�•ã‚
 msgid "Applying patch %s\\n"
 msgstr "パッ� %s を�用�����\\n"
 
-#: quilt/push.in:209
+#: quilt/push.in:211
 msgid "Patch %s does not exist; applied empty patch\\n"
 msgstr "パッ� %s �存在���ん。空�パッ�を�用����\\n"
 
-#: quilt/push.in:213
+#: quilt/push.in:215
 msgid "Patch %s appears to be empty; applied\\n"
 msgstr "パッ� %s �空�よ������用����\\n"
 
-#: quilt/push.in:217
+#: quilt/push.in:219
 msgid "Applied patch %s (forced; needs refresh)\\n"
 msgstr ""
 "パッ� %s を�用���� (強制�用������リフレッシュ�必���)\\n"
 
-#: quilt/push.in:227
+#: quilt/push.in:229
 msgid "Patch %s can be reverse-applied\\n"
 msgstr "パッ� %s ���転���用�る�������\\n"
 
-#: quilt/push.in:230
+#: quilt/push.in:232
 msgid "Patch %s does not apply (enforce with -f)\\n"
 msgstr "パッ� %s ��用����ん (強制�用�る場�� -fを付������)\\n"
 
-#: quilt/push.in:351
+#: quilt/push.in:353
 msgid "The topmost patch %s needs to be refreshed first.\\n"
 msgstr "最上�パッ��リフレッシュ�最��必���。\\n"
 
diff --git a/po/quilt.pot b/po/quilt.pot
index 7e006e9..ecf33ac 100644
--- a/po/quilt.pot
+++ b/po/quilt.pot
@@ -625,23 +625,23 @@ msgstr ""
 msgid "Patch %s appears to be empty, removing\\n"
 msgstr ""
 
-#: quilt/pop.in:169
+#: quilt/pop.in:170
 msgid "Removing patch %s\\n"
 msgstr ""
 
-#: quilt/pop.in:240
+#: quilt/pop.in:241
 msgid "Patch %s needs to be refreshed first.\\n"
 msgstr ""
 
-#: quilt/pop.in:250
+#: quilt/pop.in:251
 msgid "No patch removed\\n"
 msgstr ""
 
-#: quilt/pop.in:266 quilt/scripts/patchfns.in:455
+#: quilt/pop.in:267 quilt/scripts/patchfns.in:455
 msgid "No patches applied\\n"
 msgstr ""
 
-#: quilt/pop.in:273 quilt/push.in:371
+#: quilt/pop.in:274 quilt/push.in:373
 msgid "Now at patch %s\\n"
 msgstr ""
 
@@ -701,27 +701,27 @@ msgstr ""
 msgid "Applying patch %s\\n"
 msgstr ""
 
-#: quilt/push.in:209
+#: quilt/push.in:211
 msgid "Patch %s does not exist; applied empty patch\\n"
 msgstr ""
 
-#: quilt/push.in:213
+#: quilt/push.in:215
 msgid "Patch %s appears to be empty; applied\\n"
 msgstr ""
 
-#: quilt/push.in:217
+#: quilt/push.in:219
 msgid "Applied patch %s (forced; needs refresh)\\n"
 msgstr ""
 
-#: quilt/push.in:227
+#: quilt/push.in:229
 msgid "Patch %s can be reverse-applied\\n"
 msgstr ""
 
-#: quilt/push.in:230
+#: quilt/push.in:232
 msgid "Patch %s does not apply (enforce with -f)\\n"
 msgstr ""
 
-#: quilt/push.in:351
+#: quilt/push.in:353
 msgid "The topmost patch %s needs to be refreshed first.\\n"
 msgstr ""
 
diff --git a/quilt.changes b/quilt.changes
index eab0e5c..164688f 100644
--- a/quilt.changes
+++ b/quilt.changes
@@ -1,4 +1,17 @@
 -------------------------------------------------------------------
+Wed Apr 26 12:27:20 CEST 2006 - khali@linux-fr.org
+
+- quilt/pop.in: Delete .pc/$patch directory when popping empty
+  patches. Report and original patch by Arnaud Patard.
+- quilt/push.in: Create .pc/$patch directory when pushing missing
+  or empty patches. If we don't, some commands such as rename can
+  fail later.
+- test/missing.test: Test rename command on missing patches.
+- test/empty.test: New test case similar to missing.test, but for
+  empty patches. Somewhat based on a contribution by Arnaud
+  Patard.
+
+-------------------------------------------------------------------
 Mon Apr 24 14:57:19 CEST 2006 - agruen@suse.de
 
 - Add @datarootdir@ macro which future versions of Autoconf will
diff --git a/quilt/pop.in b/quilt/pop.in
index f47e649..42e35d9 100644
--- a/quilt/pop.in
+++ b/quilt/pop.in
@@ -164,7 +164,8 @@ remove_patch()
 		then
 			printf $"Patch %s appears to be empty, removing\n" \
 			       "$(print_patch $patch)"
-			status=0
+			rmdir "$QUILT_PC/$patch"
+			status=$?
 		else
 			printf $"Removing patch %s\n" "$(print_patch $patch)"
 			$QUILT_LIB/backup-files $silent -r -t -B $QUILT_PC/$patch/ -
diff --git a/quilt/push.in b/quilt/push.in
index a6cf1e8..73a0856 100644
--- a/quilt/push.in
+++ b/quilt/push.in
@@ -202,6 +202,8 @@ add_patch()
 		if [ -e "$QUILT_PC/$patch" ]
 		then
 			touch $QUILT_PC/$patch/.timestamp
+		else
+			mkdir "$QUILT_PC/$patch"
 		fi
 
 		if ! [ -e $patch_file ]
diff --git a/test/empty.test b/test/empty.test
new file mode 100644
index 0000000..fb57ee7
--- /dev/null
+++ b/test/empty.test
@@ -0,0 +1,39 @@
+	$ rm -rf d
+	$ mkdir -p d/patches
+	$ cd d
+
+	$ cat > patches/series
+	< empty1.diff
+	< empty2.diff
+	$ touch patches/empty1.diff patches/empty2.diff
+	
+	$ quilt push -qa
+	> Applying patch %{P}empty1.diff
+	> Patch %{P}empty1.diff appears to be empty; applied
+	> Applying patch %{P}empty2.diff
+	> Patch %{P}empty2.diff appears to be empty; applied
+	> Now at patch %{P}empty2.diff
+
+	$ quilt rename empty3.diff
+	> Patch %{P}empty2.diff renamed to %{P}empty3.diff
+
+	$ quilt pop -qa
+	> Patch %{P}empty3.diff appears to be empty, removing
+	> Patch %{P}empty1.diff appears to be empty, removing
+	> No patches applied
+
+	$ quilt new empty_new.diff
+	> Patch %{P}empty_new.diff is now on top
+	
+	$ quilt pop -q
+	> Patch %{P}empty_new.diff appears to be empty, removing
+	> No patches applied
+
+	$ quilt delete empty_new.diff
+	> Removed patch %{P}empty_new.diff
+
+	$ quilt rename -P empty3.diff empty_new.diff
+	> Patch %{P}empty3.diff renamed to %{P}empty_new.diff
+
+	$ cd ..
+	$ rm -rf d
diff --git a/test/missing.test b/test/missing.test
index a896e1f..d507671 100644
--- a/test/missing.test
+++ b/test/missing.test
@@ -13,8 +13,11 @@
 	> Patch patches/missing2.diff does not exist; applied empty patch
 	> Now at patch patches/missing2.diff
 
+	$ quilt rename missing3.diff
+	> Patch %{P}missing2.diff renamed to %{P}missing3.diff
+
 	$ quilt pop -qa
-	> Patch patches/missing2.diff appears to be empty, removing
+	> Patch %{P}missing3.diff appears to be empty, removing
 	> Patch patches/missing1.diff appears to be empty, removing
 	> No patches applied