rename latin dict function to tn and prefix auto-generated functions to prevent alias...

[etc/zsh.git] / .zsh / zshrc / 60_vcsprompt

diff --git a/.zsh/zshrc/60_vcsprompt b/.zsh/zshrc/60_vcsprompt
index 4da474a2cf33f4001dc73f2784725b369c57b7fd..d12f686c2531f618d46ce8bfd88493b5ad902ea9 100644 (file)
--- a/.zsh/zshrc/60_vcsprompt
+++ b/.zsh/zshrc/60_vcsprompt
@@ -5,7 +5,7 @@
 # Copyright © 1994–2008 martin f. krafft <madduck@madduck.net>
 # Released under the terms of the Artistic Licence 2.0
 #
 # Copyright © 1994–2008 martin f. krafft <madduck@madduck.net>
 # Released under the terms of the Artistic Licence 2.0
 #

-# Source repository: http://git.madduck.net/v/etc/zsh.git
+# Source repository: git://git.madduck.net/etc/zsh.git

 #
 # Shamelessly based on http://glandium.org/blog/?p=170
 #
 #
 # Shamelessly based on http://glandium.org/blog/?p=170
 #


@@ -32,6 +32,21 @@ __git_get_branch()
   echo "${ref#refs/heads/}"
 }
 
   echo "${ref#refs/heads/}"
 }
 

