linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-05-29 04:53:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #1 from robbyrussell/master

Browse source 
update from robbyrussell
This commit is contained in:
azure 2017-11-26 20:41:30 +08:00 • committed by GitHub
commit c66ee17918
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
444 changed files with 26667 additions and 4507 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,37 +1,33 @@
# vim:ft=zsh ts=2 sw=2 sts=2
#
function svn_prompt_info() {
svn_prompt_info() {
local _DISPLAY
if in_svn; then
if [ "x$SVN_SHOW_BRANCH" = "xtrue" ]; then
if [[ "$SVN_SHOW_BRANCH" = true ]]; then
unset SVN_SHOW_BRANCH
_DISPLAY=$(svn_get_branch_name)
else
_DISPLAY=$(svn_get_repo_name)
_DISPLAY=$(omz_urldecode "${_DISPLAY}")
fi
echo "$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_PREFIX\
$ZSH_THEME_REPO_NAME_COLOR$_DISPLAY$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_SUFFIX$ZSH_PROMPT_BASE_COLOR$(svn_dirty)$(svn_dirty_pwd)$ZSH_PROMPT_BASE_COLOR"
unset _DISPLAY
fi
}
function in_svn() {
if $(svn info >/dev/null 2>&1); then
return 0
fi
return 1
in_svn() {
svn info >/dev/null 2>&1
}
function svn_get_repo_name() {
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"
LANG=C svn info | sed -n 's/^Repository\ Root:\ .*\///p' | read SVN_ROOT
LANG=C svn info | sed -n "s/^URL:\ .*$SVN_ROOT\///p"
fi
}
function svn_get_branch_name() {
_DISPLAY=$(
svn info 2> /dev/null | \
svn_get_branch_name() {
local _DISPLAY=$(
LANG=C svn info 2> /dev/null | \
awk -F/ \
'/^URL:/ { \
for (i=0; i<=NF; i++) { \
@ -43,24 +39,27 @@ function svn_get_branch_name() {
} \
}'
)
if [ "x$_DISPLAY" = "x" ]; then
if [[ -z "$_DISPLAY" ]]; then
svn_get_repo_name
elif [ "x$_DISPLAY" = "xtrunk" ]; then
echo "trunk"
else
echo "NOT trunk"
fi
unset _DISPLAY
}
function svn_get_rev_nr() {
svn_get_rev_nr() {
if in_svn; then
svn info 2> /dev/null | sed -n 's/Revision:\ //p'
LANG=C svn info 2> /dev/null | sed -n 's/Revision:\ //p'
fi
}
function svn_dirty_choose() {
svn_dirty() {
svn_dirty_choose $ZSH_THEME_SVN_PROMPT_DIRTY $ZSH_THEME_SVN_PROMPT_CLEAN
}
svn_dirty_choose() {
if in_svn; then
local root=$(LANG=C svn info 2> /dev/null | sed -n 's/^Working Copy Root Path: //p')
if svn status $root 2> /dev/null | command grep -Eq '^\s*[ACDIM!?L]'; then
@ -79,10 +78,9 @@ svn_dirty_pwd () {
svn_dirty_choose_pwd $ZSH_THEME_SVN_PROMPT_DIRTY_PWD $ZSH_THEME_SVN_PROMPT_CLEAN_PWD
}
function svn_dirty_choose_pwd () {
svn_dirty_choose_pwd () {
if in_svn; then
root=`pwd`
if $(svn status $root 2> /dev/null | grep -Eq '^\s*[ACDIM!?L]'); then
if svn status "$PWD" 2> /dev/null | command grep -Eq '^\s*[ACDIM!?L]'; then
# Grep exits with 0 when "One or more lines were selected", return "dirty".
echo $1
else
@ -91,9 +89,3 @@ function svn_dirty_choose_pwd () {
fi
fi
}
function svn_dirty_pwd () {
svn_dirty_choose_pwd $ZSH_THEME_SVN_PROMPT_DIRTY_PWD $ZSH_THEME_SVN_PROMPT_CLEAN_PWD
}