mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-01-01 05:16:05 +01:00
Code Releases Activity

47303: vcs_info hg: Fix changing the expansion of %g (hook_com[guards]) in the set-patch-format hook (regression from workers/40480).

Browse source 
To reproduce, go to a hg repository with active mq guards and configure
vcs_info as follows:

    zstyle '*' get-unapplied true
    zstyle ':vcs_info:*set-patch-format*' hooks f
    zstyle '*' patch-format '[%g : %G]'
    zstyle '*' nopatch-format '[%g : %G]'
    zstyle '*' formats '%m'
    +vi-f () {
    	hook_com[guards]+=XXX
    }

The regression was first released in 5.3.1-test-2, over three years ago.
This commit is contained in:
Daniel Shahaf 2020-08-08 07:29:34 +00:00
parent e2be2d061a
commit 5448e1611d
3 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2020-08-09 Daniel Shahaf <d.s@daniel.shahaf.name>
* 47303: Functions/VCS_Info/Backends/VCS_INFO_get_data_hg,
Functions/VCS_Info/VCS_INFO_set-patch-format: vcs_info hg:
Fix changing the expansion of %g (hook_com[guards]) in the
set-patch-format hook (regression from workers/40480).
2020-08-08 Daniel Shahaf <d.s@daniel.shahaf.name>
* unposted: Doc/Zsh/metafaq.yo, Etc/FAQ.yo: Update documentation

8
Functions/VCS_Info/Backends/VCS_INFO_get_data_hg
View file

@ -217,12 +217,16 @@ if zstyle -T ":vcs_info:${vcs}:${usercontext}:${rrn}" get-mq \
fi
local -A extra_hook_com=( guards "${guards_string}" guards-n ${#mqguards} )
local -a extra_zformats=( "g:${extra_hook_com[guards]}" "G:${#mqguards}" )
(( ${+functions[VCS_INFO_hg_extra_zformats]} )) ||
VCS_INFO_hg_extra_zformats() {
reply=( "g:${hook_com[guards]}" "G:${#mqguards}" )
}
VCS_INFO_set-patch-format 'mqpatches' 'applied_string' \
'mqunapplied' 'unapplied_string' \
":vcs_info:${vcs}:${usercontext}:${rrn}" hgmqstring \
extra_hook_com extra_zformats
extra_hook_com VCS_INFO_hg_extra_zformats
hgmqstring=$REPLY
fi

6
Functions/VCS_Info/VCS_INFO_set-patch-format
View file

@ -12,7 +12,7 @@
# $6 - name of a parameter to store a patch-format format string in
# $7 - name of an assoc parameter with extra $hook_com key-value pairs for the
# set-patch-format hook invocation, or '' for none
# $8 - name of an array parameter with extra arguments for the patch-format zformat call, or '' for empty
# $8 - name of a function that sets $reply to extra arguments for the patch-format zformat call, or '' for none
#
# The expanded patch-format string is returned in $REPLY.
#
@ -68,10 +68,12 @@
hook_com[unapplied]=${hook_com[unapplied]//'%'/%%}
fi
reply=()
[[ -n $8 ]] && "$8"
zformat -f REPLY "${(P)6}" "p:${hook_com[applied]}" "u:${hook_com[unapplied]}" \
"n:${hook_com[applied-n]}" "c:${hook_com[unapplied-n]}" \
"a:${hook_com[all-n]}" \
${8:+"${(@P)8}"}
"${reply[@]}"
else
unset applied_needs_escaping unapplied_needs_escaping # the hook deals with escaping
REPLY=${hook_com[patch-replace]}