XorA
/
bash-it
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve ref detection in git prompt

pull/559/head
Eduardo Bellido Bellido 2015-09-05 02:12:38 +02:00
parent 670e7b1dcc
commit 86fd5cd5c4
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
themes/base.theme.bash
View File

@ -10,8 +10,7 @@ SCM_THEME_PROMPT_PREFIX=' |'
SCM_THEME_PROMPT_SUFFIX='|' SCM_THEME_PROMPT_SUFFIX='|'
SCM_THEME_BRANCH_PREFIX='' SCM_THEME_BRANCH_PREFIX=''
SCM_THEME_TAG_PREFIX='tag:' SCM_THEME_TAG_PREFIX='tag:'
SCM_THEME_COMMIT_PREFIX='commit:' SCM_THEME_DETACHED_PREFIX='detached:'
SCM_THEME_REMOTE_PREFIX=''
CLOCK_CHAR='☆' CLOCK_CHAR='☆'
THEME_CLOCK_CHECK=${THEME_CLOCK_CHECK:=true} THEME_CLOCK_CHECK=${THEME_CLOCK_CHECK:=true}
@ -107,6 +106,8 @@ function git_prompt_vars {
fi fi
fi fi
SCM_CHANGE=$(git rev-parse --short HEAD 2>/dev/null)
local ref=$(git symbolic-ref -q HEAD 2> /dev/null) local ref=$(git symbolic-ref -q HEAD 2> /dev/null)
if [[ -n "$ref" ]]; then if [[ -n "$ref" ]]; then
SCM_BRANCH=${SCM_THEME_BRANCH_PREFIX}${ref#refs/heads/} SCM_BRANCH=${SCM_THEME_BRANCH_PREFIX}${ref#refs/heads/}
@ -115,15 +116,19 @@ function git_prompt_vars {
if [[ -n "$ref" ]]; then if [[ -n "$ref" ]]; then
SCM_BRANCH=${SCM_THEME_TAG_PREFIX}${ref} SCM_BRANCH=${SCM_THEME_TAG_PREFIX}${ref}
else else
local commit_re='(^remotes/)?(.+-g[a-zA-Z0-9]+)$' ref=$(git describe --contains --all HEAD 2> /dev/null)
local remote_re='^remotes/(.+)$' if [[ -n "$ref" ]]; then
ref=$(git describe --tags --all --always 2> /dev/null) local remote_re='^remotes/(.+)$'
if [[ "$ref" =~ ${commit_re} ]]; then if [[ "$ref" =~ ${remote_re} ]]; then
SCM_BRANCH=${SCM_THEME_COMMIT_PREFIX}${BASH_REMATCH[2]} SCM_BRANCH=${SCM_THEME_DETACHED_PREFIX}${BASH_REMATCH[1]}
elif [[ "$ref" =~ ${remote_re} ]]; then else
SCM_BRANCH=${SCM_THEME_REMOTE_PREFIX}${BASH_REMATCH[1]} SCM_BRANCH=${SCM_THEME_DETACHED_PREFIX}${ref}
fi
fi fi
fi fi
if [[ -z "$ref" ]]; then
SCM_BRANCH=${SCM_THEME_DETACHED_PREFIX}${SCM_CHANGE}
fi
fi fi
local ahead_re='.+ahead ([0-9]+).+' local ahead_re='.+ahead ([0-9]+).+'
@ -138,7 +143,6 @@ function git_prompt_vars {
SCM_PREFIX=${GIT_THEME_PROMPT_PREFIX:-$SCM_THEME_PROMPT_PREFIX} SCM_PREFIX=${GIT_THEME_PROMPT_PREFIX:-$SCM_THEME_PROMPT_PREFIX}
SCM_SUFFIX=${GIT_THEME_PROMPT_SUFFIX:-$SCM_THEME_PROMPT_SUFFIX} SCM_SUFFIX=${GIT_THEME_PROMPT_SUFFIX:-$SCM_THEME_PROMPT_SUFFIX}
SCM_CHANGE=$(git rev-parse HEAD 2>/dev/null)
} }
function svn_prompt_vars { function svn_prompt_vars {