X-Git-Url: https://git.madduck.net/etc/zsh.git/blobdiff_plain/c853fda54db5336befa027b4fe90f3b6b665c31e..386bc889f8ab9ee182381b5009b3ddf8c93344cf:/.zsh/zshrc/60_vcsprompt?ds=sidebyside diff --git a/.zsh/zshrc/60_vcsprompt b/.zsh/zshrc/60_vcsprompt index 9513f6a..9c23a0b 100644 --- a/.zsh/zshrc/60_vcsprompt +++ b/.zsh/zshrc/60_vcsprompt @@ -158,14 +158,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 } - eval set -- $(__vcs_get_prompt_path_components "$reporoot" "$branch") if [ -n "$VCSH_REPO_NAME" ]; then - set -- "vcsh/$VCSH_REPO_NAME" "$2" "$3" - elif [ -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 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)