Update to make the svn plugin work correctly with subversion 1.7 upwards.

Subversion 1.7 centralises metadata into a single location - a single
.svn directory in the project's root, rather than one for every
directory in the working copy.  This change utilises 'svn info' to work
out whether or not the pwd is under subversion, so oh-my-zsh's svn
plugin will work regardless of the svn version.
This commit is contained in:
Peter Yates 2012-02-17 09:17:03 +00:00
commit 3c49e4a5c7

View file

@ -1,13 +1,14 @@
function svn_prompt_info { function svn_prompt_info {
if [ $(in_svn) ]; then if [ $(in_svn) ]; then
echo "$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_PREFIX\ 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" $ZSH_THEME_REPO_NAME_COLOR$(svn_get_repo_name):$(svn_get_rev_nr)$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_SUFFIX$ZSH_PROMPT_BASE_COLOR$(svn_dirty)$ZSH_PROMPT_BASE_COLOR"
fi fi
} }
function in_svn() { function in_svn() {
if [[ -d .svn ]]; then info=$(svn info 2> /dev/null) || return
if [ $info ]; then
echo 1 echo 1
fi fi
} }