zshrc: Add experimental bzr backend to vcs_info()

[grml-etc-core.git] / etc / zsh / zshrc

diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc
index 23f653b..a4e1931 100644 (file)
--- a/etc/zsh/zshrc
+++ b/etc/zsh/zshrc
@@ -1041,7 +1041,7 @@ fi
 #   First, the context in which we are working:
 #       :vcs_info:<vcs-string>
 #   ...where <vcs-string> is one of:
-#       - git, git-svn, hg, darcs, bzr, mtn, svn or svk
+#       - git, git-svn, hg, darcs, bzr, mtn, svn, cvs or svk
 #
 #   You can of course use ':vcs_info:*' to match all VCSs at once.
 #
@@ -1052,11 +1052,19 @@ fi
 #   promptformat        - Used in most circumstances.
 #   promptactionformat  - Used if a there is a special action going on;
 #                         (like an interactive rebase or a merge conflict)
-#   enable              - check in the 'init' context. If set to false,
+#   enable              - Check in the 'init' context. If set to false,
 #                         vcs_info() will do nothing.
-#   disable             - provide a list of systems, you don't want
+#   disable             - Provide a list of systems, you don't want
 #                         the prompt to check for repositories (checked
 #                         in the 'init' context, too).
+#   use-simple          - If there are two different ways of gathering
+#                         information, you can select the simpler one
+#                         by setting this style to true; the default
+#                         is to use the not-that-simple code, which is
+#                         potentially a lot slower but might be more
+#                         accurate in all possible cases.
+#
+# The use-simple style is currently only available for the bzr backend.
 #
 # The default values for these in all contexts are:
 #   promptformat        " (%s)-[%b|%a]-"
@@ -1085,6 +1093,10 @@ fi
 #   % zstyle ':vcs_info:git' promptformat       ' GIT, BABY! [%b]'
 #   % zstyle ':vcs_info:git' promptactionformat ' GIT ACTION! [%b|%a]'
 #
+#   Use the quicker bzr backend (if you do, please report if it does
+#   the-right-thing[tm] - thanks):
+#   % zstyle ':vcs_info:bzr' use-simple true
+#
 # If you want colors, make sure you enclose the color codes in %{...%}, because
 # the string provided by vcs_info() is used for prompts.
 #
@@ -1284,22 +1296,47 @@ VCS_INFO_svn_get_data () { # {{{
 VCS_INFO_bzr_get_data () { # {{{
     local msg bzrbranch bzrbase bzrrevno i j
 
-    bzrbase=$(bzr info | sed -rne 's, *branch root: ,,p')
-    case ${bzrbase} in
-        .) bzrbase=${PWD} ;;
-    esac
+    if zstyle -t ":vcs_info:${vcs}" "use-simple" ; then
+        bzrbase=${vcs_comm[basedir]}
+        bzrbranch=${bzrbase:t}
+        if [[ -f ${bzrbase}/.bzr/branch/last-revision ]] ; then
+            bzrrevno=$(< ${bzrbase}/.bzr/branch/last-revision)
+            bzrrevno=${bzrrevno%% *}
+        fi
+    else
+        bzrbase=$(bzr info 2>/dev/null | sed -rne 's, *branch root: ,,p')
+        bzrbase=$(VCS_INFO_realpath ${bzrbase})
+
+        bzr version-info 2> /dev/null | while read i j; do
+            case "${i}" in
+                revno:)
+                    bzrrevno=${j} ;;
+                branch-nick:)
+                    bzrbranch=${j} ;;
+            esac
+        done
+    fi
 
-    bzr version-info | while read i j; do
-        case "${i}" in
-            revno:)
-                bzrrevno=${j} ;;
-            branch-nick:)
-                bzrbranch=${j} ;;
-        esac
+    msg=$(VCS_INFO_format)
+    zformat -f msg "${msg}" "a:" "b:${bzrbranch}:${bzrrevno}" "s:${vcs}" "r:${bzrbase:t}" "R:${bzrbase}"
+    printf '%s' ${msg}
+}
+# }}}
+VCS_INFO_cvs_get_data () { # {{{
+    local msg cvsbranch cvsbase basename
+
+    cvsbase="."
+    while [[ -d "${cvsbase}/../CVS" ]]; do
+        cvsbase="${cvsbase}/.."
     done
+    cvsbase=$(VCS_INFO_realpath ${cvsbase})
+    cvsbranch=$(< ./CVS/Repository)
+    basename=${cvsbase:t}
+    cvsbranch=${cvsbranch##${basename}/}
+    [[ -z ${cvsbranch} ]] && cvsbranch=${basename}
 
     msg=$(VCS_INFO_format)
-    zformat -f msg "${msg}" "a:" "b:${bzrbranch}:${bzrrevno}" "s:${vcs}" "r:${bzrbase:t}" "R:${bzrbase}"
+    zformat -f msg "${msg}" "a:" "b:${cvsbranch}" "s:${vcs}" "r:${basename}" "R:${cvsbase}"
     printf '%s' ${msg}
 }
 # }}}
@@ -1330,10 +1367,17 @@ VCS_INFO_detect_by_dir() {
 
 VCS_INFO_bzr_detect() {
     check_com -c bzr || return 1
+    vcs_comm[detect_need_file]=branch/format
     VCS_INFO_detect_by_dir '.bzr'
     return $?
 }
 
+VCS_INFO_cvs_detect() {
+    check_com -c svn || return 1
+    [[ -d "CVS" ]] && return 0
+    return 1
+}
+
 VCS_INFO_darcs_detect() {
     check_com -c darcs || return 1
     vcs_comm[detect_need_file]=format
@@ -1394,7 +1438,7 @@ vcs_info () { # {{{
     zstyle -T ":vcs_info:${vcs}" "enable" || return 0
     zstyle -a ":vcs_info:${vcs}" "disable" disabled
 
-    VCSs=(git hg bzr darcs mtn svn svk)
+    VCSs=(git hg bzr darcs mtn svn cvs svk)
 
     (( found = 0 ))
     for vcs in ${VCSs} ; do