mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2025-12-26 02:12:33 +01:00
Fixed svn plugin
SVN plugin was not correctly evaluating SVN folders when using SVN 1.6.* under Mac OS X.
This commit is contained in:
parent
9f46eafae0
commit
62aae4f1ac
1 changed files with 4 additions and 11 deletions
|
|
@ -1,19 +1,12 @@
|
|||
function svn_prompt_info {
|
||||
if [ in_svn ]; then
|
||||
if [[ -d .svn ]]; then
|
||||
echo "$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_PREFIX\
|
||||
$ZSH_THEME_REPO_NAME_COLOR$(svn_get_repo_name)$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_SUFFIX$ZSH_PROMPT_BASE_COLOR$(svn_dirty)$ZSH_PROMPT_BASE_COLOR"
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
function in_svn() {
|
||||
if [[ -d .svn ]]; then
|
||||
echo 1
|
||||
fi
|
||||
}
|
||||
|
||||
function svn_get_repo_name {
|
||||
if [ in_svn ]; then
|
||||
if [[ -d .svn ]]; then
|
||||
svn info | sed -n 's/Repository\ Root:\ .*\///p' | read SVN_ROOT
|
||||
|
||||
svn info | sed -n "s/URL:\ .*$SVN_ROOT\///p" | sed "s/\/.*$//"
|
||||
|
|
@ -21,13 +14,13 @@ function svn_get_repo_name {
|
|||
}
|
||||
|
||||
function svn_get_rev_nr {
|
||||
if [ in_svn ]; then
|
||||
if [[ -d .svn ]]; then
|
||||
svn info 2> /dev/null | sed -n s/Revision:\ //p
|
||||
fi
|
||||
}
|
||||
|
||||
function svn_dirty_choose {
|
||||
if [ in_svn ]; then
|
||||
if [[ -d .svn ]]; then
|
||||
s=$(svn status|grep -E '^\s*[ACDIM!?L]' 2>/dev/null)
|
||||
if [ $s ]; then
|
||||
echo $1
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue