linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-02-13 03:01:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge c52aed61ef into e30a1243dc

Browse source
This commit is contained in:
Drarok 2013-11-07 08:13:22 -08:00
commit c9f7152d7e
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
plugins/svn/svn.plugin.zsh
View file

@ -16,16 +16,17 @@ $ZSH_THEME_REPO_NAME_COLOR$_DISPLAY$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_S
function in_svn() { function in_svn() {
if $(svn info >/dev/null 2>&1); then # Subversion doesn't return any exit status for the 'info' command, hence this hack.
return 0 # grep will return 0 if 'One or more lines were selected', and Bash treats 0 as true!
fi svn info 2>&1 | grep -q 'Path:'
return 1 return $?
} }
function svn_get_repo_name() { function svn_get_repo_name() {
if in_svn; then if in_svn; then
svn info | sed -n 's/Repository\ Root:\ .*\///p' | read SVN_ROOT SVN_INFO=$(svn info)
svn info | sed -n "s/URL:\ .*$SVN_ROOT\///p" echo $SVN_INFO | sed -n 's/Repository\ Root:\ .*\///p' | read SVN_ROOT
echo $SVN_INFO | sed -n "s/^URL:\ .*$SVN_ROOT\///p"
fi fi
} }
@ -43,7 +44,7 @@ function svn_get_branch_name() {
} \ } \
}' }'
) )
if [ "x$_DISPLAY" = "x" ]; then if [ "x$_DISPLAY" = "x" ]; then
svn_get_repo_name svn_get_repo_name
else else