stonewareslord/lpr
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #58 from dolmen/fix/optimize-SCM

Browse Source 
Optimizations for Subversion and Mercurial
This commit is contained in:
nojhan 2012-08-21 13:00:28 -07:00
commit fc89cbc136
1 changed files with 22 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
liquidprompt
View File

@ -188,6 +188,7 @@ LP_PATH_LENGTH=${LP_PATH_LENGTH:-35}
LP_PATH_KEEP=${LP_PATH_KEEP:-2} LP_PATH_KEEP=${LP_PATH_KEEP:-2}
LP_HOSTNAME_ALWAYS=${LP_HOSTNAME_ALWAYS:-0} LP_HOSTNAME_ALWAYS=${LP_HOSTNAME_ALWAYS:-0}
LP_PS1=${LP_PS1:-""} LP_PS1=${LP_PS1:-""}
LP_SVN_STATUS_OPTS=${LP_SVN_STATUS_OPTS:---depth=immediates}
LP_ENABLE_PERM=${LP_ENABLE_PERM:-1} LP_ENABLE_PERM=${LP_ENABLE_PERM:-1}
LP_ENABLE_SHORTEN_PATH=${LP_ENABLE_SHORTEN_PATH:-1} LP_ENABLE_SHORTEN_PATH=${LP_ENABLE_SHORTEN_PATH:-1}
@ -626,9 +627,7 @@ _lp_hg_branch()
local branch local branch
branch="$(hg branch 2>/dev/null)" branch="$(hg branch 2>/dev/null)"
if [[ $? -eq 0 ]] && [[ ! -z "$(hg branch)" ]] ; then [[ $? -eq 0 ]] && echo "$branch"
echo -n "$(hg branch)"
fi
} }
# Set a color depending on the branch state: # Set a color depending on the branch state:
@ -658,48 +657,40 @@ _lp_hg_branch_color()
# For the first level of the repository, gives the repository name # For the first level of the repository, gives the repository name
_lp_svn_branch() _lp_svn_branch()
{ {
[[ "$LP_ENABLE_SVN" != 1 ]] && return [[ "$LP_ENABLE_SVN" != 1 || ! -d '.svn' ]] && return
local root
local infos local url
local ret eval $(LANG=C LC_ALL=C svn info 2>/dev/null | sed -n 's/^URL: \(.*\)/url="\1"/p;s/^Repository Root: \(.*\)/root="\1"/p' )
infos=$(svn info --xml 2>/dev/null) # Make url relative to root
ret=$? url="${url:${#root}}"
if [[ $ret -eq 0 ]] ; then if [[ "$url" == */trunk* ]] ; then
local root echo trunk
root=$(echo "$infos" | awk -v FS=">|</" '/^<root>/ { print $2 }') else
local subrep expr "$url" : '.*/branches/\([^/]*\)' || expr "$url" : '/\([^/]*\)' || basename "$root"
subrep=$(echo "$infos" | awk -v FS=">|</" '/^<url>/ { print $2 }')
if [[ "$subrep" == *"url>"* ]] ; then
echo -n $root
else
local branch
branch=$(basename $subrep)
echo -n $branch
fi
fi fi
} }
# Set a color depending on the branch state: # Set a color depending on the branch state:
# - green if the repository is up to date # - green if the repository is clean
# (use $LP_SVN_STATUS_OPTS to define what that means with
# the --depth option of 'svn status')
# - red if there is changes to commit # - red if there is changes to commit
# Note that, due to subversion way of managing changes, # Note that, due to subversion way of managing changes,
# informations are only displayed for the CURRENT directory. # informations are only displayed for the CURRENT directory.
_lp_svn_branch_color() _lp_svn_branch_color()
{ {
[[ "$LP_ENABLE_SVN" != 1 ]] && return [[ "$LP_ENABLE_SVN" != 1 || ! -d .svn ]] && return
local branch local branch
branch=$(_lp_svn_branch) branch="$(_lp_svn_branch)"
if [[ ! -z "$branch" ]] ; then if [[ -n "$branch" ]] ; then
local commits local commits
commits=$(( $(svn status | grep -v "?" -c) )) commits=$(( $(svn status $LP_SVN_STATUS_OPTIONS | grep -c -v "?") ))
if [[ $commits = 0 ]] ; then if [[ $commits -eq 0 ]] ; then
local ret echo "${LP_COLOR_UP}${branch}${NO_COL}"
ret="${LP_COLOR_UP}${branch}${NO_COL}"
else else
ret="${LP_COLOR_CHANGES}${branch}${NO_COL}(${LP_COLOR_COMMITS}$commits${NO_COL})" # changes to commit echo "${LP_COLOR_CHANGES}${branch}${NO_COL}(${LP_COLOR_COMMITS}$commits${NO_COL})" # changes to commit
fi fi
echo -ne "$ret"
fi fi
} }