# bash_prompt; adapted from
# https://github.com/necolas/dotfiles/blob/master/shell/bash_prompt and
-# http://vitus-wagner.livejournal.com/1176589.html?thread=40146189#t40146189
+# https://github.com/git/git/blob/master/contrib/completion/git-prompt.sh
prompt_git() {
local s=""
# ensure index is up to date
#git update-index --really-refresh -q &>/dev/null
- # check for uncommitted changes in the index
- if ! $(git diff --quiet --ignore-submodules --cached); then
- s="$s+";
- fi
-
# check for unstaged changes
if [ -n "$(git ls-files --modified)" ]; then
- s="$s!";
+ s="$s*";
fi
- # check for untracked files
- if [ -n "$(git ls-files --others --exclude-standard)" ]; then
- s="$s?";
+ # check for uncommitted changes in the index
+ if ! $(git diff --quiet --ignore-submodules --cached); then
+ s="$s+";
fi
# check for stashed files
s="$s$";
fi
+ # check for untracked files
+ if [ -n "$(git ls-files --others --exclude-standard)" ]; then
+ s="$s%";
+ fi
+
fi
# get the short symbolic ref
git rev-parse --short HEAD 2> /dev/null || \
printf "(unknown)")"
- [ -n "$s" ] && s=" [$s]"
- printf "%s" "$branchName$s "
+ up=`git rev-parse --abbrev-ref @{u} 2>/dev/null`
+ if [ -n "$up" ]; then
+ local left right
+ set -- `git rev-list --count --left-right @{u}...@`
+ left=$1
+ right=$2
+ if [ "$left" -gt 0 -o "$right" -gt 0 ]; then
+ if [ "$left" -gt 0 ]; then
+ s="$s-$left"
+ fi
+ if [ "$right" -gt 0 ]; then
+ s="$s+$right"
+ fi
+ fi
+ fi
+
+ [ -n "$s" ] && s=" $s"
+ printf " (%s)" "$branchName$s"
fi
}
+#if test -x /usr/bin/git >/dev/null 2>&1; then
+# if [ "`type -t __git_ps1`" != function ]; then
+# git_sh_prompt=`git --exec-path`/git-sh-prompt
+# test -r $git_sh_prompt && . $git_sh_prompt || :
+# fi
+# if [ "`type -t __git_ps1`" = function ]; then
+# GIT_PS1_SHOWDIRTYSTATE=true
+# GIT_PS1_SHOWSTASHSTATE=true
+# GIT_PS1_SHOWUNTRACKEDFILES=true
+# GIT_PS1_SHOWUPSTREAM=verbose
+# fi
+#fi
+
set_prompts() {
OPS1=''
# display the user, host and current working directory
esac
OPS1+="${debian_chroot:+($debian_chroot)}"
- OPS1+="\`cgmem_which_prompt\`\u@\${HOSTNAME::5}:\`short_curdir\` "
- OPS1+="\$(prompt_git)"
- OPS1+="\\$"
+ OPS1+="\`cgmem_which_prompt\`\u@\${HOSTNAME::5}:\`short_curdir\`"
+ if test -x /usr/bin/git >/dev/null 2>&1; then
+ #if [ "`type -t __git_ps1`" = function ]; then
+ # OPS1+="\$(__git_ps1)"
+ #else
+ OPS1+="\$(prompt_git)"
+ #fi
+ fi
+ # This is for .screenrc: shelltitle "\$ |$SHELL"
+ #OPS1+="\[\033k\033\\\\\]"
+ OPS1+=" \$SHLVL\\$ "
+ export OPS1
}
-
-#set_prompts
-#unset set_prompts