remove ssh stuff (goes to ssh repo)

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

diff --git a/.zsh/zshrc/60_vcsprompt b/.zsh/zshrc/60_vcsprompt
index a99ca184abf9d869868f29528d71edd349c5edb6..f9c440b7db0ad5a73e4fc64258e3c52fca61b48a 100644 (file)
--- a/.zsh/zshrc/60_vcsprompt
+++ b/.zsh/zshrc/60_vcsprompt
@@ -1,4 +1,4 @@
-# zshrc/85_git_prompt
+# zshrc/60_vcsprompt

 #
 # Make git information available to the prompt
 #
 #
 # 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
 __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
   local relroot
   relroot="$(git rev-parse --show-cdup 2>/dev/null)" || return 1
   if [ -n "$relroot" ]; then


@@ -83,8 +84,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


@@ -95,8 +95,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


@@ -113,10 +113,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


@@ -125,10 +122,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()


@@ -143,18 +139,22 @@ __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")
+      [ -d "$GIT_DIR" ] && set -- "$GIT_DIR" "$2" "$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 }
       ;;
     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 }
       ;;
     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
       ;;
     *)
       case "$repotype" in


@@ -169,10 +169,7 @@ __vcs_set_prompt_variables()
       return
   esac
 
       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
 }
 
 if ! is_root; then