From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter van der Does Subject: [PATCH v5 2/2] Use the new functions to get the current cword. Date: Wed, 1 Dec 2010 19:40:44 -0500 Message-ID: <1291250444-1832-3-git-send-email-peter@avirtualhome.com> References: <1291250444-1832-1-git-send-email-peter@avirtualhome.com> Cc: Peter van der Does , git@vger.kernel.org, Jonathan Nieder To: "Shawn O. Pearce" X-From: git-owner@vger.kernel.org Thu Dec 02 01:41:23 2010 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1PNxEe-0003Bi-Vi for gcvg-git-2@lo.gmane.org; Thu, 02 Dec 2010 01:41:21 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755035Ab0LBAlF (ORCPT ); Wed, 1 Dec 2010 19:41:05 -0500 Received: from morn.lunarbreeze.com ([216.227.218.220]:43372 "EHLO morn.lunarbreeze.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753520Ab0LBAlD (ORCPT ); Wed, 1 Dec 2010 19:41:03 -0500 Received: from c-69-248-93-14.hsd1.nj.comcast.net ([69.248.93.14] helo=monza.grandprix.int) by morn.lunarbreeze.com with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.69) (envelope-from ) id 1PNxEL-0006kH-Ds; Wed, 01 Dec 2010 16:41:01 -0800 Received: from MonteCarlo.grandprix.int. (montecarlo.grandprix.int [192.168.1.102]) by monza.grandprix.int (Postfix) with ESMTPA id 264F5D79F0; Wed, 1 Dec 2010 19:40:59 -0500 (EST) X-Mailer: git-send-email 1.7.3.2 In-Reply-To: <1291250444-1832-1-git-send-email-peter@avirtualhome.com> X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - morn.lunarbreeze.com X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - avirtualhome.com X-Source: X-Source-Args: X-Source-Dir: Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Change the completion functions to use the newly introduced functions to get the current and/or previous cword and to reassemble the COMP_CWORDS, making sure the options are correctly split. Signed-off-by: Peter van der Does --- contrib/completion/git-completion.bash | 223 ++++++++++++++++++++------------ 1 files changed, 140 insertions(+), 83 deletions(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 0036e8b..f915e1f 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -554,7 +554,8 @@ __gitcomp_1 () # generates completion reply with compgen __gitcomp () { - local cur="${COMP_WORDS[COMP_CWORD]}" + local cur + _get_comp_words_by_ref -n "=" cur if [ $# -gt 2 ]; then cur="$3" fi @@ -615,7 +616,8 @@ __git_tags () __git_refs () { local i is_hash=y dir="$(__gitdir "${1-}")" track="${2-}" - local cur="${COMP_WORDS[COMP_CWORD]}" format refs + local cur format refs + _get_comp_words_by_ref cur if [ -d "$dir" ]; then case "$cur" in refs|refs/*) @@ -729,7 +731,8 @@ __git_compute_merge_strategies () __git_complete_file () { - local pfx ls ref cur="${COMP_WORDS[COMP_CWORD]}" + local pfx ls ref cur + _get_comp_words_by_ref -n ":" cur case "$cur" in ?*:*) ref="${cur%%:*}" @@ -777,7 +780,8 @@ __git_complete_file () __git_complete_revlist () { - local pfx cur="${COMP_WORDS[COMP_CWORD]}" + local pfx cur + _get_comp_words_by_ref cur case "$cur" in *...*) pfx="${cur%...*}..." @@ -797,11 +801,13 @@ __git_complete_revlist () __git_complete_remote_or_refspec () { - local cmd="${COMP_WORDS[1]}" - local cur="${COMP_WORDS[COMP_CWORD]}" + local cur words cword + _get_comp_words_by_ref -n ":" cur words cword + local cmd="${words[1]}" local i c=2 remote="" pfx="" lhs=1 no_complete_refspec=0 - while [ $c -lt $COMP_CWORD ]; do - i="${COMP_WORDS[c]}" + + while [ $c -lt $cword ]; do + i="${words[c]}" case "$i" in --mirror) [ "$cmd" = "push" ] && no_complete_refspec=1 ;; --all) @@ -869,13 +875,15 @@ __git_complete_remote_or_refspec () __git_complete_strategy () { + local cur prev + _get_comp_words_by_ref -n "=" cur prev __git_compute_merge_strategies - case "${COMP_WORDS[COMP_CWORD-1]}" in + case "${prev}" in -s|--strategy) __gitcomp "$__git_merge_strategies" return 0 esac - local cur="${COMP_WORDS[COMP_CWORD]}" + case "$cur" in --strategy=*) __gitcomp "$__git_merge_strategies" "" "${cur##--strategy=}" @@ -1048,10 +1056,11 @@ __git_aliased_command () # __git_find_on_cmdline requires 1 argument __git_find_on_cmdline () { - local word subcommand c=1 + local word subcommand c=1 words cword - while [ $c -lt $COMP_CWORD ]; do - word="${COMP_WORDS[c]}" + _get_comp_words_by_ref words cword + while [ $c -lt $cword ]; do + word="${words[c]}" for subcommand in $1; do if [ "$subcommand" = "$word" ]; then echo "$subcommand" @@ -1064,9 +1073,10 @@ __git_find_on_cmdline () __git_has_doubledash () { - local c=1 - while [ $c -lt $COMP_CWORD ]; do - if [ "--" = "${COMP_WORDS[c]}" ]; then + local c=1, words cword + _get_comp_words_by_ref words cword + while [ $c -lt $cwords ]; do + if [ "--" = "${words[c]}" ]; then return 0 fi c=$((++c)) @@ -1078,7 +1088,9 @@ __git_whitespacelist="nowarn warn error error-all fix" _git_am () { - local cur="${COMP_WORDS[COMP_CWORD]}" dir="$(__gitdir)" + local cur dir="$(__gitdir)" + + _get_comp_words_by_ref -n "=" cur if [ -d "$dir"/rebase-apply ]; then __gitcomp "--skip --continue --resolved --abort" return @@ -1102,7 +1114,8 @@ _git_am () _git_apply () { - local cur="${COMP_WORDS[COMP_CWORD]}" + local cur + _get_comp_words_by_ref -n "=" cur case "$cur" in --whitespace=*) __gitcomp "$__git_whitespacelist" "" "${cur##--whitespace=}" @@ -1125,7 +1138,8 @@ _git_add () { __git_has_doubledash && return - local cur="${COMP_WORDS[COMP_CWORD]}" + local cur + _get_comp_words_by_ref cur case "$cur" in --*) __gitcomp " @@ -1139,7 +1153,8 @@ _git_add () _git_archive () { - local cur="${COMP_WORDS[COMP_CWORD]}" + local cur + _get_comp_words_by_ref -n "=" cur case "$cur" in --format=*) __gitcomp "$(git archive --list)" "" "${cur##--format=}" @@ -1187,10 +1202,11 @@ _git_bisect () _git_branch () { - local i c=1 only_local_ref="n" has_r="n" + local i c=1 only_local_ref="n" has_r="n" cur words cword + _get_comp_words_by_ref cur words cword - while [ $c -lt $COMP_CWORD ]; do - i="${COMP_WORDS[c]}" + while [ $c -lt $cword ]; do + i="${words[c]}" case "$i" in -d|-m) only_local_ref="y" ;; -r) has_r="y" ;; @@ -1198,7 +1214,7 @@ _git_branch () c=$((++c)) done - case "${COMP_WORDS[COMP_CWORD]}" in + case "$cur" in --*) __gitcomp " --color --no-color --verbose --abbrev= --no-abbrev @@ -1218,8 +1234,10 @@ _git_branch () _git_bundle () { - local cmd="${COMP_WORDS[2]}" - case "$COMP_CWORD" in + local words cword + _get_comp_words_by_ref words cword + local cmd="${words[2]}" + case "$cword" in 2) __gitcomp "create list-heads verify unbundle" ;; @@ -1240,7 +1258,8 @@ _git_checkout () { __git_has_doubledash && return - local cur="${COMP_WORDS[COMP_CWORD]}" + local cur + _get_comp_words_by_ref -n "=" cur case "$cur" in --conflict=*) __gitcomp "diff3 merge" "" "${cur##--conflict=}" @@ -1270,7 +1289,8 @@ _git_cherry () _git_cherry_pick () { - local cur="${COMP_WORDS[COMP_CWORD]}" + local cur + _get_comp_words_by_ref cur case "$cur" in --*) __gitcomp "--edit --no-commit" @@ -1285,7 +1305,8 @@ _git_clean () { __git_has_doubledash && return - local cur="${COMP_WORDS[COMP_CWORD]}" + local cur + _get_comp_words_by_ref cur case "$cur" in --*) __gitcomp "--dry-run --quiet" @@ -1297,7 +1318,8 @@ _git_clean () _git_clone () { - local cur="${COMP_WORDS[COMP_CWORD]}" + local cur + _get_comp_words_by_ref cur case "$cur" in --*) __gitcomp " @@ -1324,7 +1346,8 @@ _git_commit () { __git_has_doubledash && return - local cur="${COMP_WORDS[COMP_CWORD]}" + local cur + _get_comp_words_by_ref -n "=" cur case "$cur" in --cleanup=*) __gitcomp "default strip verbatim whitespace @@ -1359,7 +1382,8 @@ _git_commit () _git_describe () { - local cur="${COMP_WORDS[COMP_CWORD]}" + local cur + _get_comp_words_by_ref cur case "$cur" in --*) __gitcomp " @@ -1391,7 +1415,8 @@ _git_diff () { __git_has_doubledash && return - local cur="${COMP_WORDS[COMP_CWORD]}" + local cur + _get_comp_words_by_ref cur case "$cur" in --*) __gitcomp "--cached --staged --pickaxe-all --pickaxe-regex @@ -1412,7 +1437,8 @@ _git_difftool () { __git_has_doubledash && return - local cur="${COMP_WORDS[COMP_CWORD]}" + local cur + _get_comp_words_by_ref -n "=" cur case "$cur" in --tool=*) __gitcomp "$__git_mergetools_common kompare" "" "${cur##--tool=}" @@ -1437,7 +1463,8 @@ __git_fetch_options=" _git_fetch () { - local cur="${COMP_WORDS[COMP_CWORD]}" + local cur + _get_comp_words_by_ref cur case "$cur" in --*) __gitcomp "$__git_fetch_options" @@ -1449,7 +1476,8 @@ _git_fetch () _git_format_patch () { - local cur="${COMP_WORDS[COMP_CWORD]}" + local cur + _get_comp_words_by_ref -n "=" cur case "$cur" in --thread=*) __gitcomp " @@ -1481,7 +1509,8 @@ _git_format_patch () _git_fsck () { - local cur="${COMP_WORDS[COMP_CWORD]}" + local cur + _get_comp_words_by_ref cur case "$cur" in --*) __gitcomp " @@ -1496,7 +1525,8 @@ _git_fsck () _git_gc () { - local cur="${COMP_WORDS[COMP_CWORD]}" + local cur + _get_comp_words_by_ref cur case "$cur" in --*) __gitcomp "--prune --aggressive" @@ -1515,7 +1545,8 @@ _git_grep () { __git_has_doubledash && return - local cur="${COMP_WORDS[COMP_CWORD]}" + local cur + _get_comp_words_by_ref cur case "$cur" in --*) __gitcomp " @@ -1538,7 +1569,8 @@ _git_grep () _git_help () { - local cur="${COMP_WORDS[COMP_CWORD]}" + local cur + _get_comp_words_by_ref cur case "$cur" in --*) __gitcomp "--all --info --man --web" @@ -1556,7 +1588,8 @@ _git_help () _git_init () { - local cur="${COMP_WORDS[COMP_CWORD]}" + local cur + _get_comp_words_by_ref -n "=" cur case "$cur" in --shared=*) __gitcomp " @@ -1576,7 +1609,8 @@ _git_ls_files () { __git_has_doubledash && return - local cur="${COMP_WORDS[COMP_CWORD]}" + local cur + _get_comp_words_by_ref cur case "$cur" in --*) __gitcomp "--cached --deleted --modified --others --ignored @@ -1630,7 +1664,8 @@ _git_log () { __git_has_doubledash && return - local cur="${COMP_WORDS[COMP_CWORD]}" + local cur + _get_comp_words_by_ref -n "=" cur local g="$(git rev-parse --git-dir 2>/dev/null)" local merge="" if [ -f "$g/MERGE_HEAD" ]; then @@ -1689,7 +1724,8 @@ _git_merge () { __git_complete_strategy && return - local cur="${COMP_WORDS[COMP_CWORD]}" + local cur + _get_comp_words_by_ref cur case "$cur" in --*) __gitcomp "$__git_merge_options" @@ -1700,7 +1736,8 @@ _git_merge () _git_mergetool () { - local cur="${COMP_WORDS[COMP_CWORD]}" + local cur + _get_comp_words_by_ref -n "=" cur case "$cur" in --tool=*) __gitcomp "$__git_mergetools_common tortoisemerge" "" "${cur##--tool=}" @@ -1721,7 +1758,8 @@ _git_merge_base () _git_mv () { - local cur="${COMP_WORDS[COMP_CWORD]}" + local cur + _get_comp_words_by_ref cur case "$cur" in --*) __gitcomp "--dry-run" @@ -1740,7 +1778,8 @@ _git_notes () { local subcommands='add append copy edit list prune remove show' local subcommand="$(__git_find_on_cmdline "$subcommands")" - local cur="${COMP_WORDS[COMP_CWORD]}" + local cur prev + _get_comp_words_by_ref -n "=" cur prev case "$subcommand,$cur" in ,--*) @@ -1775,7 +1814,7 @@ _git_notes () prune,*) ;; *) - case "${COMP_WORDS[COMP_CWORD-1]}" in + case "${prev}" in -m|-F) ;; *) @@ -1790,7 +1829,8 @@ _git_pull () { __git_complete_strategy && return - local cur="${COMP_WORDS[COMP_CWORD]}" + local cur + _get_comp_words_by_ref cur case "$cur" in --*) __gitcomp " @@ -1806,8 +1846,9 @@ _git_pull () _git_push () { - local cur="${COMP_WORDS[COMP_CWORD]}" - case "${COMP_WORDS[COMP_CWORD-1]}" in + local cur prev + _get_comp_words_by_ref -n "=" cur prev + case "$prev" in --repo) __gitcomp "$(__git_remotes)" return @@ -1830,7 +1871,9 @@ _git_push () _git_rebase () { - local cur="${COMP_WORDS[COMP_CWORD]}" dir="$(__gitdir)" + local cur + local dir="$(__gitdir)" + _get_comp_words_by_ref -n "=" cur if [ -d "$dir"/rebase-apply ] || [ -d "$dir"/rebase-merge ]; then __gitcomp "--continue --skip --abort" return @@ -1860,7 +1903,8 @@ __git_send_email_suppresscc_options="author self cc bodycc sob cccmd body all" _git_send_email () { - local cur="${COMP_WORDS[COMP_CWORD]}" + local cur + _get_comp_words_by_ref -n "=" cur case "$cur" in --confirm=*) __gitcomp " @@ -1902,9 +1946,10 @@ _git_stage () __git_config_get_set_variables () { - local prevword word config_file= c=$COMP_CWORD - while [ $c -gt 1 ]; do - word="${COMP_WORDS[c]}" + local prevword word config_file= words cword + _get_comp_words_by_ref -n "=" words cword + while [ $cword -gt 1 ]; do + word="${words[cword]}" case "$word" in --global|--system|--file=*) config_file="$word" @@ -1916,7 +1961,7 @@ __git_config_get_set_variables () ;; esac prevword=$word - c=$((--c)) + cword=$((--cword)) done git --git-dir="$(__gitdir)" config $config_file --list 2>/dev/null | @@ -1932,9 +1977,9 @@ __git_config_get_set_variables () _git_config () { - local cur="${COMP_WORDS[COMP_CWORD]}" - local prv="${COMP_WORDS[COMP_CWORD-1]}" - case "$prv" in + local cur prev + _get_comp_words_by_ref cur prev + case "$prev" in branch.*.remote) __gitcomp "$(__git_remotes)" return @@ -1944,13 +1989,13 @@ _git_config () return ;; remote.*.fetch) - local remote="${prv#remote.}" + local remote="${prev#remote.}" remote="${remote%.fetch}" __gitcomp "$(__git_refs_remotes "$remote")" return ;; remote.*.push) - local remote="${prv#remote.}" + local remote="${prev#remote.}" remote="${remote%.push}" __gitcomp "$(git --git-dir="$(__gitdir)" \ for-each-ref --format='%(refname):%(refname)' \ @@ -2341,7 +2386,8 @@ _git_reset () { __git_has_doubledash && return - local cur="${COMP_WORDS[COMP_CWORD]}" + local cur + _get_comp_words_by_ref cur case "$cur" in --*) __gitcomp "--merge --mixed --hard --soft --patch" @@ -2353,7 +2399,8 @@ _git_reset () _git_revert () { - local cur="${COMP_WORDS[COMP_CWORD]}" + local cur + _get_comp_words_by_ref cur case "$cur" in --*) __gitcomp "--edit --mainline --no-edit --no-commit --signoff" @@ -2367,7 +2414,8 @@ _git_rm () { __git_has_doubledash && return - local cur="${COMP_WORDS[COMP_CWORD]}" + local cur= + _get_comp_words_by_ref cur case "$cur" in --*) __gitcomp "--cached --dry-run --ignore-unmatch --quiet" @@ -2381,7 +2429,8 @@ _git_shortlog () { __git_has_doubledash && return - local cur="${COMP_WORDS[COMP_CWORD]}" + local cur + _get_comp_words_by_ref cur case "$cur" in --*) __gitcomp " @@ -2399,7 +2448,8 @@ _git_show () { __git_has_doubledash && return - local cur="${COMP_WORDS[COMP_CWORD]}" + local cur + _get_comp_words_by_ref -n "=" cur case "$cur" in --pretty=*) __gitcomp "$__git_log_pretty_formats $(__git_pretty_aliases) @@ -2423,7 +2473,8 @@ _git_show () _git_show_branch () { - local cur="${COMP_WORDS[COMP_CWORD]}" + local cur + _get_comp_words_by_ref cur case "$cur" in --*) __gitcomp " @@ -2440,10 +2491,11 @@ _git_show_branch () _git_stash () { - local cur="${COMP_WORDS[COMP_CWORD]}" + local cur local save_opts='--keep-index --no-keep-index --quiet --patch' local subcommands='save list show apply clear drop pop create branch' local subcommand="$(__git_find_on_cmdline "$subcommands")" + _get_comp_words_by_ref cur if [ -z "$subcommand" ]; then case "$cur" in --*) @@ -2485,7 +2537,8 @@ _git_submodule () local subcommands="add status init update summary foreach sync" if [ -z "$(__git_find_on_cmdline "$subcommands")" ]; then - local cur="${COMP_WORDS[COMP_CWORD]}" + local cur + _get_comp_words_by_ref cur case "$cur" in --*) __gitcomp "--quiet --cached" @@ -2529,7 +2582,8 @@ _git_svn () --edit --rmdir --find-copies-harder --copy-similarity= " - local cur="${COMP_WORDS[COMP_CWORD]}" + local cur + _get_comp_words_by_ref cur case "$subcommand,$cur" in fetch,--*) __gitcomp "--revision= --fetch-all $fc_opts" @@ -2600,9 +2654,10 @@ _git_svn () _git_tag () { - local i c=1 f=0 - while [ $c -lt $COMP_CWORD ]; do - i="${COMP_WORDS[c]}" + local i c=1 f=0 words cword prev + _get_comp_words_by_ref prev words cword + while [ $c -lt $cword ]; do + i="${words[c]}" case "$i" in -d|-v) __gitcomp "$(__git_tags)" @@ -2615,7 +2670,7 @@ _git_tag () c=$((++c)) done - case "${COMP_WORDS[COMP_CWORD-1]}" in + case "${prev}" in -m|-F) COMPREPLY=() ;; @@ -2639,15 +2694,16 @@ _git_whatchanged () _git () { - local i c=1 command __git_dir + local i c=1 command __git_dir words cword - if [[ -n ${ZSH_VERSION-} ]]; then + if [[ -n $ZSH_VERSION ]]; then emulate -L bash setopt KSH_TYPESET fi - while [ $c -lt $COMP_CWORD ]; do - i="${COMP_WORDS[c]}" + _get_comp_words_by_ref -n "=" words cword + while [ $c -lt $cword ]; do + i="${words[c]}" case "$i" in --git-dir=*) __git_dir="${i#--git-dir=}" ;; --bare) __git_dir="." ;; @@ -2659,7 +2715,7 @@ _git () done if [ -z "$command" ]; then - case "${COMP_WORDS[COMP_CWORD]}" in + case "${words[cword]}" in --*) __gitcomp " --paginate --no-pager @@ -2690,19 +2746,20 @@ _git () _gitk () { - if [[ -n ${ZSH_VERSION-} ]]; then + if [[ -n $ZSH_VERSION ]]; then emulate -L bash setopt KSH_TYPESET fi __git_has_doubledash && return - local cur="${COMP_WORDS[COMP_CWORD]}" + local cur local g="$(__gitdir)" local merge="" if [ -f "$g/MERGE_HEAD" ]; then merge="--merge" fi + _get_comp_words_by_ref cur case "$cur" in --*) __gitcomp " @@ -2730,7 +2787,7 @@ complete -o bashdefault -o default -o nospace -F _git git.exe 2>/dev/null \ || complete -o default -o nospace -F _git git.exe fi -if [[ -n ${ZSH_VERSION-} ]]; then +if [[ -n $ZSH_VERSION ]]; then shopt () { local option if [ $# -ne 2 ]; then -- 1.7.3.2