adphi/oh-my-zsh
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1490 from khrt/master

Browse Source 
Added support for Subversion 1.7 for SVN plugin
This commit is contained in:
Robby Russell 2013-04-23 20:36:59 -07:00
commit 84d9b020c2
2 changed files with 64 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/brew/_brew
View File

@ -35,6 +35,7 @@ _1st_arguments=(
'update:freshen up links' 'update:freshen up links'
'upgrade:upgrade outdated formulae' 'upgrade:upgrade outdated formulae'
'uses:show formulas which depend on a formula' 'uses:show formulas which depend on a formula'
'versions:show all available formula versions'
) )
local expl local expl
@ -71,7 +72,7 @@ case "$words[1]" in
_brew_installed_formulae _brew_installed_formulae
_wanted installed_formulae expl 'installed formulae' compadd -a installed_formulae _wanted installed_formulae expl 'installed formulae' compadd -a installed_formulae
fi ;; fi ;;
install|home|homepage|log|info|abv|uses|cat|deps|edit|options) install|home|homepage|log|info|abv|uses|cat|deps|edit|options|versions)
_brew_all_formulae _brew_all_formulae
_wanted formulae expl 'all formulae' compadd -a formulae ;; _wanted formulae expl 'all formulae' compadd -a formulae ;;
remove|rm|uninstall|unlink|cleanup|link|ln) remove|rm|uninstall|unlink|cleanup|link|ln)

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

@ -1,6 +1,7 @@
# vim:ft=zsh ts=2 sw=2 sts=2
function svn_prompt_info { #
if [ $(in_svn) ]; then function svn_prompt_info() {
if in_svn; then
if [ "x$SVN_SHOW_BRANCH" = "xtrue" ]; then if [ "x$SVN_SHOW_BRANCH" = "xtrue" ]; then
unset SVN_SHOW_BRANCH unset SVN_SHOW_BRANCH
_DISPLAY=$(svn_get_branch_name) _DISPLAY=$(svn_get_branch_name)
@ -15,21 +16,34 @@ $ZSH_THEME_REPO_NAME_COLOR$_DISPLAY$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_S
function in_svn() { function in_svn() {
if [[ -d .svn ]]; then if $(svn info >/dev/null 2>&1); then
echo 1 return 0
fi fi
return 1
} }
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" svn info | sed -n "s/URL:\ .*$SVN_ROOT\///p"
fi fi
} }
function svn_get_branch_name { function svn_get_branch_name() {
_DISPLAY=$(svn info 2> /dev/null | awk -F/ '/^URL:/ { for (i=0; i<=NF; i++) { if ($i == "branches" || $i == "tags" ) { print $(i+1); break }; if ($i == "trunk") { print $i; break } } }') _DISPLAY=$(
svn info 2> /dev/null | \
awk -F/ \
'/^URL:/ { \
for (i=0; i<=NF; i++) { \
if ($i == "branches" || $i == "tags" ) { \
print $(i+1); \
break;\
}; \
if ($i == "trunk") { print $i; break; } \
} \
}'
)
if [ "x$_DISPLAY" = "x" ]; then if [ "x$_DISPLAY" = "x" ]; then
svn_get_repo_name svn_get_repo_name
else else
@ -38,16 +52,16 @@ function svn_get_branch_name {
unset _DISPLAY unset _DISPLAY
} }
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
svn status 2> /dev/null | grep -Eq '^\s*[ACDIM!?L]' root=`svn info 2> /dev/null | sed -n 's/^Working Copy Root Path: //p'`
if [ $pipestatus[-1] -eq 0 ]; then if $(svn status $root 2> /dev/null | grep -Eq '^\s*[ACDIM!?L]'); then
# Grep exits with 0 when "One or more lines were selected", return "dirty". # Grep exits with 0 when "One or more lines were selected", return "dirty".
echo $1 echo $1
else else
@ -57,6 +71,6 @@ function svn_dirty_choose {
fi fi
} }
function svn_dirty { function svn_dirty() {
svn_dirty_choose $ZSH_THEME_SVN_PROMPT_DIRTY $ZSH_THEME_SVN_PROMPT_CLEAN svn_dirty_choose $ZSH_THEME_SVN_PROMPT_DIRTY $ZSH_THEME_SVN_PROMPT_CLEAN
} }