- quilt/import.in: When importing multiple patches at once, make

  sure that they won't end up in the series file in reverse order.
  This happened because each new patch was inserted before the
  "next" patch, which made it the new "next" patch.

8 files changed, 65 insertions, 36 deletions

diff --git a/po/de.po b/po/de.po
index 4ecab77..8b04fa4 100644
--- a/po/de.po
+++ b/po/de.po
@@ -692,35 +692,35 @@ msgstr ""
 "Die Option \\`-P' kann nur beim Importieren eines einzelnen Patches "
 "verwendet werden\\n"
 
-#: quilt/import.in:168
+#: quilt/import.in:169
 msgid "Patch %s is applied\\n"
 msgstr "Patch %s ist angewandt\\n"
 
-#: quilt/import.in:177
+#: quilt/import.in:178
 msgid "Patch %s already exists in series.\\n"
 msgstr "Patch %s existiert bereits in der series-Datei\\n"
 
-#: quilt/import.in:183
+#: quilt/import.in:184
 msgid "Patch %s exists. Replace with -f.\\n"
 msgstr "Patch %s existiert bereits. Ersetzen mit -f.\\n"
 
-#: quilt/import.in:194
+#: quilt/import.in:195
 msgid "Replacing patch %s with new version\\n"
 msgstr "Ersetze Patch %s durch neuere Version\\n"
 
-#: quilt/import.in:198
+#: quilt/import.in:199
 msgid "Importing patch %s\\n"
 msgstr "Importiere patch %s\\n"
 
-#: quilt/import.in:200
+#: quilt/import.in:201
 msgid "Importing patch %s (stored as %s)\\n"
 msgstr "Importiere Patch %s (abgelegt als %s)\\n"
 
-#: quilt/import.in:213
+#: quilt/import.in:214
 msgid "Failed to import patch %s\\n"
 msgstr "Konnte Patch %s nicht importieren\\n"
 
-#: quilt/import.in:222 quilt/refresh.in:327
+#: quilt/import.in:223 quilt/refresh.in:327
 msgid "Failed to insert patch %s into file series\\n"
 msgstr "Konnte Patch %s nicht in die series-Datei einfügen\\n"
 
diff --git a/po/fr.po b/po/fr.po
index 84f3521..f1adb67 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -688,35 +688,35 @@ msgid "Option \\`-P' can only be used when importing a single patch\\n"
 msgstr ""
 "L'option « -P » ne peut être utilisé que lors de l'import d'un seul patch.\\n"
 
-#: quilt/import.in:168
+#: quilt/import.in:169
 msgid "Patch %s is applied\\n"
 msgstr "Le patch %s n'est pas appliqué\\n"
 
-#: quilt/import.in:177
+#: quilt/import.in:178
 msgid "Patch %s already exists in series.\\n"
 msgstr "Le patch %s existe déjà dans la série.\\n"
 
-#: quilt/import.in:183
+#: quilt/import.in:184
 msgid "Patch %s exists. Replace with -f.\\n"
 msgstr "Le patch %s existe. Utilisez -f pour le remplacer.\\n"
 
-#: quilt/import.in:194
+#: quilt/import.in:195
 msgid "Replacing patch %s with new version\\n"
 msgstr "Remplacement du patch %s avec la nouvelle version\\n"
 
-#: quilt/import.in:198
+#: quilt/import.in:199
 msgid "Importing patch %s\\n"
 msgstr "Import du patch %s\\n"
 
-#: quilt/import.in:200
+#: quilt/import.in:201
 msgid "Importing patch %s (stored as %s)\\n"
 msgstr "Import du patch %s (enregistré dans %s)\\n"
 
-#: quilt/import.in:213
+#: quilt/import.in:214
 msgid "Failed to import patch %s\\n"
 msgstr "Impossible d'importer le patch %s\\n"
 
-#: quilt/import.in:222 quilt/refresh.in:327
+#: quilt/import.in:223 quilt/refresh.in:327
 msgid "Failed to insert patch %s into file series\\n"
 msgstr "Impossible d'inserer %s dans le fichier de série.\\n"
 
diff --git a/po/ja.po b/po/ja.po
index 0a4b07a..1da3731 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -662,35 +662,35 @@ msgstr ""
 msgid "Option \\`-P' can only be used when importing a single patch\\n"
 msgstr "オプション \\`-P'��パッ�を一����り込む����有効��\\n"
 
-#: quilt/import.in:168
+#: quilt/import.in:169
 msgid "Patch %s is applied\\n"
 msgstr "パッ� %s ������用�れ����\\n"
 
-#: quilt/import.in:177
+#: quilt/import.in:178
 msgid "Patch %s already exists in series.\\n"
 msgstr "パッ� %s ����� series�中��り��\\n"
 
-#: quilt/import.in:183
+#: quilt/import.in:184
 msgid "Patch %s exists. Replace with -f.\\n"
 msgstr "パッ� %s �����存在���。-f�置���る�������\\n"
 
-#: quilt/import.in:194
+#: quilt/import.in:195
 msgid "Replacing patch %s with new version\\n"
 msgstr "パッ� %s を新���ージョン�置�����\\n"
 
-#: quilt/import.in:198
+#: quilt/import.in:199
 msgid "Importing patch %s\\n"
 msgstr "パッ� %s を�り込���\\n"
 
-#: quilt/import.in:200
+#: quilt/import.in:201
 msgid "Importing patch %s (stored as %s)\\n"
 msgstr "パッ� %s を�り込ん���� (%s ����存�れ��)\\n"
 
