]>
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:
{
# return the name of the git branch we're on
local ref
{
# 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
+ ref=$(git --git-dir="$PWD" symbolic-ref -q HEAD 2>/dev/null \
+ || git --git-dir="$PWD" 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
output=(${(f):-"$(git diff --stat --relative 2>/dev/null)"})
if [[ ${#output} -gt 1 ]]; then
echo changes on filesystem:
local output
output=(${(f):-"$(git diff --stat --relative 2>/dev/null)"})
if [[ ${#output} -gt 1 ]]; then
echo changes on filesystem:
- print "${(F)output[1,-2] }"
+ print "${${(F)output[1,-2]}//\.\.\./… }"
fi
output=(${(f):-"$(git diff --cached --stat --relative 2>/dev/null)"})
if [[ ${#output} -gt 1 ]]; then
echo cached/staged changes:
fi
output=(${(f):-"$(git diff --cached --stat --relative 2>/dev/null)"})
if [[ ${#output} -gt 1 ]]; then
echo cached/staged changes:
- print "${(F)output[1,-2] }"
+ print "${${(F)output[1,-2]}//\.\.\./… }"
# 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
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'"
}
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