X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=etc%2Fzsh%2Fzshrc;h=b8353a60413fb0a84153bdebdc5c11d74e891237;hb=d1fdc0c489ee9c9bc0e33380458e3cbdc97b6066;hp=2e601190dfc8314640fe4f5f7c5875166d47828e;hpb=42234f351bf117030b3eddbe34da5a094b194ced;p=grml-etc-core.git

diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc
index 2e60119..b8353a6 100644
--- a/etc/zsh/zshrc
+++ b/etc/zsh/zshrc
@@ -3,7 +3,7 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Sam Mai 17 22:52:34 CEST 2008 [mika]
+# Latest change: Wed Aug 06 23:50:53 CEST 2008 [mika]
 ################################################################################
 # This file is sourced only for interactive shells. It
 # should contain commands to set up aliases, functions,
@@ -1010,69 +1010,311 @@ if [[ -n "$BATTERY" ]] ; then
 fi
 # }}}
 
-# display version control information on right side of prompt if $VCS is set {{{
-# based on Mike Hommey's http://web.glandium.org/blog/?p=170
-__vcs_dir() {
-    local vcs base_dir sub_dir ref
+# gather version control information for inclusion in a prompt {{{
 
-    sub_dir() {
-      local sub_dir
-      sub_dir=$(readlink -f "${PWD}")
-      sub_dir=${sub_dir#$1}
-      echo ${sub_dir#/}
-    }
+# vcs_info() documentation: {{{
+#
+# 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
+#
+#   You can of course use ':vcs_info:*' to match all VCSs at once.
+#
+# There is one special context named 'init', that is in effect as long
+# as there was no decision what vcs backend to use.
+#
+# There are currently two styles, that are looked up:
+#   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,
+#                         vcs_info() will do nothing.
+#
+# The default values for these in all contexts are:
+#   promptformat        " (%s)-[%b|%a]-"
+#   promptactionformat  " (%s)-[%b]-"
+#   enable              true
+#
+# In these 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.
+#         Only makes sense in promptactionformat.
+#   %R  - base directory of the repository.
+#   %r  - repository name
+#         If %R is '/foo/bar/repoXY', %r is 'repoXY'.
+#
+# 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.
+#
+#   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_realpath () { #{{{
+    # replacing 'readlink -f', which is really not portable.
+    (( ${+functions[chpwd]} )) && unfunction chpwd
+    setopt chaselinks
+    cd $1 2>/dev/null && pwd
+}
+# }}}
+VCS_INFO_git_getaction () { #{{{
+    local gitaction='' gitdir=${1}
+    local tmp
+
+    for tmp in "${gitdir}/rebase-apply" \
+               "${gitdir}/rebase"       \
+               "${gitdir}/../.dotest" ; do
+        if [[ -d ${tmp} ]] ; then
+            if   [[ -f "${tmp}/rebasing" ]] ; then
+                gitaction="rebase"
+            elif [[ -f "${tmp}/applying" ]] ; then
+                gitaction="am"
+            else
+                gitaction="am/rebase"
+            fi
+            print '%s' ${gitaction}
+            return 0
+        fi
+    done
 
-    git_dir() {
-      base_dir=$(git-rev-parse --show-cdup 2>/dev/null) || return 1
-      base_dir=$(readlink -f "$base_dir/..")
-      sub_dir=$(git-rev-parse --show-prefix)
-      sub_dir=${sub_dir%/}
-      ref=$(git-symbolic-ref -q HEAD || git-name-rev --name-only HEAD 2>/dev/null)
-      ref=${ref#refs/heads/}
-      vcs="git"
-    }
+    for tmp in "${gitdir}/rebase-merge/interactive" \
+               "${gitdir}/.dotest-merge/interactive" ; do
+        if [[ -f "${tmp}" ]] ; then
+            printf '%s' "rebase-i"
+            return 0
+        fi
+    done
 
-    svn_dir() {
-      [[ -d ".svn" ]] || return 1
-      base_dir="."
-      while [[ -d "$base_dir/../.svn" ]]; do base_dir="$base_dir/.."; done
-      base_dir=$(readlink -f "$base_dir")
-      sub_dir=$(sub_dir "${base_dir}")
-      ref=$(svn info "$base_dir" | awk '/^URL/ { sub(".*/","",$0); r=$0 } /^Revision/ { sub("[^0-9]*","",$0); print r":"$0 }')
-      vcs="svn"
-    }
+    for tmp in "${gitdir}/rebase-merge" \
+               "${gitdir}/.dotest-merge" ; do
+        if [[ -d "${tmp}" ]] ; then
+            printf '%s' "rebase-m"
+            return 0
+        fi
+    done
+
+    if [[ -f "${gitdir}/MERGE_HEAD" ]] ; then
+        printf '%s' "merge"
+    else
+        if [[ -f "${gitdir}/BISECT_LOG" ]] ; then
+            printf '%s' "bisect"
+        fi
+    fi
+
+    return 1
+}
+# }}}
+VCS_INFO_git_getbranch () { #{{{
+    local gitbranch gitdir=${1}
+    local gitsymref='git symbolic-ref HEAD'
+
+    if    [[ -d "${gitdir}/rebase-apply" ]] \
+       || [[ -d "${gitdir}/rebase" ]]       \
+       || [[ -d "${gitdir}/../.dotest" ]]   \
+       || [[ -f "${gitdir}/MERGE_HEAD" ]] ; then
+        gitbranch="$(${(z)gitsymref} 2> /dev/null)"
+
+    elif   [[ -f "${gitdir}/rebase-merge/interactive" ]] \
+        || [[ -d "${gitdir}/rebase-merge" ]] ; then
+        gitbranch="$(< ${gitdir}/rebase-merge/head-name)"
+
+    elif   [[ -f "${gitdir}/.dotest-merge/interactive" ]] \
+        || [[ -d "${gitdir}/.dotest-merge" ]] ; then
+        gitbranch="$(< ${gitdir}/.dotest-merge/head-name)"
+
+    else
+        gitbranch="$(${(z)gitsymref} 2> /dev/null)"
+
+        if [[ $? -ne 0 ]] ; then
+            gitbranch="$(git describe --exact-match HEAD 2>/dev/null)"
+
+            if [[ $? -ne 0 ]] ; then
+                gitbranch="${${"$(< $gitdir/HEAD)"}[1,7]}..."
+            fi
+        fi
+    fi
+
+    printf '%s' "${gitbranch##refs/heads/}"
+}
+# }}}
+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
+
+    if [[ -z ${gitdir} ]] || [[ -z ${gitbranch} ]] ; then
+        return
+    fi
+
+    gitaction="$(VCS_INFO_git_getaction ${gitdir})"
+    msg=$(VCS_INFO_format ${gitaction})
+
+    gitbase=${PWD%/${$(git rev-parse --show-prefix)%/##}}
+
+    zformat -f msg "${msg}" "a:${gitaction}" "b:${gitbranch}" "s:${vcs}" "r:${gitbase:t}" "R:${gitbase}"
+    printf '%s' ${msg}
+}
+# }}}
+VCS_INFO_hg_get_data () { # {{{
+    local msg hgbranch hgbase
+
+    hgbase=${1}
+    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_svk_get_data () { # {{{
+    local msg svkbranch svkbase
 
-    svk_dir() {
-        [[ -f ~/.svk/config ]] || return 1
-        base_dir=$(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
-        ref=${base_dir##*
+    svkbase=${1}
+    svkbranch=${svkbase##*
   }
-        base_dir=${base_dir%%
+    svkbase=${svkbase%%
   *}
-        sub_dir=$(sub_dir "${base_dir}")
-        vcs="svk"
-    }
 
-    hg_dir() {
-        base_dir="."
-        while [[ ! -d "$base_dir/.hg" ]]; do
-            base_dir="$base_dir/.."
-            [[ $(readlink -f "${base_dir}") = "/" ]] && return 1
-        done
-        base_dir=$(readlink -f "$base_dir")
-        sub_dir=$(sub_dir "${base_dir}")
-        ref=$(< "${base_dir}/.hg/branch")
-        vcs="hg"
-    }
+    msg=$(VCS_INFO_format)
+    zformat -f msg "${msg}" "a:" "b:${svkbranch}" "s:${vcs}" "r:${svkbase:t}" "R:${svkbase}"
+    printf '%s' ${msg}
+}
+# }}}
+VCS_INFO_svn_get_data () { # {{{
+    local msg svnbranch svnbase
+
+    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 }')
+
+    msg=$(VCS_INFO_format)
+    zformat -f msg "${msg}" "a:" "b:${svnbranch}" "s:${vcs}" "r:${svnbase:t}" "R:${svnbase}"
+    printf '%s' ${msg}
+}
+# }}}
+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
+
+    bzr version-info | while read i j; do
+        case "${i}" in
+            revno:)
+                bzrrevno=${j} ;;
+            branch-nick:)
+                bzrbranch=${j} ;;
+        esac
+    done
+
+    msg=$(VCS_INFO_format)
+    zformat -f msg "${msg}" "a:" "b:${bzrbranch}:${bzrrevno}" "s:${vcs}" "r:${bzrbase:t}" "R:${bzrbase}"
+    printf '%s' ${msg}
+}
+# }}}
+# VCS_INFO_*_detect () {{{
+
+VCS_INFO_bzr_detect() {
+    check_com -c bzr || return 1
+    [[ -d ".bzr" ]] && return 0
+    return 1
+}
+
+VCS_INFO_git_detect() {
+    check_com -c git && git rev-parse --is-inside-work-tree &> /dev/null && return 0
+    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
+
+    printf '%s' $(VCS_INFO_realpath ${basedir})
+    return 0
+}
+
+VCS_INFO_svk_detect() {
+    local output
+
+    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
 
-    hg_dir  ||
-    git_dir ||
-    svn_dir ||
-    svk_dir # ||
-  #  base_dir="$PWD"
-  #  echo "${vcs:+($vcs)}${base_dir/$HOME/~}${vcs:+[$ref]${sub_dir}}"
-    echo "${vcs:+($vcs)}${base_dir}${vcs:+[$ref]${sub_dir}}"
+    printf '%s' ${output}
+    return 0
+}
+
+VCS_INFO_svn_detect() {
+    check_com -c svn || return 1
+    [[ -d ".svn" ]] && return 0
+    return 1
 }
+
+# }}}
+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 -i found
+    local -a VCSs
+    local -x vcs
+
+    vcs="init"
+    zstyle -T ":vcs_info:${vcs}" "enable" || return 0
+
+    VCSs=(git hg bzr svn svk)
+
+    (( found = 0 ))
+    for vcs in ${VCSs} ; do
+        output=$(VCS_INFO_${vcs}_detect) && (( found = 1 )) && break
+    done
+
+    (( found == 0 )) && return 0
+
+    string=$(VCS_INFO_${vcs}_get_data ${output}) || return 1
+    printf '%s' ${string}
+    return 0
+}
+# }}}
+
+# change vcs_info formats for the grml prompt
+zstyle ':vcs_info:*' promptactionformat \
+"%{${fg[magenta]}%}(%{${reset_color}%}%s%{${fg[magenta]}%})%{${fg[yellow]}%}-%{${fg[magenta]}%}[%{${fg[green]}%}%b%{${fg[yellow]}%}|%{${fg[red]}%}%a%{${fg[magenta]}%}]%{${reset_color}%} "
+zstyle ':vcs_info:*' promptformat \
+"%{${fg[magenta]}%}(%{${reset_color}%}%s%{${fg[magenta]}%})%{${fg[yellow]}%}-%{${fg[magenta]}%}[%{${fg[green]}%}%b%{${fg[magenta]}%}]%{${reset_color}%} "
+
 # }}}
 
 # {{{ set prompt
@@ -1103,8 +1345,6 @@ is4 && [[ -z $NOPRECMD ]] && precmd () {
         if [[ -n $BATTERY ]] ; then
             RPROMPT="%(?..:()% ${PERCENT}${SCREENTITLE}"
             # RPROMPT="${PERCENT}${SCREENTITLE}"
-        elif [[ -n $VCS ]] ; then
-            RPROMPT="%(?..:()% $(__vcs_dir)${SCREENTITLE}"
         else
             RPROMPT="%(?..:()% ${SCREENTITLE}"
             # RPROMPT="${SCREENTITLE}"
@@ -1570,6 +1810,9 @@ grmlcomp() {
     # Ignore completion functions for commands you don't have:
     zstyle ':completion::(^approximate*):*:functions' ignored-patterns '_*'
 
+    # Provide more processes in completion of programs like killall:
+    zstyle ':completion:*:processes-names' command 'ps c -u ${USER} -o command | uniq'
+
     # complete manual by their section
     zstyle ':completion:*:manuals'    separate-sections true
     zstyle ':completion:*:manuals.*'  insert-sections   true
@@ -1605,6 +1848,9 @@ grmlcomp() {
     # zstyle ':completion:*' completer _complete _correct _approximate
     # zstyle ':completion:*' expand prefix suffix
 
+    # complete shell aliases
+    # zstyle ':completion:*' completer _expand_alias _complete _approximate
+
     # command for process lists, the local web server details and host completion
     zstyle ':completion:*:urls' local 'www' '/var/www/' 'public_html'