complete: zsh: use zsh completion for the main cmd

So that we can have a nice zsh completion output: % git <tab> add -- add file contents to the index bisect -- find by binary search the change that introduced a bug branch -- list, create, or delete branches checkout -- checkout a branch or paths to the working tree clone -- clone a repository into a new directory commit -- record changes to the repository diff -- show changes between commits, commit and working tree, etc fetch -- download objects and refs from another repository grep -- print lines matching a pattern init -- create an empty Git repository or reinitialize an existing one log -- show commit logs merge -- join two or more development histories together mv -- move or rename a file, a directory, or a symlink pull -- fetch from and merge with another repository or a local branch push -- update remote refs along with associated objects rebase -- forward-port local commits to the updated upstream head reset -- reset current HEAD to the specified state rm -- remove files from the working tree and from the index show -- show various types of objects status -- show the working tree status tag -- create, list, delete or verify a tag object signed with GPG And other niceties, like 'git --git-dir=<tab>' showing only directories. For the rest, the bash completion stuff is still used. Also, add my copyright, since this more than a thin wrapper. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Felipe Contreras committed Apr 27, 2013 at 15:34 UTC 4911589bd1cdb79e6b8f658d5caebc440a656046
1 file changed +119 -1
contrib/completion/git-completion.zsh
+119 -1
@@ -2,6 +2,8 @@
2
3 # zsh completion wrapper for git
4 #
5 +# Copyright (c) 2012-2013 Felipe Contreras <felipe.contreras@gmail.com>
6 +#
7 # You need git's bash completion script installed somewhere, by default on the
8 # same directory as this script.
9 #
@@ -21,6 +23,9 @@ complete ()
23 return 0
24 }
25
26 +zstyle -T ':completion:*:*:git:*' tag-order && \
27 + zstyle ':completion:*:*:git:*' tag-order 'common-commands'
28 +
29 zstyle -s ":completion:*:*:git:*" script script
30 test -z "$script" && script="$(dirname ${funcsourcetrace[1]%:*})"/git-completion.bash
31 ZSH_VERSION='' . "$script"
@@ -69,6 +74,115 @@ __gitcomp_file ()
74 compadd -Q -p "${2-}" -f -- ${=1} && _ret=0
75 }
76
77 +__git_zsh_bash_func ()
78 +{
79 + emulate -L ksh
80 +
81 + local command=$1
82 +
83 + local completion_func="_git_${command//-/_}"
84 + declare -f $completion_func >/dev/null && $completion_func && return
85 +
86 + local expansion=$(__git_aliased_command "$command")
87 + if [ -n "$expansion" ]; then
88 + completion_func="_git_${expansion//-/_}"
89 + declare -f $completion_func >/dev/null && $completion_func
90 + fi
91 +}
92 +
93 +__git_zsh_cmd_common ()
94 +{
95 + local -a list
96 + list=(
97 + add:'add file contents to the index'
98 + bisect:'find by binary search the change that introduced a bug'
99 + branch:'list, create, or delete branches'
100 + checkout:'checkout a branch or paths to the working tree'
101 + clone:'clone a repository into a new directory'
102 + commit:'record changes to the repository'
103 + diff:'show changes between commits, commit and working tree, etc'
104 + fetch:'download objects and refs from another repository'
105 + grep:'print lines matching a pattern'
106 + init:'create an empty Git repository or reinitialize an existing one'
107 + log:'show commit logs'
108 + merge:'join two or more development histories together'
109 + mv:'move or rename a file, a directory, or a symlink'
110 + pull:'fetch from and merge with another repository or a local branch'
111 + push:'update remote refs along with associated objects'
112 + rebase:'forward-port local commits to the updated upstream head'
113 + reset:'reset current HEAD to the specified state'
114 + rm:'remove files from the working tree and from the index'
115 + show:'show various types of objects'
116 + status:'show the working tree status'
117 + tag:'create, list, delete or verify a tag object signed with GPG')
118 + _describe -t common-commands 'common commands' list && _ret=0
119 +}
120 +
121 +__git_zsh_cmd_alias ()
122 +{
123 + local -a list
124 + list=(${${${(0)"$(git config -z --get-regexp '^alias\.')"}#alias.}%$'\n'*})
125 + _describe -t alias-commands 'aliases' list $* && _ret=0
126 +}
127 +
128 +__git_zsh_cmd_all ()
129 +{
130 + local -a list
131 + emulate ksh -c __git_compute_all_commands
132 + list=( ${=__git_all_commands} )
133 + _describe -t all-commands 'all commands' list && _ret=0
134 +}
135 +
136 +__git_zsh_main ()
137 +{
138 + local curcontext="$curcontext" state state_descr line
139 + typeset -A opt_args
140 + local -a orig_words
141 +
142 + orig_words=( ${words[@]} )
143 +
144 + _arguments -C \
145 + '(-p --paginate --no-pager)'{-p,--paginate}'[pipe all output into ''less'']' \
146 + '(-p --paginate)--no-pager[do not pipe git output into a pager]' \
147 + '--git-dir=-[set the path to the repository]: :_directories' \
148 + '--bare[treat the repository as a bare repository]' \
149 + '(- :)--version[prints the git suite version]' \
150 + '--exec-path=-[path to where your core git programs are installed]:: :_directories' \
151 + '--html-path[print the path where git''s HTML documentation is installed]' \
152 + '--info-path[print the path where the Info files are installed]' \
153 + '--man-path[print the manpath (see `man(1)`) for the man pages]' \
154 + '--work-tree=-[set the path to the working tree]: :_directories' \
155 + '--namespace=-[set the git namespace]' \
156 + '--no-replace-objects[do not use replacement refs to replace git objects]' \
157 + '(- :)--help[prints the synopsis and a list of the most commonly used commands]: :->arg' \
158 + '(-): :->command' \
159 + '(-)*:: :->arg' && return
160 +
161 + case $state in
162 + (command)
163 + _alternative \
164 + 'alias-commands:alias:__git_zsh_cmd_alias' \
165 + 'common-commands:common:__git_zsh_cmd_common' \
166 + 'all-commands:all:__git_zsh_cmd_all' && _ret=0
167 + ;;
168 + (arg)
169 + local command="${words[1]}" __git_dir
170 +
171 + if (( $+opt_args[--bare] )); then
172 + __git_dir='.'
173 + else
174 + __git_dir=${opt_args[--git-dir]}
175 + fi
176 +
177 + (( $+opt_args[--help] )) && command='help'
178 +
179 + words=( ${orig_words[@]} )
180 +
181 + __git_zsh_bash_func $command
182 + ;;
183 + esac
184 +}
185 +
186 _git ()
187 {
188 local _ret=1
@@ -78,7 +192,11 @@ _git ()
192 prev=${words[CURRENT-1]}
193 let cword=CURRENT-1
194
81 - emulate ksh -c __${service}_main
195 + if (( $+functions[__${service}_zsh_main] )); then
196 + __${service}_zsh_main
197 + else
198 + emulate ksh -c __${service}_main
199 + fi
200
201 let _ret && _default -S '' && _ret=0
202 return _ret