mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2024-11-22 13:50:09 +00:00
added support for subversion 1.7 for svn plugin
This commit is contained in:
parent
55f09f89c8
commit
6ce08acb27
1 changed files with 62 additions and 48 deletions
|
@ -1,6 +1,7 @@
|
||||||
|
# vim:ft=zsh ts=2 sw=2 sts=2
|
||||||
function svn_prompt_info {
|
#
|
||||||
if [ $(in_svn) ]; then
|
function svn_prompt_info() {
|
||||||
|
if in_svn; then
|
||||||
if [ "x$SVN_SHOW_BRANCH" = "xtrue" ]; then
|
if [ "x$SVN_SHOW_BRANCH" = "xtrue" ]; then
|
||||||
unset SVN_SHOW_BRANCH
|
unset SVN_SHOW_BRANCH
|
||||||
_DISPLAY=$(svn_get_branch_name)
|
_DISPLAY=$(svn_get_branch_name)
|
||||||
|
@ -15,21 +16,34 @@ $ZSH_THEME_REPO_NAME_COLOR$_DISPLAY$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_S
|
||||||
|
|
||||||
|
|
||||||
function in_svn() {
|
function in_svn() {
|
||||||
if [[ -d .svn ]]; then
|
if $(svn info >/dev/null 2>&1); then
|
||||||
echo 1
|
return 0
|
||||||
fi
|
fi
|
||||||
|
return 1
|
||||||
}
|
}
|
||||||
|
|
||||||
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 | sed -n 's/Repository\ Root:\ .*\///p' | read SVN_ROOT
|
||||||
|
|
||||||
svn info | sed -n "s/URL:\ .*$SVN_ROOT\///p"
|
svn info | sed -n "s/URL:\ .*$SVN_ROOT\///p"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
function svn_get_branch_name {
|
function svn_get_branch_name() {
|
||||||
_DISPLAY=$(svn info 2> /dev/null | awk -F/ '/^URL:/ { for (i=0; i<=NF; i++) { if ($i == "branches" || $i == "tags" ) { print $(i+1); break }; if ($i == "trunk") { print $i; break } } }')
|
_DISPLAY=$(
|
||||||
|
svn info 2> /dev/null | \
|
||||||
|
awk -F/ \
|
||||||
|
'/^URL:/ { \
|
||||||
|
for (i=0; i<=NF; i++) { \
|
||||||
|
if ($i == "branches" || $i == "tags" ) { \
|
||||||
|
print $(i+1); \
|
||||||
|
break;\
|
||||||
|
}; \
|
||||||
|
if ($i == "trunk") { print $i; break; } \
|
||||||
|
} \
|
||||||
|
}'
|
||||||
|
)
|
||||||
|
|
||||||
if [ "x$_DISPLAY" = "x" ]; then
|
if [ "x$_DISPLAY" = "x" ]; then
|
||||||
svn_get_repo_name
|
svn_get_repo_name
|
||||||
else
|
else
|
||||||
|
@ -38,16 +52,16 @@ function svn_get_branch_name {
|
||||||
unset _DISPLAY
|
unset _DISPLAY
|
||||||
}
|
}
|
||||||
|
|
||||||
function svn_get_rev_nr {
|
function svn_get_rev_nr() {
|
||||||
if [ $(in_svn) ]; then
|
if in_svn; then
|
||||||
svn info 2> /dev/null | sed -n s/Revision:\ //p
|
svn info 2> /dev/null | sed -n 's/Revision:\ //p'
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
function svn_dirty_choose {
|
function svn_dirty_choose() {
|
||||||
if [ $(in_svn) ]; then
|
if in_svn; then
|
||||||
svn status 2> /dev/null | grep -Eq '^\s*[ACDIM!?L]'
|
root=`svn info 2> /dev/null | sed -n 's/^Working Copy Root Path: //p'`
|
||||||
if [ $pipestatus[-1] -eq 0 ]; then
|
if $(svn status $root 2> /dev/null | grep -Eq '^\s*[ACDIM!?L]'); then
|
||||||
# Grep exits with 0 when "One or more lines were selected", return "dirty".
|
# Grep exits with 0 when "One or more lines were selected", return "dirty".
|
||||||
echo $1
|
echo $1
|
||||||
else
|
else
|
||||||
|
@ -57,6 +71,6 @@ function svn_dirty_choose {
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
function svn_dirty {
|
function svn_dirty() {
|
||||||
svn_dirty_choose $ZSH_THEME_SVN_PROMPT_DIRTY $ZSH_THEME_SVN_PROMPT_CLEAN
|
svn_dirty_choose $ZSH_THEME_SVN_PROMPT_DIRTY $ZSH_THEME_SVN_PROMPT_CLEAN
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue