diff options
| -rw-r--r-- | bin/quilt.in | 1 | ||||
| -rw-r--r-- | po/de.po | 7 | ||||
| -rw-r--r-- | po/fr.po | 4 | ||||
| -rw-r--r-- | po/quilt.pot | 4 | ||||
| -rw-r--r-- | quilt.changes | 7 | ||||
| -rw-r--r-- | 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##*/}" "$@" @@ -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äßt sich nicht anwenden (erzwingen mit -f)" 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'." @@ -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,4 +1,11 @@ ------------------------------------------------------------------- +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 - Quilt diff: add --color option for optionally colorizing the 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() |