about summary refs log tree commit diff
path: root/Functions/VCS_Info/Backends
diff options
context:
space:
mode:
authorDaniel Shahaf <d.s@daniel.shahaf.name>2015-01-24 06:41:42 +0000
committerFrank Terbeck <ft@bewatermyfriend.org>2015-01-25 01:42:05 +0100
commit9d25fd72553caff0008d35670544c0ab909c0224 (patch)
tree890c11ae30f980049e74d1124c83d6b8e845016f /Functions/VCS_Info/Backends
parent083351898017cc881ef5c6f908f2747303dc36be (diff)
downloadzsh-9d25fd72553caff0008d35670544c0ab909c0224.tar.gz
zsh-9d25fd72553caff0008d35670544c0ab909c0224.tar.xz
zsh-9d25fd72553caff0008d35670544c0ab909c0224.zip
vcs_info hg: Support inactive bookmarks
(Similar to git detached heads)
Diffstat (limited to 'Functions/VCS_Info/Backends')
-rw-r--r--Functions/VCS_Info/Backends/VCS_INFO_get_data_hg17
1 files changed, 17 insertions, 0 deletions
diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_hg b/Functions/VCS_Info/Backends/VCS_INFO_get_data_hg
index cedaf5676..1274ca337 100644
--- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_hg
+++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_hg
@@ -6,6 +6,7 @@
 setopt localoptions extendedglob NO_shwordsplit
 
 local hgbase bmfile branchfile rebasefile dirstatefile mqseriesfile \
+    curbmfile curbm \
     mqstatusfile mqguardsfile patchdir mergedir \
     r_csetid r_lrev r_branch i_bmhash i_bmname \
     revformat branchformat hgactionstring hgchanges \
@@ -24,6 +25,7 @@ r_lrev='' # local revision
 patchdir="${hgbase}/.hg/patches"
 mergedir="${hgbase}/.hg/merge/"
 bmfile="${hgbase}/.hg/bookmarks"
+curbmfile="${hgbase}/.hg/bookmarks.current"
 branchfile="${hgbase}/.hg/branch"
 rebasefile="${hgbase}/.hg/rebasestate"
 dirstatefile="${hgbase}/.hg/dirstate"
@@ -125,8 +127,23 @@ if zstyle -t ":vcs_info:${vcs}:${usercontext}:${rrn}" get-bookmarks \
         [[ $i_bmhash == $r_csetid* ]] && hgbmarks+=( $i_bmname )
     done < ${bmfile}
 
+    if [[ -r "$curbmfile" ]] ; then
+        curbm=$(<"${curbmfile}")
+        hook_com[hg-active-bookmark]=$curbm
+    else
+        # leave curbm empty and [hg-active-bookmark] undefined.
+    fi
+
     if VCS_INFO_hook 'gen-hg-bookmark-string' "${hgbmarks[@]}"; then
+        # If there is an active bookmark, annotate it and put it first.
+        if [[ -n $curbm ]] ; then
+            hgbmarks[(i)$curbm]=()
+            hgbmarks[1,0]="${curbm}*"
+        fi
         hgbmstring=${(j:, :)hgbmarks}
+        # Deannotate the array, in case later code expects it to be valid.
+        # (The order is not restored.)
+        [[ -n $curbm ]] && hgbmarks[1]=${${hgbmarks[1]}[1,-2]}
     else
         hgbmstring=${hook_com[hg-bookmark-string]}
     fi