]> git.madduck.net Git - etc/zsh.git/blobdiff - .zsh/zshrc/60_vcsprompt

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

ls -rt on chdir()
[etc/zsh.git] / .zsh / zshrc / 60_vcsprompt
index a99ca184abf9d869868f29528d71edd349c5edb6..9fa0f44e4a458852e7d636f316562eaa0d898e5c 100644 (file)
@@ -1,4 +1,4 @@
-# zshrc/85_git_prompt
+# zshrc/60_vcsprompt
 #
 # Make git information available to the prompt
 #
@@ -13,6 +13,7 @@
 __git_get_reporoot()
 {
   # 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
@@ -69,6 +70,7 @@ __vcs_get_repo_type()
   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
@@ -83,8 +85,7 @@ __vcs_get_prompt_path_components()
 
   # 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
@@ -95,8 +96,8 @@ __vcs_get_prompt_path_components()
 
   # 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
@@ -113,10 +114,7 @@ __vcs_get_prompt_path_components()
   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
@@ -125,10 +123,9 @@ __vcs_get_prompt_path_components()
   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()
@@ -143,18 +140,27 @@ __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 }
+      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 }
+      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 }
+      eval set -- $(__vcs_get_prompt_path_components "$reporoot" "$branch")
       ;;
     *)
       case "$repotype" in
@@ -169,10 +175,7 @@ __vcs_set_prompt_variables()
       return
   esac
 
-  set -- $(__vcs_get_prompt_path_components "$reporoot" "$branch")
-  psvar[1]="$1"
-  psvar[2]="$2"
-  psvar[3]="$3"
+  psvar[1,3]=($1 $2 $3)
 }
 
 if ! is_root; then