summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bash_completion59
-rw-r--r--po/de.po14
-rw-r--r--po/fr.po14
-rw-r--r--po/ja.po14
-rw-r--r--po/quilt.pot7
-rw-r--r--quilt.changes6
-rw-r--r--quilt/patches.in2
-rw-r--r--quilt/refresh.in2
8 files changed, 78 insertions, 40 deletions
diff --git a/bash_completion b/bash_completion
index a6502f8..9939a83 100644
--- a/bash_completion
+++ b/bash_completion
@@ -96,7 +96,7 @@ _quilt_completion()
# quilt sub commands
cmds='add annotate applied delete diff edit files fold fork graph \
- grep header import new next patches pop previous push refresh \
+ grep header import mail new next patches pop previous push refresh \
remove rename series setup snapshot top unapplied'
# if no command were given, complete on commands
@@ -122,23 +122,23 @@ _quilt_completion()
case ${command_matches[0]} in
add)
case $prev in
- -p)
+ -P)
COMPREPLY=( $( compgen -W "$(quilt applied)" -- $cur ) )
;;
*)
_quilt_comfile
- COMPREPLY=( ${COMPREPLY[@]:-} $( compgen -W "-p -h" -- $cur ) )
+ COMPREPLY=( ${COMPREPLY[@]:-} $( compgen -W "-P -h" -- $cur ) )
;;
esac
;;
annotate)
case $prev in
- -p)
+ -P)
COMPREPLY=( $( compgen -W "$(quilt applied)" -- $cur ) )
;;
*)
_quilt_comfile
- COMPREPLY=( ${COMPREPLY[@]:-} $( compgen -W "-p -h" -- $cur ) )
+ COMPREPLY=( ${COMPREPLY[@]:-} $( compgen -W "-P -h" -- $cur ) )
;;
esac
;;
@@ -153,15 +153,15 @@ _quilt_completion()
-p)
COMPREPLY=( $( compgen -W "0 1" -- $cur ) )
;;
- -P|-c)
+ -P|--combine)
COMPREPLY=( $( compgen -W "$(quilt applied)" -- $cur ) )
;;
- --diff|--snapshot)
+ --diff|-U|-C)
COMREPLY=( )
;;
*)
_filedir
- COMPREPLY=( ${COMPREPLY[@]:-} $( compgen -W "-p -P -c -R -z -h --snapshot --diff --no-timestamps" -- $cur ) )
+ COMPREPLY=( ${COMPREPLY[@]:-} $( compgen -W "-p -P -u -U -c -C -R -z -h --snapshot --diff --no-timestamps --no-index --combine --sort" -- $cur ) )
;;
esac
;;
@@ -170,7 +170,14 @@ _quilt_completion()
COMPREPLY=( ${COMPREPLY[@]:-} $( compgen -W "-h" -- $cur ) )
;;
files)
- COMPREPLY=( $( compgen -W "-v -h $(quilt series)" -- $cur ) )
+ case $prev in
+ --combine)
+ COMPREPLY=( $( compgen -W "$(quilt applied)" -- $cur ) )
+ ;;
+ *)
+ COMPREPLY=( $( compgen -W "-a -l -v -h --combine $(quilt series)" -- $cur ) )
+ ;;
+ esac
;;
fold)
case $prev in
@@ -186,7 +193,17 @@ _quilt_completion()
COMPREPLY=( )
;;
graph)
- COMPREPLY=( $( compgen -W "-h --all --reduce --lines --edge-labels $(quilt applied)" -- $cur ) )
+ case $prev in
+ -T)
+ COMPREPLY=( $( compgen -W "ps" -- $cur ) )
+ ;;
+ --edge-labels)
+ COMPREPLY=( $( compgen -W "files" -- $cur ) )
+ ;;
+ *)
+ COMPREPLY=( $( compgen -W "-T -h --all --reduce --lines --edge-labels $(quilt applied)" -- $cur ) )
+ ;;
+ esac
;;
grep)
_longopt grep
@@ -202,12 +219,18 @@ _quilt_completion()
;;
-n)
;;
+ -d)
+ COMPREPLY=( $( compgen -W "o a n" -- $cur ) )
+ ;;
*)
_quilt_comfile
- COMPREPLY=( ${COMPREPLY[@]:-} $( compgen -W "-p -n -f -h" -- $cur ) )
+ COMPREPLY=( ${COMPREPLY[@]:-} $( compgen -W "-p -n -f -d -h" -- $cur ) )
;;
esac
;;
+ mail)
+ COMPREPLY=( $( compgen -W "--mbox --send --sender --from --subject --to --cc --bcc" -- $cur ) )
+ ;;
new)
;;
next|previous)
@@ -221,36 +244,38 @@ _quilt_completion()
COMPREPLY=( $( compgen -W "-a -f -R -q -v -h $(quilt applied)" -- $cur ) )
;;
push)
- COMPREPLY=( $( compgen -W "-a -f -R -q -v -h --leave-rejects --interactive $(quilt unapplied)" -- $cur ) )
+ COMPREPLY=( $( compgen -W "-a -f -q -v -h --leave-rejects --interactive --color $(quilt unapplied)" -- $cur ) )
;;
refresh)
case $prev in
-p)
COMPREPLY=( $( compgen -W "0 1" -- $cur ) )
;;
+ -U|-C)
+ ;;
*)
- COMPREPLY=( $( compgen -W "-p -f -h $(quilt applied) --no-timestamps" -- $cur ) )
+ COMPREPLY=( $( compgen -W "-p -u -U -c -C -f -h $(quilt applied) --no-timestamps --no-index --diffstat --sort --backup --strip-trailing-whitespace" -- $cur ) )
;;
esac
;;
remove)
case $prev in
- -p)
+ -P)
COMPREPLY=( $( compgen -W "$(quilt applied)" -- $cur ) )
;;
*)
_quilt_comfile
- COMPREPLY=( ${COMPREPLY[@]:-} $( compgen -W "-p -h" -- $cur ) )
+ COMPREPLY=( ${COMPREPLY[@]:-} $( compgen -W "-P -h" -- $cur ) )
;;
esac
;;
rename)
case $prev in
- -p)
+ -P)
COMPREPLY=( $( compgen -W "$(quilt series)" -- $cur ) )
;;
*)
- COMPREPLY=( $( compgen -W "-p" -- $cur ) )
+ COMPREPLY=( $( compgen -W "-P -h" -- $cur ) )
;;
esac
;;
diff --git a/po/de.po b/po/de.po
index a5278ac..05bcede 100644
--- a/po/de.po
+++ b/po/de.po
@@ -806,8 +806,8 @@ msgstr ""
"Patch in der series-Datei aus.\n"
#: quilt/patches.in:22
-msgid "Usage: quilt patches {file}\\n"
-msgstr "Verwendung: quilt patches {file}\\n"
+msgid "Usage: quilt patches [-v] {file}\\n"
+msgstr "Verwendung: quilt patches [-v] {file}\\n"
#: quilt/patches.in:25
msgid ""
@@ -1012,11 +1012,13 @@ msgstr "Der oberste Patch %s muss zuerst aufgefrischt werden (Refresh).\\n"
#: quilt/refresh.in:22
msgid ""
-"Usage: quilt refresh [-p n] [-f] [--no-timestamps] [--no-index] [--diffstat] "
-"[--sort] [--backup] [--strip-trailing-whitespace] [patch]\\n"
+"Usage: quilt refresh [-p n] [-u|-U num|-c|-C num] [-f] [--no-timestamps] [--"
+"no-index] [--diffstat] [--sort] [--backup] [--strip-trailing-whitespace] "
+"[patch]\\n"
msgstr ""
-"Verwendung: quilt refresh [-p n] [-f] [--no-timestamps] [--no-index] [--"
-"diffstat] [--sort] [--backup] [--strip-trailing-whitespace] [patch]\\n"
+"Verwendung: quilt refresh [-p n] [-u|-U num|-c|-C num] [-f] [--no-"
+"timestamps] [--no-index] [--diffstat] [--sort] [--backup] [--strip-trailing-"
+"whitespace] [patch]\\n"
#: quilt/refresh.in:26
msgid ""
diff --git a/po/fr.po b/po/fr.po
index ff2e626..198412a 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -809,8 +809,8 @@ msgstr ""
"-n\tAffiche le nom de fichier au lieu du nom de patch.\n"
#: quilt/patches.in:22
-msgid "Usage: quilt patches {file}\\n"
-msgstr "Usage : quilt patches {fichier}\\n"
+msgid "Usage: quilt patches [-v] {file}\\n"
+msgstr "Usage : quilt patches [-v] {fichier}\\n"
#: quilt/patches.in:25
msgid ""
@@ -1027,11 +1027,13 @@ msgstr "Le patch au sommet %s doit être rafraichi au préalable.\\n"
#: quilt/refresh.in:22
msgid ""
-"Usage: quilt refresh [-p n] [-f] [--no-timestamps] [--no-index] [--diffstat] "
-"[--sort] [--backup] [--strip-trailing-whitespace] [patch]\\n"
+"Usage: quilt refresh [-p n] [-u|-U num|-c|-C num] [-f] [--no-timestamps] [--"
+"no-index] [--diffstat] [--sort] [--backup] [--strip-trailing-whitespace] "
+"[patch]\\n"
msgstr ""
-"Usage : quilt refresh [-p n] [-f] [--no-timestamps] [--no-index] [--"
-"diffstat] [--sort] [--backup] [--strip-trailing-whitespace] [patch]\\n"
+"Usage : quilt refresh [-p n] [-u|-U num|-c|-C num] [-f] [--no-timestamps] [--"
+"no-index] [--diffstat] [--sort] [--backup] [--strip-trailing-whitespace] "
+"[patch]\\n"
#: quilt/refresh.in:26
msgid ""
diff --git a/po/ja.po b/po/ja.po
index 5bfa52d..8adcc24 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -785,8 +785,8 @@ msgstr ""
"最上ä½ã¾ãŸã¯æŒ‡å®šã•ã‚ŒãŸãƒ‘ッãƒã®æ¬¡ã®ãƒ‘ッãƒåを表示。\n"
#: quilt/patches.in:22
-msgid "Usage: quilt patches {file}\\n"
-msgstr "使ã„æ–¹: quilt patches {ファイル}\\n"
+msgid "Usage: quilt patches [-v] {file}\\n"
+msgstr "使ã„æ–¹: quilt patches [-v] {ファイル}\\n"
#: quilt/patches.in:25
msgid ""
@@ -996,11 +996,13 @@ msgstr "最上ä½ãƒ‘ッãƒã®ãƒªãƒ•ãƒ¬ãƒƒã‚·ãƒ¥ãŒæœ€åˆã«å¿…è¦ã§ã™ã€‚\\n"
#: quilt/refresh.in:22
msgid ""
-"Usage: quilt refresh [-p n] [-f] [--no-timestamps] [--no-index] [--diffstat] "
-"[--sort] [--backup] [--strip-trailing-whitespace] [patch]\\n"
+"Usage: quilt refresh [-p n] [-u|-U num|-c|-C num] [-f] [--no-timestamps] [--"
+"no-index] [--diffstat] [--sort] [--backup] [--strip-trailing-whitespace] "
+"[patch]\\n"
msgstr ""
-"使ã„æ–¹: quilt refresh [-p n] [-f] [--no-timestamps] [--no-index] [--"
-"diffstat] [--sort] [--backup] [--strip-trailing-whitespace] [パッãƒ]\\n"
+"使ã„æ–¹: quilt refresh [-p n] [-u|-U num|-c|-C num] [-f] [--no-timestamps] [--"
+"no-index] [--diffstat] [--sort] [--backup] [--strip-trailing-whitespace] "
+"[パッãƒ]\\n"
#: quilt/refresh.in:26
msgid ""
diff --git a/po/quilt.pot b/po/quilt.pot
index 2dfd7d4..0c47d2b 100644
--- a/po/quilt.pot
+++ b/po/quilt.pot
@@ -543,7 +543,7 @@ msgid ""
msgstr ""
#: quilt/patches.in:22
-msgid "Usage: quilt patches {file}\\n"
+msgid "Usage: quilt patches [-v] {file}\\n"
msgstr ""
#: quilt/patches.in:25
@@ -693,8 +693,9 @@ msgstr ""
#: quilt/refresh.in:22
msgid ""
-"Usage: quilt refresh [-p n] [-f] [--no-timestamps] [--no-index] [--diffstat] "
-"[--sort] [--backup] [--strip-trailing-whitespace] [patch]\\n"
+"Usage: quilt refresh [-p n] [-u|-U num|-c|-C num] [-f] [--no-timestamps] [--"
+"no-index] [--diffstat] [--sort] [--backup] [--strip-trailing-whitespace] "
+"[patch]\\n"
msgstr ""
#: quilt/refresh.in:26
diff --git a/quilt.changes b/quilt.changes
index 73a4e74..a818c2e 100644
--- a/quilt.changes
+++ b/quilt.changes
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Sun Jan 29 15:40:47 CET 2006 - khali@linux-fr.org
+
+- quilt/patches.in, quilt/refresh.in: Update usage line.
+- bash_completion: Resync with quilt commands options.
+
+-------------------------------------------------------------------
Sun Jan 29 12:19:24 CET 2006 - khali@linux-fr.org
- quilt/push.in: Fix a temporary file leak and vulnerability.
diff --git a/quilt/patches.in b/quilt/patches.in
index 6ad176e..d5b15f7 100644
--- a/quilt/patches.in
+++ b/quilt/patches.in
@@ -19,7 +19,7 @@ fi
usage()
{
- printf $"Usage: quilt patches {file}\n"
+ printf $"Usage: quilt patches [-v] {file}\n"
if [ x$1 = x-h ]
then
printf $"
diff --git a/quilt/refresh.in b/quilt/refresh.in
index 97876d1..7754290 100644
--- a/quilt/refresh.in
+++ b/quilt/refresh.in
@@ -19,7 +19,7 @@ fi
usage()
{
- printf $"Usage: quilt refresh [-p n] [-f] [--no-timestamps] [--no-index] [--diffstat] [--sort] [--backup] [--strip-trailing-whitespace] [patch]\n"
+ printf $"Usage: quilt refresh [-p n] [-u|-U num|-c|-C num] [-f] [--no-timestamps] [--no-index] [--diffstat] [--sort] [--backup] [--strip-trailing-whitespace] [patch]\n"
if [ x$1 = x-h ]
then
generated by cgit (git 2.34.1) at 2024-09-20 17:55:45 +0000