summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2008-01-31 16:16:35 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2008-01-31 16:16:35 +0000
commitf6bcc6e1cdf19f35d57382e6f07ed7aece9713ac (patch)
tree668bf61ac208936623e7f65be76383c10d012159
parent4c5d9ae3d5807bab091c7fe54e3c1d445c7ca172 (diff)
downloadzsh-f6bcc6e1cdf19f35d57382e6f07ed7aece9713ac.tar.gz
zsh-f6bcc6e1cdf19f35d57382e6f07ed7aece9713ac.tar.xz
zsh-f6bcc6e1cdf19f35d57382e6f07ed7aece9713ac.zip
Christopher Key: fix for subversion help output
-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 42d494069..b0b541979 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-31  Peter Stephenson  <pws@csr.com>
+
+	* Christopher Key <cjk32@cam.ac.uk>: users/12521:
+	Completion/Unix/Command/_subversion: svn and svnadmin help
+	parsing.
+
 2008-01-30  Peter Stephenson  <pws@csr.com>
 
 	* 24498: Src/mkmakemod.sh: check config.h instead of config.status
diff --git a/Completion/Unix/Command/_subversion b/Completion/Unix/Command/_subversion
index 88a8f1d66..9f137fffd 100644
--- a/Completion/Unix/Command/_subversion
+++ b/Completion/Unix/Command/_subversion
@@ -30,7 +30,7 @@ _svn () {
 
         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]}
+          ${=${${${(M)${(f)"$(LC_ALL=C _call_program options svn help $cmd)"#(*Valid options:|(#e))}:#* :*}%% #:*}/ (arg|ARG)/:arg:}/(#b)-([[:alpha:]]) \[--([a-z-]##)\](:arg:)#/(--$match[2])-$match[1]$match[3] (-$match[1])--$match[2]$match[3]}
         )
 
         case $cmd in;
@@ -148,7 +148,7 @@ _svnadmin () {
 
         usage=${${(M)${(f)"$(LC_ALL=C _call_program options svnadmin help $cmd)"}:#$cmd: usage:*}#$cmd: usage: svnadmin $cmd }
         args=(
-          ${=${${${(M)${(f)"$(LC_ALL=C _call_program options svnadmin help $cmd)"##*Valid options:}:#*:*}%% #:*}/ arg/:arg:}/(#b)-([[:alpha:]]) \[--([a-z-]##)\](:arg:)#/(--$match[2])-$match[1]$match[3] (-$match[1])--$match[2]$match[3]}
+          ${=${${${(M)${(f)"$(LC_ALL=C _call_program options svnadmin help $cmd)"#(*Valid options:|(#e))}:#* :*}%% #:*}/ (arg|ARG)/:arg:}/(#b)-([[:alpha:]]) \[--([a-z-]##)\](:arg:)#/(--$match[2])-$match[1]$match[3] (-$match[1])--$match[2]$match[3]}
         )
         if [[ $_svnadmin_subcmd_usage == *REPOS_PATH* ]]; then
           args+=( ":path:_files -/" )