diff options
| author | Daniel Shahaf <d.s@daniel.shahaf.name> | 2017-02-01 19:05:45 +0000 |
|---|---|---|
| committer | Daniel Shahaf <d.s@daniel.shahaf.name> | 2017-02-03 18:14:01 +0000 |
| commit | 33c0a104482a0299d5d065b88c180ea6975269c0 (patch) | |
| tree | fd875fba09b03a458d424b062e661a99cab52f11 /Functions/VCS_Info/Backends | |
| parent | 9211d7f2777abaedfacf98812104d579c3b861f3 (diff) | |
| download | zsh-33c0a104482a0299d5d065b88c180ea6975269c0.tar.gz zsh-33c0a104482a0299d5d065b88c180ea6975269c0.tar.xz zsh-33c0a104482a0299d5d065b88c180ea6975269c0.zip | |
40480: vcs_info set-patch-format: Eliminate the remaining code duplication.
Diffstat (limited to 'Functions/VCS_Info/Backends')
| -rw-r--r-- | Functions/VCS_Info/Backends/VCS_INFO_get_data_git | 12 | ||||
| -rw-r--r-- | Functions/VCS_Info/Backends/VCS_INFO_get_data_hg | 14 |
2 files changed, 5 insertions, 21 deletions
diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git index 84a91a74f..1b25b1c7c 100644 --- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_git +++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_git @@ -127,16 +127,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 \ - '' - - if VCS_INFO_hook 'set-patch-format' "${gitmsg}"; then - zformat -f gitmisc "${gitmsg}" "p:${hook_com[applied]}" "u:${hook_com[unapplied]}" \ - "n:${#git_patches_applied}" "c:${#git_patches_unapplied}" \ - "a:${hook_com[all-n]}" - else - gitmisc=${hook_com[patch-replace]} - fi - hook_com=() + '' '' + gitmisc=$REPLY } gitdir=${vcs_comm[gitdir]} diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_hg b/Functions/VCS_Info/Backends/VCS_INFO_get_data_hg index 32ecb1c8d..143eb42f0 100644 --- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_hg +++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_hg @@ -207,21 +207,13 @@ 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}" ) 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]}" \ - "n:${#mqpatches}" "c:${#mqunapplied}" "a:${hook_com[all-n]}" \ - "g:${hook_com[guards]}" "G:${#mqguards}" - else - hgmqstring=${hook_com[patch-replace]} - fi - - hook_com=() + extra_hook_com extra_zformats + hgmqstring=$REPLY fi |