ignore .zwc.old files

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

diff --git a/.zsh/zshrc/60_vcsprompt b/.zsh/zshrc/60_vcsprompt
index 4da474a2cf33f4001dc73f2784725b369c57b7fd..2a672be6a5882a3c86b90403525d8d30b6e7044f 100644 (file)
--- a/.zsh/zshrc/60_vcsprompt
+++ b/.zsh/zshrc/60_vcsprompt
@@ -129,7 +129,7 @@ __vcs_get_prompt_path_components()
   prefix="%${prelen}<..<%-${precomps}~%<<"
   prefix="${(%)prefix}"
 
   prefix="%${prelen}<..<%-${precomps}~%<<"
   prefix="${(%)prefix}"
 

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

 }
 
 __vcs_set_prompt_variables()
 }
 
 __vcs_set_prompt_variables()


@@ -144,23 +144,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 }

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

       [ -d "$GIT_DIR" ] && set -- "$GIT_DIR" "$2" "$1"
       [ -d "$GIT_DIR" ] && set -- "$GIT_DIR" "$2" "$1"

-      set +x

       ;;
     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
       ;;
     *)
       case "$repotype" in