mirror of
git://git.code.sf.net/p/zsh/code
synced 2025-01-19 11:31:26 +01:00
45624: vcs_info: Set $rrn in all backends.
This commit is contained in:
parent
36df1e4f78
commit
b0d020408a
4 changed files with 9 additions and 0 deletions
|
@ -1,5 +1,10 @@
|
|||
2020-03-26 Daniel Shahaf <d.s@daniel.shahaf.name>
|
||||
|
||||
* 45624: Functions/VCS_Info/Backends/VCS_INFO_get_data_fossil,
|
||||
Functions/VCS_Info/Backends/VCS_INFO_get_data_p4,
|
||||
Functions/VCS_Info/VCS_INFO_bydir_detect: vcs_info: Set $rrn
|
||||
in all backends.
|
||||
|
||||
* 45623: Completion/Unix/Command/_quilt: Add subcommand
|
||||
descriptions
|
||||
|
||||
|
|
|
@ -20,5 +20,6 @@ if [ -n "$merging" ]; then
|
|||
action="merging"
|
||||
fi
|
||||
|
||||
rrn=${fsinfo[local_root]:t}
|
||||
VCS_INFO_formats "$action" "${fsbranch}" "${fsinfo[local_root]}" '' "$changed" "${fshash}" "${fsinfo[repository]}"
|
||||
return 0
|
||||
|
|
|
@ -17,6 +17,7 @@ local p4branch change
|
|||
# here down is synced as the revision.
|
||||
# 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
|
||||
|
|
|
@ -36,4 +36,6 @@ done
|
|||
|
||||
[[ ${basedir} == "/" ]] && return 1
|
||||
vcs_comm[basedir]=${basedir}
|
||||
# TODO: Would the following be correct? ---
|
||||
# rrn=${vcs_comm[basedir]:t}
|
||||
return 0
|
||||
|
|
Loading…
Reference in a new issue