diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Completion/Unix/Command/_subversion | 42 |
2 files changed, 42 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog index 72be5570a..42b04e5e5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-06-02 Clint Adams <clint@zsh.org> + + * 22481: Oliver Kiddle: Completion/Unix/Command/_subversion: + complete svn diff and resolved subcommands. + 2006-06-02 Peter Stephenson <pws@csr.com> * 22480: Functions/Misc/zmathfuncdef: autoload functions from diff --git a/Completion/Unix/Command/_subversion b/Completion/Unix/Command/_subversion index 04509611c..83590103b 100644 --- a/Completion/Unix/Command/_subversion +++ b/Completion/Unix/Command/_subversion @@ -49,6 +49,11 @@ _svn () { '*:file:_files -g ".svn(/e:_svn_deletedfiles:)"' ) ;; + diff) + args+=( + '*: : _alternative "files:file:_files -g \*\(e:_svn_status:\)" "urls:URL:_svn_urls"' + ) + ;; help) args+=( '*::sub command:_svn_commands' @@ -60,6 +65,11 @@ _svn () { '*:file:_files -g "*(e:_svn_controlled:)"' ) ;; + resolved) + args+=( + '*:file:_files -g "*(e:_svn_conflicts:)"' + ) + ;; revert) args+=( '*:file:_files -g "(.svn|*)(/e:_svn_deletedfiles:,e:_svn_status:)"' @@ -141,6 +151,11 @@ _svn_controlled() { [[ -f ${(M)REPLY##*/}.svn/text-base/${REPLY##*/}.svn-base ]] } +(( $+functions[_svn_conflicts] )) || +_svn_conflicts() { + [ -n $REPLY.(mine|r<->)(N[1]) ] +} + (( $+functions[_svn_deletedfiles] )) || _svn_deletedfiles() { # Typical usage would be _files -g '.svn(/e:_svn_deletedfiles:)' @@ -167,15 +182,32 @@ _svn_status() { (( $+functions[_svn_urls] )) || _svn_urls() { - local expl - - if [[ -prefix *: ]]; then - _urls + local expl remfiles remdispf remdispd suf ret=1 + + if [[ -prefix *: ]] && ! _urls && + zstyle -T ":completion:${curcontext}:" remote-access + then + remfiles=( ${(f)"$(svn list $IPRFIX${PREFIX%%[^./][^/]#} 2>/dev/null)"} ) + compset -P '*/' + compset -S '/*' || suf=file + remdispf=(${remfiles:#*/}) + remdispd=(${(M)remfiles:#*/}) + _tags files + while _tags; do + while _next_label files expl ${suf:-directory}; do + [[ -n $suf ]] && compadd "$@" "$expl[@]" -d remdispf $remdispf && ret=0 + compadd ${suf:+-S/} "$@" "$expl[@]" -d remdispd \ + ${remdispd%/} && ret=0 + done + (( ret )) || return 0 + done else compset -S '[^:]*' _wanted url-schemas expl 'URL schema' compadd -S '' - \ - file:// http:// https:// svn:// svn+ssh:// + file:// http:// https:// svn:// svn+ssh:// && ret=0 fi + + return ret } (( $+functions[_svn_commands] )) || |