about summary refs log tree commit diff
path: root/Functions/VCS_Info/Backends/VCS_INFO_get_data_svk
diff options
context:
space:
mode:
authorDaniel Shahaf <d.s@daniel.shahaf.name>2020-03-26 01:32:50 +0000
committerDaniel Shahaf <d.s@daniel.shahaf.name>2020-03-27 01:14:42 +0000
commitcb87816b0f47367a763790adabcec1e331156ea2 (patch)
tree9629cc7f37bfaa9952e580849ba9b0502d32742c /Functions/VCS_Info/Backends/VCS_INFO_get_data_svk
parentb0d020408a935d2d1c317206e3eda43217d0d453 (diff)
downloadzsh-cb87816b0f47367a763790adabcec1e331156ea2.tar.gz
zsh-cb87816b0f47367a763790adabcec1e331156ea2.tar.xz
zsh-cb87816b0f47367a763790adabcec1e331156ea2.zip
45626: vcs_info: Deduplicate calling the set-branch-format hook.
Diffstat (limited to 'Functions/VCS_Info/Backends/VCS_INFO_get_data_svk')
-rw-r--r--Functions/VCS_Info/Backends/VCS_INFO_get_data_svk10
1 files changed, 2 insertions, 8 deletions
diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_svk b/Functions/VCS_Info/Backends/VCS_INFO_get_data_svk
index 1d2d22ffb..149e30222 100644
--- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_svk
+++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_svk
@@ -8,13 +8,7 @@ local -A hook_com
 
 svkbase=${vcs_comm[basedir]}
 rrn=${svkbase:t}
-zstyle -s ":vcs_info:${vcs}:${usercontext}:${rrn}" branchformat svkbranch || svkbranch="%b:%r"
-hook_com=( branch "${vcs_comm[branch]}" revision "${vcs_comm[revision]}" )
-if VCS_INFO_hook 'set-branch-format' "${svkbranch}"; then
-    zformat -f svkbranch "${svkbranch}" "b:${hook_com[branch]}" "r:${hook_com[revision]}"
-else
-    svkbranch=${hook_com[branch-replace]}
-fi
-hook_com=()
+VCS_INFO_set-branch-format "${vcs_comm[branch]}" "${vcs_comm[revision]}" &&
+    svkbranch="${REPLY}"
 VCS_INFO_formats '' "${svkbranch}" "${svkbase}" '' '' "${vcs_comm[revision]}" ''
 return 0