about summary refs log tree commit diff
diff options
context:
space:
mode:
authorDaniel Shahaf <d.s@daniel.shahaf.name>2020-03-26 01:32:49 +0000
committerDaniel Shahaf <d.s@daniel.shahaf.name>2020-03-27 01:14:42 +0000
commitb0d020408a935d2d1c317206e3eda43217d0d453 (patch)
treecfb23b9f91bf2869e951c6f71684495547911523
parent36df1e4f78319072aa5e1fcf52789c68c9164cae (diff)
downloadzsh-b0d020408a935d2d1c317206e3eda43217d0d453.tar.gz
zsh-b0d020408a935d2d1c317206e3eda43217d0d453.tar.xz
zsh-b0d020408a935d2d1c317206e3eda43217d0d453.zip
45624: vcs_info: Set $rrn in all backends.
-rw-r--r--ChangeLog5
-rw-r--r--Functions/VCS_Info/Backends/VCS_INFO_get_data_fossil1
-rw-r--r--Functions/VCS_Info/Backends/VCS_INFO_get_data_p41
-rw-r--r--Functions/VCS_Info/VCS_INFO_bydir_detect2
4 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index f53433443..f1b39709d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
 
diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_fossil b/Functions/VCS_Info/Backends/VCS_INFO_get_data_fossil
index fd0f8389e..e84b3abc0 100644
--- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_fossil
+++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_fossil
@@ -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
diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_p4 b/Functions/VCS_Info/Backends/VCS_INFO_get_data_p4
index 329884982..815924c26 100644
--- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_p4
+++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_p4
@@ -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
diff --git a/Functions/VCS_Info/VCS_INFO_bydir_detect b/Functions/VCS_Info/VCS_INFO_bydir_detect
index 29b261413..89b4d6503 100644
--- a/Functions/VCS_Info/VCS_INFO_bydir_detect
+++ b/Functions/VCS_Info/VCS_INFO_bydir_detect
@@ -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