make grep skip fifos/sockets

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

diff --git a/.zsh/zshrc/60_vcsprompt b/.zsh/zshrc/60_vcsprompt
index d8fdaeacdd05c4c2a3178e66d614244a77941c47..b7cc3b98b9beb33bc87316033e81964f94ed6a9a 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
 #


@@ -14,36 +14,35 @@ __git_get_reporoot()
 {
   # return the full path to the root of the current git repository
   [ -d "$GIT_DIR" ] && echo "$GIT_DIR" && return 0
 {
   # return the full path to the root of the current git repository
   [ -d "$GIT_DIR" ] && echo "$GIT_DIR" && return 0

-  local relroot
-  relroot="$(git rev-parse --show-cdup 2>/dev/null)" || return 1
-  if [ -n "$relroot" ]; then
-    readlink -f "$relroot"
-  else
-    echo $PWD
-  fi
+  local dir; dir="$PWD/$(git rev-parse --show-cdup)"
+  # do not use --show-toplevel because it resolves symlinks
+  echo $dir:a

 }
 
 __git_get_branch()
 {
   # return the name of the git branch we're on
 }
 
 __git_get_branch()
 {
   # return the name of the git branch we're on

-  local ref
-  ref=$(git symbolic-ref -q HEAD 2>/dev/null \
-     || git-name-rev --name-only HEAD 2>/dev/null) || return 1
+  local ref gitdir
+  gitdir="$(git rev-parse --git-dir)"
+  ref=$(git --git-dir="$gitdir" symbolic-ref -q HEAD 2>/dev/null \
+     || git --git-dir="$gitdir" name-rev --name-only HEAD 2>/dev/null) || return 1

   echo "${ref#refs/heads/}"
 }
 
 __git_print_preprompt()
 {
   echo "${ref#refs/heads/}"
 }
 
 __git_print_preprompt()
 {

+  [ "$(git config --get core.bare)" = false ] || return
+

   local output
   local output

-  output=(${(f):-"$(git diff --stat --relative)"})
+  output=(${(f):-"$(git diff --stat --relative 2>/dev/null)"})

   if [[ ${#output} -gt 1 ]]; then
     echo changes on filesystem:
   if [[ ${#output} -gt 1 ]]; then
     echo changes on filesystem:

-    print "${(F)output[1,-2]}"
+    print "${${(F)output[1,-2]}//\.\.\./…}"

   fi
   fi

-  output=(${(f):-"$(git diff --cached --stat --relative)"})
+  output=(${(f):-"$(git diff --cached --stat --relative 2>/dev/null)"})

   if [[ ${#output} -gt 1 ]]; then
     echo cached/staged changes:
   if [[ ${#output} -gt 1 ]]; then
     echo cached/staged changes:

-    print "${(F)output[1,-2]}"
+    print "${${(F)output[1,-2]}//\.\.\./…}"

   fi
 }
 
   fi
 }
 


@@ -100,7 +99,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="${(%):-%${_PROMPT_PATH_MAXLEN}<…<%~%<<}"

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


@@ -138,7 +137,7 @@ __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="${(%):-%${prelen}<…<%-${precomps}~%<<}"

 
   echo "'$prefix'" "'$branch'" "'$postfix'"
 }
 
   echo "'$prefix'" "'$branch'" "'$postfix'"
 }


@@ -155,12 +154,19 @@ __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 }

-      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}%/}"
+      if [ -n "$VCSH_REPO_NAME" ]; then
+        # if vcsh is used to get a subshell, then the repo root is the home
+        # directory, but we want to indicate the vcsh context too:
+        eval set -- $(__vcs_get_prompt_path_components "$HOME" "$branch")
+        set -- "vcsh:$VCSH_REPO_NAME" "$2" "$3"
+      else
+        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

       fi
       ;;
     hg)
       fi
       ;;
     hg)


@@ -182,7 +188,7 @@ __vcs_set_prompt_variables()
         NONE) :;;
         *) warn "$repotype repositories not (yet) supported in the prompt";;
       esac
         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