diff options
| author | Daniel Shahaf <d.s@daniel.shahaf.name> | 2020-03-26 01:32:50 +0000 |
|---|---|---|
| committer | Daniel Shahaf <d.s@daniel.shahaf.name> | 2020-03-27 01:14:42 +0000 |
| commit | cb87816b0f47367a763790adabcec1e331156ea2 (patch) | |
| tree | 9629cc7f37bfaa9952e580849ba9b0502d32742c /Functions/VCS_Info/Backends/VCS_INFO_get_data_p4 | |
| parent | b0d020408a935d2d1c317206e3eda43217d0d453 (diff) | |
| download | zsh-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_p4')
| -rw-r--r-- | Functions/VCS_Info/Backends/VCS_INFO_get_data_p4 | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_p4 b/Functions/VCS_Info/Backends/VCS_INFO_get_data_p4 index 815924c26..e8a08a663 100644 --- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_p4 +++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_p4 @@ -18,13 +18,7 @@ local p4branch change # I suppose the following might be slow on a tortuous client view. change="${${$(${vcs_comm[cmd]} changes -m 1 ...\#have)##Change }%% *}" rrn=${p4base:t} -zstyle -s ":vcs_info:${vcs}:${usercontext}:${rrn}" branchformat p4branch || p4branch="%b:%r" -hook_com=( branch "${p4info[Client_name]}" revision "${change}" ) -if VCS_INFO_hook 'set-branch-format' "${p4branch}"; then - zformat -f p4branch "${p4branch}" "b:${hook_com[branch]}" "r:${hook_com[revision]}" -else - p4branch=${hook_com[branch-replace]} -fi -hook_com=() +VCS_INFO_set-branch-format "${p4info[Client_name]}" "${change}" && + p4branch="${REPLY}" VCS_INFO_formats '' "${p4branch}" "${p4base}" '' '' "$change" '' return 0 |