diff options
author | Daniel Shahaf <d.s@daniel.shahaf.name> | 2017-02-01 19:05:43 +0000 |
---|---|---|
committer | Daniel Shahaf <d.s@daniel.shahaf.name> | 2017-02-03 18:13:59 +0000 |
commit | fca4f90bbac07b8e9bb29ae3267aeccf0f85d56d (patch) | |
tree | 76c9b699a077d6f3b4c4743c18642dc3aa29ecb1 | |
parent | 3a1756b7280e42d14de58ad90990cf4b04731b3b (diff) | |
download | zsh-fca4f90bbac07b8e9bb29ae3267aeccf0f85d56d.tar.gz zsh-fca4f90bbac07b8e9bb29ae3267aeccf0f85d56d.tar.xz zsh-fca4f90bbac07b8e9bb29ae3267aeccf0f85d56d.zip |
40481: vcs_info hg: Pass arguments to the set-patch-format hook.
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | Functions/VCS_Info/Backends/VCS_INFO_get_data_hg | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 3726cf2e9..125c7d25c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2017-02-03 Daniel Shahaf <d.s@daniel.shahaf.name> + * 40481: Functions/VCS_Info/Backends/VCS_INFO_get_data_hg: + vcs_info hg: Pass arguments to the set-patch-format hook. + * 40478: Functions/VCS_Info/VCS_INFO_set-patch-format: vcs_info set-patch-format: Guard against empty variable elision. diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_hg b/Functions/VCS_Info/Backends/VCS_INFO_get_data_hg index c99452e83..1b1ddcda8 100644 --- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_hg +++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_hg @@ -211,7 +211,7 @@ if zstyle -T ":vcs_info:${vcs}:${usercontext}:${rrn}" get-mq \ hook_com+=( guards "${guards_string}" guards-n ${#mqguards} ) - if VCS_INFO_hook 'set-patch-format' ${qstring}; then + if VCS_INFO_hook 'set-patch-format' ${hgmqstring}; then zformat -f hgmqstring "${hgmqstring}" \ "p:${hook_com[applied]}" "u:${hook_com[unapplied]}" \ "n:${#mqpatches}" "c:${#mqunapplied}" "a:${hook_com[all-n]}" \ |