diff options
| author | Daniel Shahaf <d.s@daniel.shahaf.name> | 2017-02-01 19:05:44 +0000 |
|---|---|---|
| committer | Daniel Shahaf <d.s@daniel.shahaf.name> | 2017-02-03 18:14:00 +0000 |
| commit | 9211d7f2777abaedfacf98812104d579c3b861f3 (patch) | |
| tree | bb95d08f95ef92615e6bb2f6005e3080168721cb /Functions/VCS_Info/Backends | |
| parent | fca4f90bbac07b8e9bb29ae3267aeccf0f85d56d (diff) | |
| download | zsh-9211d7f2777abaedfacf98812104d579c3b861f3.tar.gz zsh-9211d7f2777abaedfacf98812104d579c3b861f3.tar.xz zsh-9211d7f2777abaedfacf98812104d579c3b861f3.zip | |
40479: vcs_info set-patch-format: Prepare for more code sharing between the callers.
This changes hook invocation order in the hg backend.
Diffstat (limited to 'Functions/VCS_Info/Backends')
| -rw-r--r-- | Functions/VCS_Info/Backends/VCS_INFO_get_data_git | 3 | ||||
| -rw-r--r-- | Functions/VCS_Info/Backends/VCS_INFO_get_data_hg | 9 |
2 files changed, 7 insertions, 5 deletions
diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git index 9a46c4eb7..84a91a74f 100644 --- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git +++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git @@ -126,7 +126,8 @@ VCS_INFO_git_handle_patches () { VCS_INFO_set-patch-format 'git_patches_applied' 'git_applied_s' \ 'git_patches_unapplied' 'git_unapplied_s' \ - ":vcs_info:${vcs}:${usercontext}:${rrn}" gitmsg + ":vcs_info:${vcs}:${usercontext}:${rrn}" gitmsg \ + '' if VCS_INFO_hook 'set-patch-format' "${gitmsg}"; then zformat -f gitmisc "${gitmsg}" "p:${hook_com[applied]}" "u:${hook_com[unapplied]}" \ diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_hg b/Functions/VCS_Info/Backends/VCS_INFO_get_data_hg index 1b1ddcda8..32ecb1c8d 100644 --- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_hg +++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_hg @@ -200,17 +200,18 @@ if zstyle -T ":vcs_info:${vcs}:${usercontext}:${rrn}" get-mq \ done < ${mqseriesfile} fi - VCS_INFO_set-patch-format 'mqpatches' 'applied_string' \ - 'mqunapplied' 'unapplied_string' \ - ":vcs_info:${vcs}:${usercontext}:${rrn}" hgmqstring if VCS_INFO_hook 'gen-mqguards-string' "${mqguards[@]}"; then guards_string=${(j:,:)mqguards} else guards_string=${hook_com[guards-string]} fi - hook_com+=( guards "${guards_string}" guards-n ${#mqguards} ) + local -A extra_hook_com=( guards "${guards_string}" guards-n ${#mqguards} ) + VCS_INFO_set-patch-format 'mqpatches' 'applied_string' \ + 'mqunapplied' 'unapplied_string' \ + ":vcs_info:${vcs}:${usercontext}:${rrn}" hgmqstring \ + extra_hook_com if VCS_INFO_hook 'set-patch-format' ${hgmqstring}; then zformat -f hgmqstring "${hgmqstring}" \ "p:${hook_com[applied]}" "u:${hook_com[unapplied]}" \ |