+__git_print_preprompt()
+{
+  local output
+  output=(${(f):-"$(git diff --stat --relative 2>/dev/null)"})
+  if [[ ${#output} -gt 1 ]]; then
+    echo changes on filesystem:
+    print "${${(F)output[1,-2]}//\.\.\./…}"
+  fi
+  output=(${(f):-"$(git diff --cached --stat --relative 2>/dev/null)"})
+  if [[ ${#output} -gt 1 ]]; then
+    echo cached/staged changes:
+    print "${${(F)output[1,-2]}//\.\.\./…}"
+  fi
+}
+

 __hg_get_reporoot()
 {
   hg root
 __hg_get_reporoot()
 {
   hg root


@@ -70,6 +85,7 @@ __vcs_get_repo_type()
   local dir
   while true; do
     [ -d ${dir}.git ] && echo git && break
   local dir
   while true; do
     [ -d ${dir}.git ] && echo git && break

+    [ -d "$GIT_DIR" ] && echo git && break

     [ -d ${dir}.bzr ] && echo bzr && break
     [ -d ${dir}.hg ] && echo hg && break
     [ "$(readlink -f ${dir:-.})" = / ] && echo NONE && break
     [ -d ${dir}.bzr ] && echo bzr && break
     [ -d ${dir}.hg ] && echo hg && break
     [ "$(readlink -f ${dir:-.})" = / ] && echo NONE && break


@@ -84,8 +100,7 @@ __vcs_get_prompt_path_components()
 
   # shortcut: if there are no arguments, return a default prompt
   if [ -z "${1:-}" ]; then
 
   # shortcut: if there are no arguments, return a default prompt
   if [ -z "${1:-}" ]; then

-    pwdnamed="%${_PROMPT_PATH_MAXLEN}<..<%~%<<"
-    pwdnamed="${(%)pwdnamed}"
+    pwdnamed="${(%):-%${_PROMPT_PATH_MAXLEN}<…<%~%<<}"

     echo "$pwdnamed"
     return
   fi
     echo "$pwdnamed"
     return
   fi


@@ -96,8 +111,8 @@ __vcs_get_prompt_path_components()
 
   # replace named directories in the PWD, we need thi for the proper component
   # count later
 
   # replace named directories in the PWD, we need thi for the proper component
   # count later

-  local pwdnamed="%~"
-  pwdnamed="${(%)pwdnamed}"
+  local pwdnamed
+  pwdnamed="${(%):-%~}"

 
   # store paths in arrays for component count calculation
   typeset -la apwd apwdnamed areporoot
 
   # store paths in arrays for component count calculation
   typeset -la apwd apwdnamed areporoot


@@ -114,10 +129,7 @@ __vcs_get_prompt_path_components()
   precomps=$(($#apwdnamed - $postcomps))
 
   local postfix
   precomps=$(($#apwdnamed - $postcomps))
 
   local postfix

-  if (( $postcomps > 0 )); then
-    postfix="%${postcomps}~"
-    postfix="${(%)postfix}"
-  fi
+  (( $postcomps > 0 )) && postfix="${(%):-%${postcomps}~}"

 
   # we don't want the prompt to get too long, so keep the total prompt length
   # under $_PROMPT_PATH_MAXLEN (25), but ensure that the prefix is not shorter
 
   # we don't want the prompt to get too long, so keep the total prompt length
   # under $_PROMPT_PATH_MAXLEN (25), but ensure that the prefix is not shorter


@@ -126,10 +138,9 @@ __vcs_get_prompt_path_components()
   prelen=$((${_PROMPT_PATH_MAXLEN:-25} - $#branch - $#postfix))
   minlen=${_PROMPT_PATH_MINLEN:-10}
   (( $prelen < $minlen )) && prelen=$minlen
   prelen=$((${_PROMPT_PATH_MAXLEN:-25} - $#branch - $#postfix))
   minlen=${_PROMPT_PATH_MINLEN:-10}
   (( $prelen < $minlen )) && prelen=$minlen

-  prefix="%${prelen}<..<%-${precomps}~%<<"
-  prefix="${(%)prefix}"
+  prefix="${(%):-%${prelen}<…<%-${precomps}~%<<}"

 
 

-  echo "$prefix" "$branch" "$postfix"
+  echo "'$prefix'" "'$branch'" "'$postfix'"

 }
 
 __vcs_set_prompt_variables()
 }
 
 __vcs_set_prompt_variables()


@@ -144,30 +155,34 @@ __vcs_set_prompt_variables()
         { error "could not determine git repository root"; return 1 }
       branch="$(__git_get_branch)" ||
         { error "could not determine git branch"; return 1 }
         { error "could not determine git repository root"; return 1 }
       branch="$(__git_get_branch)" ||
         { error "could not determine git branch"; return 1 }

-      set -- $(__vcs_get_prompt_path_components "$reporoot" "$branch")
-      [ -d "$GIT_DIR" ] && set -- "$GIT_DIR" "$2" "$1"
-      set +x
+      eval set -- $(__vcs_get_prompt_path_components "$reporoot" "$branch")
+      if [ -d "$GIT_DIR" ]; then
+        # poor man's replace until I find out how to do named dirs properly
+        # here:
+        local _D="${GIT_DIR/$HOME/~}"
+        set -- "$_D" "$2" "${${1#$_D}%/}"
+      fi

       ;;
     hg)
       reporoot="$(__hg_get_reporoot)" ||
         { error "could not determine hg repository root"; return 1 }
       branch="$(__hg_get_branch)" ||
         { error "could not determine hg branch"; return 1 }
       ;;
     hg)
       reporoot="$(__hg_get_reporoot)" ||
         { error "could not determine hg repository root"; return 1 }
       branch="$(__hg_get_branch)" ||
         { error "could not determine hg branch"; return 1 }

-      set -- $(__vcs_get_prompt_path_components "$reporoot" "$branch")
+      eval set -- $(__vcs_get_prompt_path_components "$reporoot" "$branch")

       ;;
     bzr)
       reporoot="$(__bzr_get_reporoot)" ||
         { error "could not determine bzr repository root"; return 1 }
       branch="$(__bzr_get_branch)" ||
         { error "could not determine bzr branch"; return 1 }
       ;;
     bzr)
       reporoot="$(__bzr_get_reporoot)" ||
         { error "could not determine bzr repository root"; return 1 }
       branch="$(__bzr_get_branch)" ||
         { error "could not determine bzr branch"; return 1 }

-      set -- $(__vcs_get_prompt_path_components "$reporoot" "$branch")
+      eval set -- $(__vcs_get_prompt_path_components "$reporoot" "$branch")

       ;;
     *)
       case "$repotype" in
         NONE) :;;
         *) warn "$repotype repositories not (yet) supported in the prompt";;
       esac
       ;;
     *)
       case "$repotype" in
         NONE) :;;
         *) warn "$repotype repositories not (yet) supported in the prompt";;
       esac

-      local p="%${MAXLEN}<..<%~%<<"
+      local p="%${MAXLEN}<…<%~%<<"

       #TODO find a better way so we don't have to nuke $psvar, but since the
       #     %(nv.true.false) check for prompts checks element count, not
       #     content, that's all we get for now
       #TODO find a better way so we don't have to nuke $psvar, but since the
       #     %(nv.true.false) check for prompts checks element count, not
       #     content, that's all we get for now


@@ -175,9 +190,19 @@ __vcs_set_prompt_variables()
       return
   esac
 
       return
   esac
 

-  psvar[1]="$1"
-  psvar[2]="$2"
-  psvar[3]="$3"
+  psvar[1,3]=($1 $2 $3)
+}
+
+__vcs_print_preprompt()
+{
+  local reporoot
+  repotype="${1:-$(__vcs_get_repo_type)}"
+
+  case "$repotype" in
+    git)
+      __git_print_preprompt
+      ;;
+  esac

 }
 
 if ! is_root; then
 }
 
 if ! is_root; then


@@ -197,6 +222,11 @@ if ! is_root; then
   }
   chpwd_functions+=_update_vcs_prompt_vars
 
   }
   chpwd_functions+=_update_vcs_prompt_vars
 

+  _print_preprompt() {
+    [[ $? -eq 0 ]] && __vcs_print_preprompt
+  }
+  precmd_functions+=_print_preprompt
+

   # call it once
   _update_vcs_prompt_vars
 fi
   # call it once
   _update_vcs_prompt_vars
 fi