dcarrillo/prezto
1
0
Fork 0
mirror of https://github.com/dcarrillo/prezto.git synced 2025-06-16 02:11:41 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh

Browse Source 
Conflicts:
	.gitignore
	lib/aliases.zsh
	lib/completion.zsh
	lib/functions.zsh
	lib/git.zsh
	lib/key-bindings.zsh
	lib/misc.zsh
	lib/spectrum.zsh
	plugins/git/git.plugin.zsh
	plugins/osx/_man-preview
	plugins/osx/osx.plugin.zsh
	plugins/svn/svn.plugin.zsh
	templates/zshrc.zsh-template
	themes/lukerandall.zsh-theme
	themes/philips.zsh-theme
	tools/upgrade.sh
This commit is contained in:
Sorin Ionescu
2011-08-26 02:58:19 -04:00
parent 0e284f6c2a
commit ba9900a488
20 changed files with 1825 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/svn/svn.plugin.zsh
View File

@ -1,5 +1,5 @@
function svn_prompt_info {
if [[ -d .svn ]]; then
if [ in_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
@ -15,7 +15,7 @@ function in_svn() {
function svn_get_repo_name {
if [ in_svn ]; then
svn info | sed -n 's/Repository\ Root:\ .*\///p' | read SVN_ROOT
svn info | sed -n "s/URL:\ .*$SVN_ROOT\///p" | sed "s/\/.*$//"
fi
}
@ -28,10 +28,10 @@ function svn_get_rev_nr {
function svn_dirty_choose {
if [ in_svn ]; then
s=$(svn status 2>/dev/null)
if [ $s ]; then
s=$(svn status|grep -E '^\s*[ACDIM!?L]' 2>/dev/null)
if [ $s ]; then
echo $1
else
else
echo $2
fi
fi