- Jean Delvare:

  + Add a --version option that prints the program version.
  + patch_args: Fix comments parsing in series files.

8 files changed, 78 insertions, 22 deletions

diff --git a/bin/quilt.in b/bin/quilt.in
index 53b08f2..38be02d 100644
--- a/bin/quilt.in
+++ b/bin/quilt.in
@@ -21,6 +21,7 @@ usage()
 {
 
 	echo $"Usage: quilt [--trace[=verbose]] [--quiltrc=XX] command [-h] ..."
+	echo $"       quilt --version"
 
 	echo $"Commands are:"
 	quilt_commands \
@@ -36,7 +37,12 @@ Common options to all commands:
 --quiltrc file
 	Use the specified configuration file instead of ~/.quiltrc (or
 	/etc/quilt.quiltrc if ~/.quiltrc does not exist).  See the pdf
-	documentation for details about its possible contents."
+	documentation for details about its possible contents.
+
+Special options:
+
+--version
+	Print the version number and exit immediately."
 	exit 1
 }
 
@@ -52,6 +58,12 @@ quilt_commands()
 	done
 }
 
+if [ $# -eq 1 -a "$1" == "--version" ]
+then
+	echo '@VERSION@'
+	exit
+fi
+
 BASH_OPTS=
 while [ $# -ne 0 ]
 do
diff --git a/po/de.po b/po/de.po
index ad8a975..2c089b6 100644
--- a/po/de.po
+++ b/po/de.po
@@ -15,11 +15,15 @@ msgstr ""
 msgid "Usage: quilt [--trace[=verbose]] [--quiltrc=XX] command [-h] ..."
 msgstr "Verwendung: quilt [--trace[=verbose]] [--quiltrc=XX] befehl [-h] ..."
 
-#: ../bin/quilt.in:25
+#: ../bin/quilt.in:24
+msgid "       quilt --version"
+msgstr ""
+
+#: ../bin/quilt.in:26
 msgid "Commands are:"
 msgstr "Vorhandene Befehle:"
 
-#: ../bin/quilt.in:30
+#: ../bin/quilt.in:31
 #, fuzzy
 msgid ""
 "\n"
@@ -31,7 +35,12 @@ msgid ""
 "--quiltrc file\n"
 "\tUse the specified configuration file instead of ~/.quiltrc (or\n"
 "\t/etc/quilt.quiltrc if ~/.quiltrc does not exist).  See the pdf\n"
-"\tdocumentation for details about its possible contents."
+"\tdocumentation for details about its possible contents.\n"
+"\n"
+"Special options:\n"
+"\n"
+"--version\n"
+"\tPrint the version number and exit immediately."
 msgstr ""
 "\n"
 "Gemeinsame Optionen für alle Befehle:\n"
@@ -1167,7 +1176,7 @@ msgstr ""
 "zur Erzeugung des Arbeitsverzeichnis verwendet wurden, oder entfernen Sie "
 "das Verzeichnis %s, und wenden Sie die Patches neu an.\\n"
 
-#: ../scripts/patchfns.in:741
+#: ../scripts/patchfns.in:742
 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 "
@@ -1180,7 +1189,7 @@ msgstr ""
 "quilt alle Patches mit der Version von quilt, die zur Erstellung des "
 "Arbeitsverzeichnisses verwendet wurde.\\n"
 
-#: ../scripts/patchfns.in:818
+#: ../scripts/patchfns.in:819
 msgid ""
 "The working tree was created by an older version of quilt. Please run 'quilt "
 "upgrade'.\\n"
diff --git a/po/fr.po b/po/fr.po
index 8e750e7..8a509b3 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -16,11 +16,15 @@ msgstr ""
 msgid "Usage: quilt [--trace[=verbose]] [--quiltrc=XX] command [-h] ..."
 msgstr "Usage : quilt [--trace[=verbose]] [--quiltrc=XX] commande [-h] ..."
 
-#: ../bin/quilt.in:25
+#: ../bin/quilt.in:24
+msgid "       quilt --version"
+msgstr ""
+
+#: ../bin/quilt.in:26
 msgid "Commands are:"
 msgstr "Les commandes sont :"
 
-#: ../bin/quilt.in:30
+#: ../bin/quilt.in:31
 #, fuzzy
 msgid ""
 "\n"
@@ -32,7 +36,12 @@ msgid ""
 "--quiltrc file\n"
 "\tUse the specified configuration file instead of ~/.quiltrc (or\n"
 "\t/etc/quilt.quiltrc if ~/.quiltrc does not exist).  See the pdf\n"
-"\tdocumentation for details about its possible contents."
+"\tdocumentation for details about its possible contents.\n"
+"\n"
+"Special options:\n"
+"\n"
+"--version\n"
+"\tPrint the version number and exit immediately."
 msgstr ""
 "\n"
 "Options communes � toutes les commandes :\n"
@@ -1132,7 +1141,7 @@ 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"
 
-#: ../scripts/patchfns.in:741
+#: ../scripts/patchfns.in:742
 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 "
@@ -1144,7 +1153,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"
 
-#: ../scripts/patchfns.in:818
+#: ../scripts/patchfns.in:819
 msgid ""
 "The working tree was created by an older version of quilt. Please run 'quilt "
 "upgrade'.\\n"
diff --git a/po/ja.po b/po/ja.po
index 3736c04..e04bcc5 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -16,11 +16,15 @@ msgstr ""
 msgid "Usage: quilt [--trace[=verbose]] [--quiltrc=XX] command [-h] ..."
 msgstr "使い方: quilt [--trace[=verbose]] [--quiltrc=XX] command [-h] ..."
 
-#: ../bin/quilt.in:25
+#: ../bin/quilt.in:24
+msgid "       quilt --version"
+msgstr ""
+
+#: ../bin/quilt.in:26
 msgid "Commands are:"
 msgstr "コマンド一覧:"
 
-#: ../bin/quilt.in:30
+#: ../bin/quilt.in:31
 #, fuzzy
 msgid ""
 "\n"
@@ -32,7 +36,12 @@ msgid ""
 "--quiltrc file\n"
 "\tUse the specified configuration file instead of ~/.quiltrc (or\n"
 "\t/etc/quilt.quiltrc if ~/.quiltrc does not exist).  See the pdf\n"
-"\tdocumentation for details about its possible contents."
+"\tdocumentation for details about its possible contents.\n"
+"\n"
+"Special options:\n"
+"\n"
+"--version\n"
+"\tPrint the version number and exit immediately."
 msgstr ""
 "\n"
 "全コマンド共通オプション:\n"
@@ -1156,7 +1165,7 @@ msgstr ""
 "pop -a'を実行し、すべてのパッチをはずしてください。または、%s ディレク\n"
 "トリを削除し、最初からパッチをあて直してください。\\n"
 
-#: ../scripts/patchfns.in:741
+#: ../scripts/patchfns.in:742
 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 "
@@ -1168,7 +1177,7 @@ msgstr ""
 "ていません。ダウングレードする前に、pushしたバージョンの quiltを使って、\n"
 "すべてのパッチを pop してください。\\n"
 
-#: ../scripts/patchfns.in:818
+#: ../scripts/patchfns.in:819
 msgid ""
 "The working tree was created by an older version of quilt. Please run 'quilt "
 "upgrade'.\\n"
diff --git a/po/quilt.pot b/po/quilt.pot
index 9ad36f5..a15c9b2 100644
--- a/po/quilt.pot
+++ b/po/quilt.pot
@@ -2,11 +2,15 @@
 msgid "Usage: quilt [--trace[=verbose]] [--quiltrc=XX] command [-h] ..."
 msgstr ""
 
-#: ../bin/quilt.in:25
+#: ../bin/quilt.in:24
+msgid "       quilt --version"
+msgstr ""
+
+#: ../bin/quilt.in:26
 msgid "Commands are:"
 msgstr ""
 
-#: ../bin/quilt.in:30
+#: ../bin/quilt.in:31
 msgid ""
 "\n"
 "Common options to all commands:\n"
@@ -17,7 +21,12 @@ msgid ""
 "--quiltrc file\n"
 "\tUse the specified configuration file instead of ~/.quiltrc (or\n"
 "\t/etc/quilt.quiltrc if ~/.quiltrc does not exist).  See the pdf\n"
-"\tdocumentation for details about its possible contents."
+"\tdocumentation for details about its possible contents.\n"
+"\n"
+"Special options:\n"
+"\n"
+"--version\n"
+"\tPrint the version number and exit immediately."
 msgstr ""
 
 #: ../quilt/add.in:22
@@ -836,7 +845,7 @@ msgid ""
 "patches from scratch.\\n"
 msgstr ""
 
-#: ../scripts/patchfns.in:741
+#: ../scripts/patchfns.in:742
 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 "
@@ -844,7 +853,7 @@ msgid ""
 "downgrading.\\n"
 msgstr ""
 
-#: ../scripts/patchfns.in:818
+#: ../scripts/patchfns.in:819
 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 be12fa9..7c7c682 100644
--- a/quilt.changes
+++ b/quilt.changes
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Sun Jun 26 23:37:23 CEST 2005 - agruen@suse.de
+
+- Jean Delvare:
+  + Add a --version option that prints the program version.
+  + patch_args: Fix comments parsing in series files.
+
+-------------------------------------------------------------------
 Wed Jun 22 23:35:23 CEST 2005 - agruen@suse.de
 
 - annotate: temp file leak; add bash completions (Jean Delvare).
diff --git a/scripts/patchfns.in b/scripts/patchfns.in
index b1eaf5a..6caf2ca 100644
--- a/scripts/patchfns.in
+++ b/scripts/patchfns.in
@@ -107,6 +107,7 @@ patch_args()
 	if [ -e $SERIES ]
 	then
 		@AWK@ '
+			{sub(/(^|[ \t]+)#.*/, "") }
 		$1 == "'"$patch"'" \
 			{ if (NF >= 2)
 				for (i=2; i <= NF; i++)
diff --git a/test/comments.test b/test/comments.test
index 0918443..a4b8d99 100644
--- a/test/comments.test
+++ b/test/comments.test
@@ -19,7 +19,7 @@ accidentally removed.
 	< +two
 
 	$ cat > patches/series
-	< test.diff -p0
+	< test.diff -p0 # What a wonderful patch
 
 	$ quilt push
 	> Applying patch %{P}test.diff