From 162d238c1d40b6e6eace4396f9ac7cf91685fa30 Mon Sep 17 00:00:00 2001
From: Andreas Gruenbacher <agruen@suse.de>
Date: Thu, 1 Jul 2004 21:50:11 +0000
Subject: - Allow passing of default options to commands by defining  
 QUILT_${COMMAND}_ARGS in .quiltrc. This should eventually get   us rid of
 some of the mess in .quiltrc.

---
 bin/quilt.in        | 1 +
 po/de.po            | 7 +++----
 po/fr.po            | 4 ++--
 po/quilt.pot        | 4 ++--
 quilt.changes       | 7 +++++++
 scripts/patchfns.in | 6 ++++++
 6 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/bin/quilt.in b/bin/quilt.in
index 4956cbd..3d9cb49 100644
--- a/bin/quilt.in
+++ b/bin/quilt.in
@@ -107,4 +107,5 @@ set -- "${args[@]}"
 unset args
 
 #source @QUILT@/$command
+export QUILT_COMMAND="${command##*/}"
 @BASH@ $BASH_OPTS -c ". @QUILT@/$command" "quilt ${command##*/}" "$@"
diff --git a/po/de.po b/po/de.po
index 0d3bce9..0c688cb 100644
--- a/po/de.po
+++ b/po/de.po
@@ -224,8 +224,7 @@ msgstr ""
 "\n"
 "--no-timestamps\n"
 "\tKeine Zeitstempel in Patches angeben (wie QUILT_DIFF_NO_TIMESTAMPS in~/."
-"quiltrc)."
-"\t\n"
+"quiltrc).\t\n"
 "--color[=always|auto|never]\n"
 "\tVerwende ANSI Escapesequenzen, und färbe das Ergebnis ein."
 
@@ -975,7 +974,7 @@ msgstr "Patch $patch l
 msgid "The topmost patch $top needs to be refreshed first."
 msgstr "Der oberste Patch $top muss zuerst aufgefrischt werden (Refresh)."
 
-#: ../scripts/patchfns.in:691
+#: ../scripts/patchfns.in:697
 msgid ""
 "The quilt meta-data in this tree has version $version, but this version of "
 "quilt can only handle meta-data formats up to and including version "
@@ -988,7 +987,7 @@ msgstr ""
 "quilt alle Patches mit der Version von quilt, die zur Erstellung des "
 "Arbeitsverzeichnisses verwendet wurde."
 
-#: ../scripts/patchfns.in:753
+#: ../scripts/patchfns.in:759
 msgid ""
 "The working tree was created by an older version of quilt. Please run 'quilt "
 "upgrade'."
diff --git a/po/fr.po b/po/fr.po
index 7c5ef0e..ceb1d13 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -992,7 +992,7 @@ msgstr ""
 msgid "The topmost patch $top needs to be refreshed first."
 msgstr "Le patch au sommet $top doit être rafraichi au préalable."
 
-#: ../scripts/patchfns.in:691
+#: ../scripts/patchfns.in:697
 msgid ""
 "The quilt meta-data in this tree has version $version, but this version of "
 "quilt can only handle meta-data formats up to and including version "
@@ -1005,7 +1005,7 @@ msgstr ""
 "version utilisée pour les appliquer avant d'installer une version\n"
 "plus ancienne."
 
-#: ../scripts/patchfns.in:753
+#: ../scripts/patchfns.in:759
 msgid ""
 "The working tree was created by an older version of quilt. Please run 'quilt "
 "upgrade'."
diff --git a/po/quilt.pot b/po/quilt.pot
index 25abfd2..113ea2b 100644
--- a/po/quilt.pot
+++ b/po/quilt.pot
@@ -721,7 +721,7 @@ msgstr ""
 msgid "The topmost patch $top needs to be refreshed first."
 msgstr ""
 
-#: ../scripts/patchfns.in:691
+#: ../scripts/patchfns.in:697
 msgid ""
 "The quilt meta-data in this tree has version $version, but this version of "
 "quilt can only handle meta-data formats up to and including version "
@@ -729,7 +729,7 @@ msgid ""
 "push them before downgrading."
 msgstr ""
 
-#: ../scripts/patchfns.in:753
+#: ../scripts/patchfns.in:759
 msgid ""
 "The working tree was created by an older version of quilt. Please run 'quilt "
 "upgrade'."
diff --git a/quilt.changes b/quilt.changes
index f18a36a..4a5fb52 100644
--- a/quilt.changes
+++ b/quilt.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Jul  1 22:55:11 CEST 2004 - agruen@suse.de
+
+- Allow passing of default options to commands by defining
+  QUILT_${COMMAND}_ARGS in .quiltrc. This should eventually get
+  us rid of some of the mess in .quiltrc.
+
 -------------------------------------------------------------------
 Thu Jul  1 00:39:53 CEST 2004 - agruen@suse.de
 
diff --git a/scripts/patchfns.in b/scripts/patchfns.in
index 1b47bf4..8a0a3cc 100644
--- a/scripts/patchfns.in
+++ b/scripts/patchfns.in
@@ -21,6 +21,12 @@ then
 	source "$QUILTRC"
 fi
 
+# Add default arguments for this command
+if [ -n "$QUILT_COMMAND" ]; then
+	args="QUILT_$(echo $QUILT_COMMAND | tr a-z A-Z)_ARGS"
+	set -- ${!args} "$@"
+	unset args
+fi
 
 # Quote a string for use in a basic regular expression.
 quote_bre()
-- 
cgit