X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fzsh%2Fzshrc;h=aecf3d9b13deca17217d67e98fc673f63b956db8;hb=a0594fc0b671d5dabc0eda312a86ebc3ea0b7094;hp=6de5c64998197b435345b7a94d4f4b70f89270e4;hpb=95b1193125bf2e9cd5682638a2adb27b270799b2;p=grml-etc-core.git

diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc
index 6de5c64..aecf3d9 100644
--- a/etc/zsh/zshrc
+++ b/etc/zsh/zshrc
@@ -1026,8 +1026,8 @@ else
     GREEN=$'%{\e[1;32m%}'
     CYAN=$'%{\e[1;36m%}'
     WHITE=$'%{\e[1;37m%}'
-    MAGENTA='%{\e[1;35m%}'
-    YELLOW='%{\e[1;33m%}'
+    MAGENTA=$'%{\e[1;35m%}'
+    YELLOW=$'%{\e[1;33m%}'
     NO_COLOUR=$'%{\e[0m%}'
 fi
 
@@ -1037,10 +1037,11 @@ fi
 
 # vcs_info() documentation: {{{
 #
-# The vcs_info () feature can be configured via zstyle:
+# The vcs_info() feature can be configured via zstyle:
 #   First, the context in which we are working:
 #       :vcs_info:<vcs-string>
-#   ...where <vcs-string> is one of: git, hg, bzr, svn or svk
+#   ...where <vcs-string> is one of:
+#       - git, git-svn, hg, darcs, bzr, mtn, svn, cvs or svk
 #
 #   You can of course use ':vcs_info:*' to match all VCSs at once.
 #
@@ -1051,15 +1052,33 @@ 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,
+#   branchformat        - Some backends replace %b in the prompt*format
+#                         styles above, not only by a branch name but also
+#                         by a revision number. This style let's you
+#                         modify how that string should look like.
+#   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
+#                         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]-"
 #   promptactionformat  " (%s)-[%b]-"
+#   branchformat        "%b:%r" (for bzr, svn and svk)
 #   enable              true
+#   disable             (empty list)
+#   use-simple          false
 #
-# In these formats, the following replacements are done:
+# In the prompt*formats, the following replacements are done:
 #   %s  - The vcs in use (git, hg, svn etc.)
 #   %b  - Information about the current branch.
 #   %a  - An identifier, that describes the action.
@@ -1068,19 +1087,61 @@ fi
 #   %r  - repository name
 #         If %R is '/foo/bar/repoXY', %r is 'repoXY'.
 #
+# In branchformat these replacements are done:
+#   %b  - the branch name
+#   %r  - the current revision number
+#
 # Not all vcs backends may support all replacements
 #
-# If you want colors, make sure you enclose the color codes in %{...%}, because
-# the string provided by vcs_info() is commonly used for prompts.
+# Examples:
+#   Don't use vcs_info at all (even though it's in your prompt):
+#   % zstyle ':vcs_info:*' enable false
+#
+#   Don't provide prompt info for bzr and svk:
+#   % zstyle ':vcs_info:*' disable bzr svk
+#
+#   Provide a prompt specifically for git:
+#   % 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
+#
+#   Display the revision number in yellow for bzr and svn:
+#   % zstyle ':vcs_info:(svn|bzr)' branchformat '%b%{'${fg[yellow]}'%}:%r'
+#
+# If you want colors, make sure you enclose the color codes in %{...%},
+# because the string provided by vcs_info() is used for prompts.
 #
 #   Example: PROMPT='%(?..[%?]-)%3~%$(vcs_info)#'
 #
 # This *requires* 'setopt prompt_subst'.
 # }}}