-#: quilt/import.in:213
+#: quilt/import.in:214
 msgid "Failed to import patch %s\\n"
 msgstr "パッ� %s ��り込��失敗����\\n"
 
-#: quilt/import.in:222 quilt/refresh.in:327
+#: quilt/import.in:223 quilt/refresh.in:327
 msgid "Failed to insert patch %s into file series\\n"
 msgstr "seriesファイル��パッ� %s �書�込��失敗����\\n"
 
diff --git a/po/quilt.pot b/po/quilt.pot
index 691d873..e8cacaa 100644
--- a/po/quilt.pot
+++ b/po/quilt.pot
@@ -444,35 +444,35 @@ msgstr ""
 msgid "Option \\`-P' can only be used when importing a single patch\\n"
 msgstr ""
 
-#: quilt/import.in:168
+#: quilt/import.in:169
 msgid "Patch %s is applied\\n"
 msgstr ""
 
-#: quilt/import.in:177
+#: quilt/import.in:178
 msgid "Patch %s already exists in series.\\n"
 msgstr ""
 
-#: quilt/import.in:183
+#: quilt/import.in:184
 msgid "Patch %s exists. Replace with -f.\\n"
 msgstr ""
 
-#: quilt/import.in:194
+#: quilt/import.in:195
 msgid "Replacing patch %s with new version\\n"
 msgstr ""
 
-#: quilt/import.in:198
+#: quilt/import.in:199
 msgid "Importing patch %s\\n"
 msgstr ""
 
-#: quilt/import.in:200
+#: quilt/import.in:201
 msgid "Importing patch %s (stored as %s)\\n"
 msgstr ""
 
-#: quilt/import.in:213
+#: quilt/import.in:214
 msgid "Failed to import patch %s\\n"
 msgstr ""
 
-#: quilt/import.in:222 quilt/refresh.in:327
+#: quilt/import.in:223 quilt/refresh.in:327
 msgid "Failed to insert patch %s into file series\\n"
 msgstr ""
 
diff --git a/quilt.changes b/quilt.changes
index b11bcff..4b59efb 100644
--- a/quilt.changes
+++ b/quilt.changes
@@ -1,4 +1,12 @@
 -------------------------------------------------------------------
+Fri Jun 13 11:50:30 CEST 2008 - agruen@suse.de
+
+- quilt/import.in: When importing multiple patches at once, make
+  sure that they won't end up in the series file in reverse order.
+  This happened because each new patch was inserted before the
+  "next" patch, which made it the new "next" patch.
+
+-------------------------------------------------------------------
 Tue May 20 09:30:33 CEST 2008 - agruen@suse.de
 
 - Stop using cp -l: it doesn't fall back to doing a regular copy
diff --git a/quilt/import.in b/quilt/import.in
index 85160ab..07cb95d 100644
--- a/quilt/import.in
+++ b/quilt/import.in
@@ -151,6 +151,7 @@ then
 	fi
 fi
 
+before=$(patch_after "$(top_patch)")
 for patch_file in "$@"
 do
 	if [ -n "$opt_patch" ]
@@ -217,7 +218,7 @@ do
 	[ "$merged_patch_file" != "$patch_file" ] && rm -f "$merged_patch_file"
 
 	if ! patch_in_series $patch &&
-	   ! insert_in_series $patch "$patch_args"
+	   ! insert_in_series $patch "$patch_args" "$before"
 	then
 		printf $"Failed to insert patch %s into file series\n" \
 		       "$(print_patch $patch)" >&2
diff --git a/quilt/scripts/patchfns.in b/quilt/scripts/patchfns.in
index cd27ec9..e299aa1 100644
--- a/quilt/scripts/patchfns.in
+++ b/quilt/scripts/patchfns.in
@@ -238,7 +238,7 @@ patch_in_series()
 insert_in_series()
 {
 	local patch=$1 patch_args=$2
-	local next=$(patch_after "$(top_patch)") tmpfile
+	local before=${3-$(patch_after "$(top_patch)")} tmpfile
 
 	if [ -n "$patch_args" ]
 	then
@@ -247,10 +247,10 @@ insert_in_series()
 
 	tmpfile=$(gen_tempfile) || return 1
 	mkdir -p $(dirname $SERIES)
-	if [ -n "$next" ]
+	if [ -n "$before" ]
 	then
 		awk '
-		/^'"$(quote_re $next)"'([ \t]|$)/ \
+		/^'"$(quote_re $before)"'([ \t]|$)/ \
 				{ print "'"$patch$patch_args"'" }
 				{ print }
 		' $SERIES > $tmpfile
diff --git a/test/import.test b/test/import.test
index c693810..d093d2d 100644
--- a/test/import.test
+++ b/test/import.test
@@ -228,5 +228,25 @@
 	>
 	> No patches applied
 
+	# Test importing multiple patches at once
+	$ rm -rf .pc patches
+	$ quilt import t/patch1.diff t/patchR.diff
+	> Importing patch t/patch1.diff (stored as patches/patch1.diff)
+	> Importing patch t/patchR.diff (stored as patches/patchR.diff)
+
+	$ cat patches/series
+	> patch1.diff
+	> patchR.diff
+
+	$ rm -rf .pc patches
+	$ quilt import t/patchR.diff
+	> Importing patch t/patchR.diff (stored as patches/patchR.diff)
+	$ quilt import t/patch1.diff
+	> Importing patch t/patch1.diff (stored as patches/patch1.diff)
+
+	$ cat patches/series
+	> patch1.diff
+	> patchR.diff
+
 	$ cd ..
 	$ rm -rf d