* Re: _subversion is going to need to use 'help -v'
2019-08-31 20:19 _subversion is going to need to use 'help -v' Daniel Shahaf
@ 2019-09-04 2:54 ` Daniel Shahaf
2019-10-10 16:29 ` Mikael Magnusson
0 siblings, 1 reply; 4+ messages in thread
From: Daniel Shahaf @ 2019-09-04 2:54 UTC (permalink / raw)
To: zsh-workers; +Cc: Cristiano De Michele
[-- Attachment #1: Type: text/plain, Size: 341 bytes --]
Daniel Shahaf wrote on Sat, 31 Aug 2019 20:19 +00:00:
> tl;dr: A change made to Subversion (upstream) trunk today affects _subversion.
Patch attached. I think it's fairly safe to commit it already, even
before the upstream release: it's unlikely that «svn help -v» will be
made to mean "grow a toaster's arm".
Cheers,
Daniel
[-- Attachment #2: 0001-_subversion-Use-svn-help-v-to-show-global-option.patch.txt --]
[-- Type: text/plain, Size: 3224 bytes --]
From 474b54a1c97e4f7b81368e7b10b3b5b1fe359dd0 Mon Sep 17 00:00:00 2001
From: Daniel Shahaf <d.s@daniel.shahaf.name>
Date: Sun, 1 Sep 2019 00:35:42 +0000
Subject: [PATCH 1/2] _subversion: Use 'svn help -v' to show global options,
experimental options, and experimental subcommands (upstream issue SVN-4828,
to be released in Subversion 1.13.0)
---
Completion/Unix/Command/_subversion | 19 ++++++++++++++++---
1 file changed, 16 insertions(+), 3 deletions(-)
diff --git a/Completion/Unix/Command/_subversion b/Completion/Unix/Command/_subversion
index a066b0728..6d9178a2f 100644
--- a/Completion/Unix/Command/_subversion
+++ b/Completion/Unix/Command/_subversion
@@ -30,11 +30,24 @@ _svn () {
'1: :->cmds' \
'*:: :->args' && ret=0
+ local _svn_help_takes_verbose
+ if _cache_invalid svn-help-takes-verbose || ! _retrieve_cache svn-help-takes-verbose; then
+ if [[ $(_call_program svn-help-v svn help help) == *--verbose* ]]
+ _svn_help_takes_verbose=$(( ! $? ))
+ _store_cache svn-help-takes-verbose _svn_help_takes_verbose
+ fi
+ if (( _svn_help_takes_verbose )); then
+ readonly dash_v="-v"
+ else
+ readonly dash_v
+ fi
+ unset _svn_help_takes_verbose
+
if [[ -n $state ]] && (( ! $+_svn_cmds )); then
typeset -gHA _svn_cmds
if _cache_invalid svn-cmds || ! _retrieve_cache svn-cmds; then
_svn_cmds=(
- ${=${(f)${${"$(_call_program commands svn help)"#l#*Available subcommands:}%%Subversion is a tool*}}/(#s)[[:space:]]#(#b)([a-z-]##)[[:space:]]#(\([a-z, ?-]##\))#/$match[1] :$match[1]${match[2]:+:${${match[2]//[(),]}// /:}}:}
+ ${=${(f)${${"$(_call_program commands svn help $dash_v)"#l#*Available subcommands:}%%Subversion is a tool*}}/(#s)[[:space:]]#(#b)([a-z-]##)[[:space:]]#(\([a-z, ?-]##\))#/$match[1] :$match[1]${match[2]:+:${${match[2]//[(),]}// /:}}:}
)
if (( $? == 0 )); then
_store_cache svn-cmds _svn_cmds
@@ -60,14 +73,14 @@ _svn () {
if _cache_invalid svn-${cmd}-usage || \
! _retrieve_cache svn-${cmd}-usage;
then
- usage=${${(M)${(f)"$(_call_program options svn help $cmd)"}:#usage:*}#usage:*$cmd] }
+ usage=${${(M)${(f)"$(_call_program options svn help $dash_v -- $cmd)"}:#usage:*}#usage:*$cmd] }
_store_cache svn-${cmd}-usage usage
fi
if _cache_invalid svn-${cmd}-usage || \
! _retrieve_cache svn-${cmd}-args;
then
args=(
- ${=${${${(M)${(f)"$(_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]}
+ ${=${${${(M)${(f)"$(_call_program options svn help $dash_v -- $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]}
)
while (( idx=$args[(I)*--accept:arg:] )); do
args[idx]=( --accept'=:automatic conflict resolution action:((working\:working base\:base recommended\:recommended '"`for i j in p postpone mc mine-conflict tc theirs-conflict mf mine-full tf theirs-full e edit l launch; do print -rn $i\\\\:$j $j\\\\:$j ""; done `"'))' )
[-- Attachment #3: 0002-_subversion-Update-show-item-completion-to-1.12..patch.txt --]
[-- Type: text/plain, Size: 1306 bytes --]
From 44b79f5937630c2d387f489356c90db174e4449e Mon Sep 17 00:00:00 2001
From: Daniel Shahaf <d.s@daniel.shahaf.name>
Date: Wed, 4 Sep 2019 02:47:19 +0000
Subject: [PATCH 2/2] _subversion: Update --show-item= completion to 1.12.0.
---
Completion/Unix/Command/_subversion | 3 +++
1 file changed, 3 insertions(+)
diff --git a/Completion/Unix/Command/_subversion b/Completion/Unix/Command/_subversion
index 6d9178a2f..2c8085045 100644
--- a/Completion/Unix/Command/_subversion
+++ b/Completion/Unix/Command/_subversion
@@ -11,11 +11,14 @@ _svn () {
relative-url "the repository-relative URL"
repos-root-url "the repository root URL"
repos-uuid "the repository UUID"
+ repos-size "the size of TARGET in the repository (for files only)"
revision "the revision of TARGET"
last-changed-revision "the most recent revision in which TARGET was changed"
last-changed-date "the date of the last-changed revision"
last-changed-author "the author of the last-changed revision"
wc-root "the working copy root path"
+ schedule "'normal', 'add', 'delete', 'replace'"
+ depth "'infinity', 'immediates', 'files', 'empty', 'exclude'"
)
local update_policy
^ permalink raw reply [flat|nested] 4+ messages in thread