|
@@ -1,17 +1,6 @@
|
|
|
-# vim:ft=zsh ts=2 sw=2 sts=2 et
|
|
|
-#
|
|
|
-# Faster alternative to the current SVN plugin implementation.
|
|
|
-#
|
|
|
-# Works with svn 1.6, 1.7, 1.8.
|
|
|
-# Use `svn_prompt_info` method to enquire the svn data.
|
|
|
-# It's faster because his efficient use of svn (single svn call) which saves a lot on a huge codebase
|
|
|
-# It displays the current status of the local files (added, deleted, modified, replaced, or else...)
|
|
|
-#
|
|
|
-# Use as a drop-in replacement of the svn plugin not as complementary plugin
|
|
|
-
|
|
|
function svn_prompt_info() {
|
|
|
local info
|
|
|
- info=$(svn info 2>&1) || return 1; # capture stdout and stderr
|
|
|
+ info=$(svn info 2>&1) || return 1 # capture stdout and stderr
|
|
|
local repo_need_upgrade=$(svn_repo_need_upgrade $info)
|
|
|
|
|
|
if [[ -n $repo_need_upgrade ]]; then
|
|
@@ -27,7 +16,6 @@ function svn_prompt_info() {
|
|
|
printf '%s%s%s%s %s%s%s:%s%s%s%s' \
|
|
|
"$ZSH_PROMPT_BASE_COLOR" \
|
|
|
"$ZSH_THEME_SVN_PROMPT_PREFIX" \
|
|
|
- \
|
|
|
"$(svn_status_info $info)" \
|
|
|
"$ZSH_PROMPT_BASE_COLOR" \
|
|
|
\
|
|
@@ -37,14 +25,13 @@ function svn_prompt_info() {
|
|
|
\
|
|
|
"$(svn_current_revision $info)" \
|
|
|
"$ZSH_PROMPT_BASE_COLOR" \
|
|
|
- \
|
|
|
"$ZSH_THEME_SVN_PROMPT_SUFFIX" \
|
|
|
"$ZSH_PROMPT_BASE_COLOR"
|
|
|
fi
|
|
|
}
|
|
|
|
|
|
function svn_repo_need_upgrade() {
|
|
|
- grep -q "E155036" <<< ${1:-$(svn info 2> /dev/null)} && \
|
|
|
+ grep -q "E155036" <<< "${1:-$(svn info 2> /dev/null)}" && \
|
|
|
echo "E155036: upgrade repo with svn upgrade"
|
|
|
}
|
|
|
|
|
@@ -63,12 +50,23 @@ function svn_current_revision() {
|
|
|
function svn_status_info() {
|
|
|
local svn_status_string="$ZSH_THEME_SVN_PROMPT_CLEAN"
|
|
|
local svn_status="$(svn status 2> /dev/null)";
|
|
|
- if command grep -E '^\s*A' &> /dev/null <<< $svn_status; then svn_status_string="$svn_status_string${ZSH_THEME_SVN_PROMPT_ADDITIONS:-+}"; fi
|
|
|
- if command grep -E '^\s*D' &> /dev/null <<< $svn_status; then svn_status_string="$svn_status_string${ZSH_THEME_SVN_PROMPT_DELETIONS:-✖}"; fi
|
|
|
- if command grep -E '^\s*M' &> /dev/null <<< $svn_status; then svn_status_string="$svn_status_string${ZSH_THEME_SVN_PROMPT_MODIFICATIONS:-✎}"; fi
|
|
|
- if command grep -E '^\s*[R~]' &> /dev/null <<< $svn_status; then svn_status_string="$svn_status_string${ZSH_THEME_SVN_PROMPT_REPLACEMENTS:-∿}"; fi
|
|
|
- if command grep -E '^\s*\?' &> /dev/null <<< $svn_status; then svn_status_string="$svn_status_string${ZSH_THEME_SVN_PROMPT_UNTRACKED:-?}"; fi
|
|
|
- if command grep -E '^\s*[CI!L]' &> /dev/null <<< $svn_status; then svn_status_string="$svn_status_string${ZSH_THEME_SVN_PROMPT_DIRTY:-!}"; fi
|
|
|
+ if command grep -E '^\s*A' &> /dev/null <<< $svn_status; then
|
|
|
+ svn_status_string="$svn_status_string${ZSH_THEME_SVN_PROMPT_ADDITIONS:-+}"
|
|
|
+ fi
|
|
|
+ if command grep -E '^\s*D' &> /dev/null <<< $svn_status; then
|
|
|
+ svn_status_string="$svn_status_string${ZSH_THEME_SVN_PROMPT_DELETIONS:-✖}"
|
|
|
+ fi
|
|
|
+ if command grep -E '^\s*M' &> /dev/null <<< $svn_status; then
|
|
|
+ svn_status_string="$svn_status_string${ZSH_THEME_SVN_PROMPT_MODIFICATIONS:-✎}"
|
|
|
+ fi
|
|
|
+ if command grep -E '^\s*[R~]' &> /dev/null <<< $svn_status; then
|
|
|
+ svn_status_string="$svn_status_string${ZSH_THEME_SVN_PROMPT_REPLACEMENTS:-∿}"
|
|
|
+ fi
|
|
|
+ if command grep -E '^\s*\?' &> /dev/null <<< $svn_status; then
|
|
|
+ svn_status_string="$svn_status_string${ZSH_THEME_SVN_PROMPT_UNTRACKED:-?}"
|
|
|
+ fi
|
|
|
+ if command grep -E '^\s*[CI!L]' &> /dev/null <<< $svn_status; then
|
|
|
+ svn_status_string="$svn_status_string${ZSH_THEME_SVN_PROMPT_DIRTY:-!}"
|
|
|
+ fi
|
|
|
echo $svn_status_string
|
|
|
}
|
|
|
-
|