Diff
1diff --git a/plugins/svn-fast-info/svn-fast-info.plugin.zsh b/plugins/svn-fast-info/svn-fast-info.plugin.zsh
2index 2183010baecc3f67e8ec892e1f57be4c7280bae0..2d43d365b13dd10675324ae053fce18cbf486092 100644
3--- a/plugins/svn-fast-info/svn-fast-info.plugin.zsh
4+++ b/plugins/svn-fast-info/svn-fast-info.plugin.zsh
5@@ -14,7 +14,7 @@ function svn_prompt_info() {
6 info=$(svn info 2>&1) || return 1; # capture stdout and stderr
7 local repo_need_upgrade=$(svn_repo_need_upgrade $info)
8
9- if [ -n $repo_need_upgrade ]; then
10+ if [[ -n $repo_need_upgrade ]]; then
11 printf '%s%s%s%s%s%s%s\n' \
12 $ZSH_PROMPT_BASE_COLOR \
13 $ZSH_THEME_SVN_PROMPT_PREFIX \
14@@ -22,57 +22,53 @@ function svn_prompt_info() {
15 $repo_need_upgrade \
16 $ZSH_PROMPT_BASE_COLOR \
17 $ZSH_THEME_SVN_PROMPT_SUFFIX \
18- $ZSH_PROMPT_BASE_COLOR \
19+ $ZSH_PROMPT_BASE_COLOR
20 else
21- # something left for you to fix -
22- # repo name and rev aren't used here, did you forget them?
23- # especially since you set a repo name color
24- # if the prompt is alright this way, leave it as is and just
25- # delete the comment. The functions itself could stay imo,
26- # gives others the chance to use them.
27- printf '%s%s%s%s%s%s%s%s%s\n' \
28+ printf '%s%s%s %s%s:%s%s%s%s%s' \
29 $ZSH_PROMPT_BASE_COLOR \
30 $ZSH_THEME_SVN_PROMPT_PREFIX \
31- $ZSH_THEME_REPO_NAME_COLOR \
32- $(svn_get_branch_name $info)
33- ${svn_branch_name}\
34- $ZSH_PROMPT_BASE_COLOR
35- $(svn_dirty_choose $info)
36- $ZSH_PROMPT_BASE_COLOR
37- $ZSH_THEME_SVN_PROMPT_SUFFIX\
38+ \
39+ "$(svn_status_info $info)" \
40+ $ZSH_PROMPT_BASE_COLOR \
41+ \
42+ $ZSH_THEME_BRANCH_NAME_COLOR \
43+ $(svn_get_branch_name $info) \
44+ $ZSH_PROMPT_BASE_COLOR \
45+ \
46+ $(svn_get_revision $info) \
47+ $ZSH_PROMPT_BASE_COLOR \
48+ \
49+ $ZSH_THEME_SVN_PROMPT_SUFFIX \
50 $ZSH_PROMPT_BASE_COLOR
51 fi
52 }
53
54+
55 function svn_repo_need_upgrade() {
56 grep -q "E155036" <<< ${1:-$(svn info 2> /dev/null)} && \
57 echo "E155036: upgrade repo with svn upgrade"
58 }
59
60 function svn_get_branch_name() {
61- echo ${1:-$(svn info 2> /dev/null)} |\
62- grep '^URL:' | egrep -o '(tags|branches)/[^/]+|trunk' |\
63- egrep -o '[^/]+$'
64+ grep '^URL:' <<< "${1:-$(svn info 2> /dev/null)}" | egrep -o '(tags|branches)/[^/]+|trunk'
65 }
66
67-function svn_get_repo_name() {
68- # I think this can be further cleaned up as well, not sure how,
69- # as I can't test it
70- local svn_root
71- local info=${1:-$(svn info 2> /dev/null)}
72- echo $info | sed 's/Repository\ Root:\ .*\///p' | read svn_root
73- echo $info | sed "s/URL:\ .*$svn_root\///p"
74+function svn_get_repo_root_name() {
75+ grep '^Repository\ Root:' <<< "${1:-$(svn info 2> /dev/null)}" | sed 's#.*/##'
76 }
77
78 function svn_get_revision() {
79- # does this work as it should?
80- echo ${1:-$(svn info 2> /dev/null)} | sed 's/Revision: //p'
81+ echo "${1:-$(svn info 2> /dev/null)}" | sed -n 's/Revision: //p'
82 }
83
84-function svn_dirty_choose() {
85- if svn status | grep -E '^\s*[ACDIM!?L]' &> /dev/null; then
86- echo $ZSH_THEME_SVN_PROMPT_DIRTY
87- else
88- echo $ZSH_THEME_SVN_PROMPT_CLEAN
89- fi
90+function svn_status_info() {
91+ local svn_status_string="$ZSH_THEME_SVN_PROMPT_CLEAN"
92+ local svn_status="$(svn status 2> /dev/null)";
93+ if grep -E '^\s*A' &> /dev/null <<< $svn_status; then svn_status_string="$svn_status_string ${ZSH_THEME_SVN_PROMPT_ADDITIONS:-+}"; fi
94+ if grep -E '^\s*D' &> /dev/null <<< $svn_status; then svn_status_string="$svn_status_string ${ZSH_THEME_SVN_PROMPT_DELETIONS:-✖}"; fi
95+ if grep -E '^\s*M' &> /dev/null <<< $svn_status; then svn_status_string="$svn_status_string ${ZSH_THEME_SVN_PROMPT_MODIFICATIONS:-✎}"; fi
96+ if grep -E '^\s*[R~]' &> /dev/null <<< $svn_status; then svn_status_string="$svn_status_string ${ZSH_THEME_SVN_PROMPT_REPLACEMENTS:-∿}"; fi
97+ if grep -E '^\s*\?' &> /dev/null <<< $svn_status; then svn_status_string="$svn_status_string ${ZSH_THEME_SVN_PROMPT_UNTRACKED:-?}"; fi
98+ if grep -E '^\s*[CI!L]' &> /dev/null <<< $svn_status; then svn_status_string="$svn_status_string ${ZSH_THEME_SVN_PROMPT_DIRTY:-'!'}"; fi
99+ echo $svn_status_string
100 }