Re: Completing arguments containing the colon character

[Gabor Maghera <gmaghera@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 4230 bytes --]

Thank you, Peter.  I grabbed the latest revision from SourceForge.  It
works like a charm.

Cheers,
Gabor

On Sat, Oct 29, 2011 at 11:30 AM, Peter Stephenson <
p.w.stephenson@ntlworld.com> wrote:

> On Fri, 28 Oct 2011 16:12:05 -0700
> Gabor Maghera <gmaghera@gmail.com> wrote:
> > We use a naming standard for Perforce specs of the form
> > "<username>::<arbitrary>".  Zsh autocompletion cannot process these
> entries,
> > due to the colon character being used as a list separator by its
> mechanism
> > (as I understand).
>
> Right, but the quoting convention is straightforward -- just apply a
> backslash.  The following should be good enough.  I've tried to apply it
> everywhere it could possibly make sense; it should be harmless if it's
> not needed.  Just possibly you might get some extra backslashes in
> descriptive text, since I haven't attempted to separate that out.
>
> (By the way I don't usually post updates to _perforce since they aren't
> of general interest, so it's often worth checking the archive.)
>
> Index: Completion/Unix/Command/_perforce
> ===================================================================
> RCS file: /cvsroot/zsh/zsh/Completion/Unix/Command/_perforce,v
> retrieving revision 1.52
> diff -p -u -r1.52 _perforce
> --- Completion/Unix/Command/_perforce   17 Oct 2011 17:00:49 -0000
>  1.52
> +++ Completion/Unix/Command/_perforce   29 Oct 2011 18:28:22 -0000
> @@ -603,7 +603,7 @@ _perforce_global_options() {
>  _perforce_branches() {
>   local bline match mbegin mend
>   local -a bl
> -  bl=(${${${(f)"$(_perforce_call_p4 branches branches
> 2>/dev/null)"}##Branch }/ /:})
> +  bl=(${${${${(f)"$(_perforce_call_p4 branches branches
> 2>/dev/null)"}##Branch }//:/\\:}/ /:})
>   [[ $#bl -eq 1 && $bl[1] = '' ]] && bl=()
>   (( $#bl )) && _describe -t branches 'Perforce branch' bl
>  }
> @@ -685,7 +685,7 @@ awk '/^Client:/ { print $2 }')")
>   # Limit to the 20 most recent changes by default to avoid huge
>   # output.
>   cl=(
> -${${${${(f)"$(_perforce_call_p4 changes changes $amax $xargs $cstatus
> \$file)"}##Change\ }//\ on\ /:}/\ by\ /\ }
> +${${${${${(f)"$(_perforce_call_p4 changes changes $amax $xargs $cstatus
> \$file)"}##Change\ }//:/\\:}//\ on\ /:}/\ by\ /\ }
>   )
>   # "default" can't have shelved files in it...
>   [[ $ctype = shelved* ]] || cl+=("default:change not yet numbered")
> @@ -711,7 +711,7 @@ _perforce_clients() {
>     compset -P '//' && slash=(-S/ -q)
>   fi
>
> -  cl=(${${${(f)"$(_perforce_call_p4 clients clients)"}##Client\ }/\ /:})
> +  cl=(${${${${(f)"$(_perforce_call_p4 clients clients)"}##Client\
> }//:/\\:}/\ /:})
>   [[ $#cl -eq 1 && $cl[1] = '' ]] && cl=()
>   _describe -t clients 'Perforce client' cl $slash
>  }
> @@ -722,7 +722,7 @@ _perforce_counters() {
>   local cline match mbegin mend
>   local -a cl
>
> -  cl=(${${${(f)"$(_perforce_call_p4 counters counters)"}/\ /:}/\=/current
> value})
> +  cl=(${${${${(f)"$(_perforce_call_p4 counters counters)"}//:/\\:}/\
> /:}/\=/current value})
>   [[ $#cl -eq 1 && $cl[1] = '' ]] && cl=()
>   _describe -t counters 'Perforce counter' cl
>  }
> @@ -796,7 +796,7 @@ _perforce_depots() {
>   local dline match mbegin mend
>   local -a dl
>
> -  dl=(${${${(f)"$(_perforce_call_p4 depots depots)"}##Depot\ }/\ /:})
> +  dl=(${${${${(f)"$(_perforce_call_p4 depots depots)"}##Depot\
> }//:/\\:}/\ /:})
>   [[ $#dl -eq 1 && $dl[1] = '' ]] && dl=()
>   _describe -t depots 'depot name' dl
>  }
> @@ -1594,7 +1594,7 @@ _perforce_submit_options() {
>  _perforce_pids() {
>   local -a ul
>
> -  ul=(${${${(f)"$(_perforce_call_p4 monitor monitor show 2>/dev/null)"}#
> *}/\ /:})
> +  ul=(${${${${(f)"$(_perforce_call_p4 monitor monitor show
> 2>/dev/null)"}# *}//:/\\:}/\ /:})
>   [[ $#ul -eq 1 && $ul[1] = '' ]] && ul=()
>   _describe -t id 'process ID' ul
>  }
> @@ -1604,7 +1604,7 @@ _perforce_pids() {
>  _perforce_users() {
>   local -a ul
>
> -  ul=(${${(f)"$(_perforce_call_p4 users users)"}/\ /:})
> +  ul=(${${${(f)"$(_perforce_call_p4 users users)"}//:/\\:}/\ /:})
>   [[ $#ul -eq 1 && $ul[1] = '' ]] && ul=()
>   _describe -t users 'Perforce user' ul
>  }
>
>
> --
> Peter Stephenson <p.w.stephenson@ntlworld.com>
> Web page now at http://homepage.ntlworld.com/p.w.stephenson/
>
>