zsh-workers
 help / color / mirror / code / Atom feed
* PATCH: Fix completion for Subversion 1.7
@ 2011-12-15 15:46 Simon Olofsson
  2011-12-16 17:01 ` Daniel Shahaf
  0 siblings, 1 reply; 2+ messages in thread
From: Simon Olofsson @ 2011-12-15 15:46 UTC (permalink / raw)
  To: zsh-workers

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

Hi,

as previously mentioned on this list, the completion for Subversion 1.7 
is broken because `svn help' outputs
   --changelist [--cl] ARG
for some commands (e.g. `update').
Attached is a Patch that fixes this (Till Haselmann confirmed it). Or 
you can merge from here:
 
https://github.com/simono/zsh/commit/4e30e9568599567bd9a311c4592f6218e9b6c438 


Regards,
Simon


[-- Attachment #2: svn-1.7.patch --]
[-- Type: text/x-patch, Size: 840 bytes --]

diff --git a/Completion/Unix/Command/_subversion b/Completion/Unix/Command/_subversion
index 88142d8..21d809d 100644
--- a/Completion/Unix/Command/_subversion
+++ b/Completion/Unix/Command/_subversion
@@ -48,7 +48,7 @@ _svn () {
 	    ! _retrieve_cache svn-${cmd}-args;
 	then
 	  args=(
-	    ${=${${${(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]}
+	    ${=${${${(M)${(f)"$(LC_ALL=C _call_program options svn help $cmd)"#(*Valid options:|(#e))}:#* :*}%% #:*}/ (arg|ARG)/:arg:}/(#b)(-##)([[:alpha:]]##) \[--([a-z-]##)\](:arg:)#/(--$match[3])$match[1]$match[2]$match[4] ($match[1]$match[2])--$match[3]$match[4]}
 	  )
 	  _store_cache svn-${cmd}-args args
 	fi


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: PATCH: Fix completion for Subversion 1.7
  2011-12-15 15:46 PATCH: Fix completion for Subversion 1.7 Simon Olofsson
@ 2011-12-16 17:01 ` Daniel Shahaf
  0 siblings, 0 replies; 2+ messages in thread
From: Daniel Shahaf @ 2011-12-16 17:01 UTC (permalink / raw)
  To: Simon Olofsson; +Cc: zsh-workers

Simon Olofsson wrote on Thu, Dec 15, 2011 at 16:46:01 +0100:
> -	    ${=${${${(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]}
> +	    ${=${${${(M)${(f)"$(LC_ALL=C _call_program options svn help $cmd)"#(*Valid options:|(#e))}:#* :*}%% #:*}/ (arg|ARG)/:arg:}/(#b)(-##)([[:alpha:]]##) \[--([a-z-]##)\](:arg:)#/(--$match[3])$match[1]$match[2]$match[4] ($match[1]$match[2])--$match[3]$match[4]}
>  	  )

Is ([a-z-]##) correct?  Does it catch --diff3-cmd?

>  	  _store_cache svn-${cmd}-args args
>  	fi
> 


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2011-12-16 17:01 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-12-15 15:46 PATCH: Fix completion for Subversion 1.7 Simon Olofsson
2011-12-16 17:01 ` Daniel Shahaf

Code repositories for project(s) associated with this public inbox

	https://git.vuxu.org/mirror/zsh/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).