Zsh Mailing List Archive
Messages sorted by:
Reverse Date,
Date,
Thread,
Author
[PATCH 1/2] _quilt: Categorize subcommands
---
This is a useful pattern; there's a ton of commands that use it (git,
zfs, virsh, systemctl…). It'd be nice to factor it out into a
generally-reusable helper function…
Cheers,
Daniel
Completion/Unix/Command/_quilt | 41 ++++++++++++++++++++++++++++++----
1 file changed, 37 insertions(+), 4 deletions(-)
diff --git a/Completion/Unix/Command/_quilt b/Completion/Unix/Command/_quilt
index 76dda222f..d086da715 100644
--- a/Completion/Unix/Command/_quilt
+++ b/Completion/Unix/Command/_quilt
@@ -6,6 +6,8 @@ local verbose='(-h)-v[verbose, more user friendly output]'
local color='(-h)--color=[use syntax coloring]:color:(always auto never)'
local pstyle='(-h)-p+[select patch style]:patch style:((0\:exclude\ top-level\ directory 1\:use\ .orig\ on\ top-level\ directory ab\:use\ a\ or\ b\ as\ top-level\ directory))'
local -a pform rcfile
+local k
+
pform=(
'(-U -c -C -h)-u[create a unified diff]'
'(-u -c -C -h)-U+[create a unified diff with num lines of context]:lines'
@@ -36,12 +38,43 @@ _arguments $help \
'--trace[run the command in bash trace mode]' \
'--quiltrc=[use the specified configuration file]:files:_files' \
'--version[print the version number and exit]' \
- ':quilt command:(add annotate applied delete diff edit files fold fork graph
- grep header import mail new next patches pop previous push refresh remove
- rename revert series setup snapshot top unapplied upgrade)' \
+ ':quilt command:->cmd' \
'*:: :->subcmd' && return
-[[ -z $state ]] && return 1
+case $state in
+ ('')
+ return 1
+ ;;
+
+ (cmd)
+ # Divide the subcommands to categories. The categorization is our own;
+ # it's not based on any preexisting categorization in the quilt docs.
+ local -a manip=( add delete edit fold fork import new refresh remove rename )
+ local -a tree=( pop push revert )
+ local -a other=( grep header mail setup snapshot upgrade )
+ local -a interrogate=( annotate applied diff files graph next patches previous series top unapplied )
+ local -A cmdtypes=(
+ [manip]='series manipulator commands'
+ [tree]='tree manipulator commands'
+ [other]='other commands'
+ [interrogate]='series interrogator commands'
+ )
+ local -a expl=( )
+ local ret=1
+ _tags ${cmdtypes// /-}
+ while _tags; do
+ for k in ${(ok)cmdtypes}; do
+ _requested ${cmdtypes[$k]// /-} expl ${cmdtypes[$k]} \
+ compadd -a - $k && ret=0
+ done
+ done
+ return ret
+ ;;
+
+ (subcmd)
+ ;;
+esac
+
rcfile=( ${opt_args[--quiltrc]:+--quiltrc=${opt_args[--quiltrc]}} )
case $words[1] in
add)
Messages sorted by:
Reverse Date,
Date,
Thread,
Author