nojhan/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

bugfix svn branch/root rame, some comments

Browse source
This commit is contained in:
nojhan 2012-07-19 11:00:18 +02:00
commit 50e083e42d
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
prompt.bash
View file

@ -241,11 +241,13 @@ __hg_branch_color()
# SUBVERSION # # SUBVERSION #
# Get the branch name of the current directory
# For the first level of the repository, gives the repository name
__svn_branch() __svn_branch()
{ {
if [ -d ".svn" ] ; then if [ -d ".svn" ] ; then
root=$(svn info --xml 2>/dev/null | grep "^<root>" | sed "s/^.*\/\([[:alpha:]]*\)<\/root>$/\1/") root=$(svn info --xml 2>/dev/null | grep "^<root>" | sed "s/^.*\/\([[:alpha:]]*\)<\/root>$/\1/")
branch=$(svn info --xml 2>/dev/null | grep "^<url>" | sed "s/.*\/$root\/\([[:alpha:]]*\)\/.*<\/url>$/\1/") branch=$(svn info --xml 2>/dev/null | grep "^<url>" | sed "s/.*\/$root\/\([[:alpha:]]*\).*<\/url>$/\1/")
if [[ "$branch" == "<url>"* ]] ; then if [[ "$branch" == "<url>"* ]] ; then
echo -n $root echo -n $root
else else
@ -254,6 +256,11 @@ __svn_branch()
fi fi
} }
# Set a color depending on the branch state:
# - green if the repository is up to date
# - red if there is changes to commit
# Note that, due to subversion way of managing changes,
# informations are only displayed for the CURRENT directory.
__svn_branch_color() __svn_branch_color()
{ {
command -v svn >/dev/null 2>&1 || return 1; command -v svn >/dev/null 2>&1 || return 1;