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

Simplify in_svn handling.

Browse source 
Now in_svn returns an exit code, rather than a numeric value. This
is consistent with the way Unix commands operate, ans thus simplifies
its use in conditional statements. (No separate test is required).
This commit is contained in:
Diomidis Spinellis 2011-11-30 12:22:50 +02:00
commit c305d5d6d3
1 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,19 +1,18 @@
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)$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_SUFFIX$ZSH_PROMPT_BASE_COLOR$(svn_dirty)$ZSH_PROMPT_BASE_COLOR"
fi fi
} }
# Return true if a .svn directory exists in the current directory
function in_svn() { function in_svn() {
if [[ -d .svn ]]; then [[ -d .svn ]]
echo 1
fi
} }
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" | sed "s/\/.*$//" svn info | sed -n "s/URL:\ .*$SVN_ROOT\///p" | sed "s/\/.*$//"
@ -21,13 +20,13 @@ function svn_get_repo_name {
} }
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
s=$(svn status|grep -E '^\s*[ACDIM!?L]' 2>/dev/null) s=$(svn status|grep -E '^\s*[ACDIM!?L]' 2>/dev/null)
if [ $s ]; then if [ $s ]; then
echo $1 echo $1