From 19550e7713c59cf3bc795fc0e0a3c6d62f88bb46 Mon Sep 17 00:00:00 2001
From: Peter Stephenson <pws@users.sourceforge.net>
Date: Sun, 30 Oct 2011 19:39:43 +0000
Subject: users/16547: quote p4 arguments with colons in from _describe

---
 ChangeLog                         |  7 ++++++-
 Completion/Unix/Command/_perforce | 14 +++++++-------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8739e7597..61d4e4643 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-30  Peter Stephenson  <p.w.stephenson@ntlworld.com>
+
+	* users/16547: Completion/Unix/Command/_perforce: quote
+	arguments with colon in from _describe.
+
 2011-10-28  Peter Stephenson  <pws@csr.com>
 
 	* Src/module.c (do_load_module): 29879: (via takimoto-j): Metafy
@@ -15522,5 +15527,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5489 $
+* $Revision: 1.5490 $
 *****************************************************
diff --git a/Completion/Unix/Command/_perforce b/Completion/Unix/Command/_perforce
index 4661e18bc..2c1365a79 100644
--- a/Completion/Unix/Command/_perforce
+++ b/Completion/Unix/Command/_perforce
@@ -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
 }
-- 
cgit 1.4.1