about summary refs log tree commit diff
diff options
context:
space:
mode:
authorClint Adams <clint@users.sourceforge.net>2005-08-23 19:11:10 +0000
committerClint Adams <clint@users.sourceforge.net>2005-08-23 19:11:10 +0000
commitab96b700f2e74af089608275c0a07d2a1737cd29 (patch)
tree660176457a587b1bdc99408864581cb44af72f05
parenteb2f90a6739bc8abeaca249433b579f07d028f84 (diff)
downloadzsh-ab96b700f2e74af089608275c0a07d2a1737cd29.tar.gz
zsh-ab96b700f2e74af089608275c0a07d2a1737cd29.tar.xz
zsh-ab96b700f2e74af089608275c0a07d2a1737cd29.zip
21682: handle usage output of commands with [0-9]. alternatives, and actually parse that output again.
-rw-r--r--ChangeLog6
-rw-r--r--Completion/Unix/Command/_subversion4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d8e978fb0..18c22c6bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-23  Clint Adams  <clint@zsh.org>
+
+	* 21682: Completion/Unix/Command/_subversion: handle usage output
+	of commands with [0-9]. alternatives, and actually parse that
+	output again.
+
 2005-08-22  Wayne Davison  <wayned@users.sourceforge.net>
 
 	* unposted: Doc/Makefile.in: An even better fix than the one
diff --git a/Completion/Unix/Command/_subversion b/Completion/Unix/Command/_subversion
index 4f39d23ab..0b0c31245 100644
--- a/Completion/Unix/Command/_subversion
+++ b/Completion/Unix/Command/_subversion
@@ -28,7 +28,7 @@ _svn () {
       if (( $#cmd )); then
         curcontext="${curcontext%:*:*}:svn-${cmd}:"
 
-        usage=${${(M)${(f)"$(LC_ALL=C _call_program options svn help $cmd)"}:#usage:*}#usage: $cmd] }
+        usage=${${(M)${(f)"$(LC_ALL=C _call_program options svn help $cmd)"}:#usage:*}#usage:*$cmd] }
         args=(
           ${=${${${(M)${(f)"$(LC_ALL=C _call_program options svn help $cmd)"##*Valid options:}:#* :*}%% #:*}/ arg/:arg:}/(#b)-([[:alpha:]]) \[--([a-z-]##)\](:arg:)#/(--$match[2])-$match[1]$match[3] (-$match[1])--$match[2]$match[3]}
         )
@@ -66,7 +66,7 @@ _svn () {
             )
           ;;
           *)
-            case $_svn_subcmd_usage in
+            case $usage in
               *(SRC|DST|TARGET|URL*PATH)*)
                 args+=(
 	          '*: : _alternative "files:file:_files" "urls:URL:_svn_urls"'