-VCS_INFO_default_action_format=' (%s)-[%b|%a]-'
-VCS_INFO_default_format=' (%s)-[%b]-'
+VCS_INFO_adjust () { #{{{
+    [[ -n ${vcs_comm[overwrite_name]} ]] && vcs=${vcs_comm[overwrite_name]}
+    return 0
+}
+# }}}
+VCS_INFO_format () { # {{{
+    local msg
+
+    if [[ -n ${1} ]] ; then
+        zstyle -s ":vcs_info:${vcs}" promptactionformat msg
+        [[ -z ${msg} ]] && msg=' (%s)-[%b|%a]-'
+    else
+        zstyle -s ":vcs_info:${vcs}" promptformat msg
+        [[ -z ${msg} ]] && msg=' (%s)-[%b]-'
+    fi
+    printf '%s' ${msg}
+}
+# }}}
 VCS_INFO_realpath () { #{{{
     # replacing 'readlink -f', which is really not portable.
+
+    # If there *is* a chpwd() function unfunction it here.
+    # The *real* zsh does not loose its chpwd(), because we run
+    # in a different context (process substitution in $PROMPT).
     (( ${+functions[chpwd]} )) && unfunction chpwd
     setopt chaselinks
     cd $1 2>/dev/null && pwd
@@ -1101,7 +1162,7 @@ VCS_INFO_git_getaction () { #{{{
             else
                 gitaction="am/rebase"
             fi
-            print '%s' ${gitaction}
+            printf '%s' ${gitaction}
             return 0
         fi
     done
@@ -1142,6 +1203,7 @@ VCS_INFO_git_getbranch () { #{{{
        || [[ -d "${gitdir}/../.dotest" ]]   \
        || [[ -f "${gitdir}/MERGE_HEAD" ]] ; then
         gitbranch="$(${(z)gitsymref} 2> /dev/null)"
+        [[ -z ${gitbranch} ]] && gitbranch="$(< ${gitdir}/rebase-apply/head-name)"
 
     elif   [[ -f "${gitdir}/rebase-merge/interactive" ]] \
         || [[ -d "${gitdir}/rebase-merge" ]] ; then
@@ -1170,16 +1232,14 @@ VCS_INFO_git_get_data () { # {{{
     setopt localoptions extendedglob
     local gitdir gitbase gitbranch gitaction msg
 
-    gitdir="$(git rev-parse --git-dir 2> /dev/null)"
-
-    if [[ $? -eq 0 ]] ; then
-        gitbranch="$(VCS_INFO_git_getbranch ${gitdir})"
-    fi
+    gitdir=${vcs_comm[gitdir]}
+    gitbranch="$(VCS_INFO_git_getbranch ${gitdir})"
 
     if [[ -z ${gitdir} ]] || [[ -z ${gitbranch} ]] ; then
         return
     fi
 
+    VCS_INFO_adjust
     gitaction="$(VCS_INFO_git_getaction ${gitdir})"
     msg=$(VCS_INFO_format ${gitaction})
 
@@ -1189,24 +1249,42 @@ VCS_INFO_git_get_data () { # {{{
     printf '%s' ${msg}
 }
 # }}}
+VCS_INFO_darcs_get_data () { # {{{
+    local msg darcsbase
+
+    darcsbase=${vcs_comm[basedir]}
+    msg=$(VCS_INFO_format)
+    zformat -f msg "${msg}" "a:" "b:${darcsbase:t}" "s:${vcs}" "r:${darcsbase:t}" "R:${darcsbase}"
+    printf '%s' ${msg}
+}
+# }}}
 VCS_INFO_hg_get_data () { # {{{
     local msg hgbranch hgbase
 
-    hgbase=${1}
+    hgbase=${vcs_comm[basedir]}
     hgbranch=$(< ${hgbase}/.hg/branch)
     msg=$(VCS_INFO_format)
     zformat -f msg "${msg}" "a:" "b:${hgbranch}" "s:${vcs}" "r:${hgbase:t}" "R:${hgbase}"
     printf '%s' ${msg}
 }
 # }}}
+VCS_INFO_mtn_get_data () { # {{{
+    local msg mtnbranch mtnbase
+
+    mtnbase=${vcs_comm[basedir]}
+    mtnbranch=$(mtn status | awk '/Current branch:/{ sub("Current branch: ", ""); print }')
+    msg=$(VCS_INFO_format)
+    zformat -f msg "${msg}" "a:" "b:${mtnbranch}" "s:${vcs}" "r:${mtnbase:t}" "R:${mtnbase}"
+    printf '%s' ${msg}
+}
+# }}}
 VCS_INFO_svk_get_data () { # {{{
     local msg svkbranch svkbase
 
-    svkbase=${1}
-    svkbranch=${svkbase##*
-  }
-    svkbase=${svkbase%%
-  *}
+    svkbase=${vcs_comm[basedir]}
+
+    zstyle -s ":vcs_info:${vcs}" branchformat svkbranch || svkbranch="%b:%r"
+    zformat -f svkbranch "${svkbranch}" "b:${vcs_comm[branch]}" "r:${vcs_comm[revision]}"
 
     msg=$(VCS_INFO_format)
     zformat -f msg "${msg}" "a:" "b:${svkbranch}" "s:${vcs}" "r:${svkbase:t}" "R:${svkbase}"
@@ -1214,14 +1292,19 @@ VCS_INFO_svk_get_data () { # {{{
 }
 # }}}
 VCS_INFO_svn_get_data () { # {{{
-    local msg svnbranch svnbase
+    setopt localoptions noksharrays
+    local msg svnbase svnbranch
+    local -a svninfo
 
     svnbase="."
     while [[ -d "${svnbase}/../.svn" ]]; do
         svnbase="${svnbase}/.."
     done
     svnbase=$(VCS_INFO_realpath ${svnbase})
-    svnbranch=$(svn info "$base_dir" | awk '/^URL/ { sub(".*/","",$0); r=$0 } /^Revision/ { sub("[^0-9]*","",$0); print r":"$0 }')
+    svninfo=($(svn info "${svnbase}" | awk '/^URL/ { sub(".*/","",$0); r=$0 } /^Revision/ { sub("[^0-9]*","",$0); print r"\n"$0 }'))
+
+    zstyle -s ":vcs_info:${vcs}" branchformat svnbranch || svnbranch="%b:%r"
+    zformat -f svnbranch "${svnbranch}" "b:${svninfo[1]}" "r:${svninfo[2]}"
 
     msg=$(VCS_INFO_format)
     zformat -f msg "${msg}" "a:" "b:${svnbranch}" "s:${vcs}" "r:${svnbase:t}" "R:${svnbase}"
@@ -1229,62 +1312,153 @@ VCS_INFO_svn_get_data () { # {{{
 }
 # }}}
 VCS_INFO_bzr_get_data () { # {{{
-    local msg bzrbranch bzrbase bzrrevno i j
+    local msg bzrbranch bzrbase bzrrevno bzrbr i j
+
+    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
 
-    bzrbase=$(bzr info | sed -rne 's, *branch root: ,,p')
-    case ${bzrbase} in
-        .) bzrbase=${PWD} ;;
-    esac
+    zstyle -s ":vcs_info:${vcs}" branchformat bzrbr || bzrbr="%b:%r"
+    zformat -f bzrbr "${bzrbr}" "b:${bzrbranch}" "r:${bzrrevno}"
 
-    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:${bzrbr}" "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}
 }
 # }}}
 # VCS_INFO_*_detect () {{{
 
+VCS_INFO_detect_by_dir() {
+    local dirname=${1}
+    local basedir="." realbasedir
+
+    realbasedir=$(VCS_INFO_realpath ${basedir})
+    while [[ ${realbasedir} != '/' ]]; do
+        if [[ -n ${vcs_comm[detect_need_file]} ]] ; then
+            [[ -d ${basedir}/${dirname} ]] && \
+            [[ -f ${basedir}/${dirname}/${vcs_comm[detect_need_file]} ]] && \
+                break
+        else
+            [[ -d ${basedir}/${dirname} ]] && break
+        fi
+
+        basedir=${basedir}/..
+        realbasedir=$(VCS_INFO_realpath ${basedir})
+    done
+
+    [[ ${realbasedir} == "/" ]] && return 1
+    vcs_comm[basedir]=${realbasedir}
+    return 0
+}
+
 VCS_INFO_bzr_detect() {
     check_com -c bzr || return 1
-    [[ -d ".bzr" ]] && return 0
+    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
+    VCS_INFO_detect_by_dir '_darcs'
+    return $?
+}
+
 VCS_INFO_git_detect() {
-    check_com -c git && git rev-parse --is-inside-work-tree &> /dev/null && return 0
+    if check_com -c git && git rev-parse --is-inside-work-tree &> /dev/null ; then
+        vcs_comm[gitdir]="$(git rev-parse --git-dir 2> /dev/null)" || return 1
+        [[ -d ${vcs_comm[gitdir]}/svn ]] && vcs_comm[overwrite_name]='git-svn'
+        return 0
+    fi
     return 1
 }
 
 VCS_INFO_hg_detect() {
-    local basedir="."
-
     check_com -c hg || return 1
-    while [[ ! -d ${basedir}/.hg ]]; do
-        basedir=${basedir}/..
-        [[ $(VCS_INFO_realpath ${basedir}) = "/" ]] && return 1
-    done
+    vcs_comm[detect_need_file]=branch
+    VCS_INFO_detect_by_dir '.hg'
+    return $?
+}
 
-    printf '%s' $(VCS_INFO_realpath ${basedir})
-    return 0
+VCS_INFO_mtn_detect() {
+    check_com -c mtn || return 1
+    vcs_comm[detect_need_file]=revision
+    VCS_INFO_detect_by_dir '_MTN'
+    return $?
 }
 
 VCS_INFO_svk_detect() {
-    local output
+    setopt localoptions noksharrays
+    local -a info
 
     check_com -c svk || return 1
     [[ -f ~/.svk/config ]] || return 1
 
-    output=$(awk '/: *$/ { sub(/^ */,"",$0); sub(/: *$/,"",$0); if (match("'${PWD}'", $0"(/|$)")) { print $0; d=1; } } /depotpath/ && d == 1 { sub(".*/","",$0); r=$0 } /revision/ && d == 1 { print r ":" $2; exit 1 }' ~/.svk/config) && return 1
-
-    printf '%s' ${output}
+    info=(
+        $(awk '
+          /: *$/ {
+            sub(/^ */,"",$0);
+            sub(/: *$/,"",$0);
+            if (match("'${PWD}'", $0"(/|$)")) {
+              print $0; d=1;
+            }
+          }
+          /depotpath/ && d == 1 {
+            sub(".*/","",$0);
+            r=$0
+          }
+          /revision/ && d == 1 {
+            print r "\n" $2;
+            exit 1
+          }' ~/.svk/config
+        )
+    ) && return 1
+
+    vcs_comm[basedir]=${info[1]}
+    vcs_comm[branch]=${info[2]}
+    vcs_comm[revision]=${info[3]}
     return 0
 }
 
@@ -1295,38 +1469,29 @@ VCS_INFO_svn_detect() {
 }
 
 # }}}
-VCS_INFO_format () { # {{{
-    local msg
-
-    if [[ -n ${1} ]] ; then
-        zstyle -s ":vcs_info:${vcs}" promptactionformat msg
-        [[ -z ${msg} ]] && msg=${VCS_INFO_default_action_format}
-    else
-        zstyle -s ":vcs_info:${vcs}" promptformat msg
-        [[ -z ${msg} ]] && msg=${VCS_INFO_default_format}
-    fi
-    printf '%s' ${msg}
-}
-# }}}
 vcs_info () { # {{{
-    local string output
+    local string
     local -i found
-    local -a VCSs
+    local -a VCSs disabled
     local -x vcs
+    local -Ax vcs_comm
 
     vcs="init"
     zstyle -T ":vcs_info:${vcs}" "enable" || return 0
+    zstyle -a ":vcs_info:${vcs}" "disable" disabled
 
-    VCSs=(git hg bzr svn svk)
+    VCSs=(git hg bzr darcs mtn svn cvs svk)
 
     (( found = 0 ))
     for vcs in ${VCSs} ; do
-        output=$(VCS_INFO_${vcs}_detect) && (( found = 1 )) && break
+        [[ -n ${(M)disabled:#${vcs}} ]] && continue
+        vcs_comm=()
+        VCS_INFO_${vcs}_detect && (( found = 1 )) && break
     done
 
     (( found == 0 )) && return 0
 
-    string=$(VCS_INFO_${vcs}_get_data ${output}) || return 1
+    string=$(VCS_INFO_${vcs}_get_data) || return 1
     printf '%s' ${string}
     return 0
 }
@@ -1340,6 +1505,7 @@ else
     # these are the same, just with a lot of colours:
     zstyle ':vcs_info:*' promptactionformat "${MAGENTA}(${NO_COLOUR}%s${MAGENTA})${YELLOW}-${MAGENTA}[${GREEN}%b${YELLOW}|${RED}%a${MAGENTA}]${NO_COLOUR} "
     zstyle ':vcs_info:*' promptformat       "${MAGENTA}(${NO_COLOUR}%s${MAGENTA})${YELLOW}-${MAGENTA}[${GREEN}%b${MAGENTA}]${NO_COLOUR}%} "
+    zstyle ':vcs_info:(svn|bzr)' branchformat "%b${YELLOW]}:%r"
 fi
 
 # }}}
@@ -2320,7 +2486,7 @@ bk() {
 # }}}
 
 # {{{ make sure our environment is clean regarding colors
-for color in BLUE RED GREEN CYAN WHITE ; unset $color
+for color in BLUE RED GREEN CYAN YELLOW MAGENTA WHITE ; unset $color
 # }}}
 
 # source another config file if present {{{