84d9b020c2f461483704688678d450499d3f2733

Message

Merge pull request #1490 from khrt/master

Added support for Subversion 1.7 for SVN plugin

Diff

This diff is truncated to protect this page.

  1diff --git a/plugins/brew/_brew b/plugins/brew/_brew
  2index 1dcf0a4bff26c50eec9a8023695cfe409db6053d..e43ba2900d6f231878b8dbe90c29098501b621af 100644
  3--- a/plugins/brew/_brew
  4+++ b/plugins/brew/_brew
  5@@ -35,6 +35,7 @@ _1st_arguments=(
  6   'update:freshen up links'
  7   'upgrade:upgrade outdated formulae'
  8   'uses:show formulas which depend on a formula'
  9+  'versions:show all available formula versions'
 10 )
 11 
 12 local expl
 13@@ -71,7 +72,7 @@ case "$words[1]" in
 14         _brew_installed_formulae
 15         _wanted installed_formulae expl 'installed formulae' compadd -a installed_formulae
 16       fi ;;
 17-  install|home|homepage|log|info|abv|uses|cat|deps|edit|options)
 18+  install|home|homepage|log|info|abv|uses|cat|deps|edit|options|versions)
 19     _brew_all_formulae
 20     _wanted formulae expl 'all formulae' compadd -a formulae ;;
 21   remove|rm|uninstall|unlink|cleanup|link|ln)
 22diff --git a/plugins/svn/svn.plugin.zsh b/plugins/svn/svn.plugin.zsh
 23index e38e8920b92d9482dff4e676a8a576480d7e7964..4f008ba4e219d986f9c5515c209ffec68da2a68e 100644
 24--- a/plugins/svn/svn.plugin.zsh
 25+++ b/plugins/svn/svn.plugin.zsh
 26@@ -1,62 +1,76 @@
 27-
 28-function svn_prompt_info {
 29-    if [ $(in_svn) ]; then
 30-        if [ "x$SVN_SHOW_BRANCH" = "xtrue" ]; then
 31-            unset SVN_SHOW_BRANCH
 32-            _DISPLAY=$(svn_get_branch_name)
 33-        else
 34-            _DISPLAY=$(svn_get_repo_name)
 35-        fi
 36-        echo "$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_PREFIX\
 37-$ZSH_THEME_REPO_NAME_COLOR$_DISPLAY$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_SUFFIX$ZSH_PROMPT_BASE_COLOR$(svn_dirty)$ZSH_PROMPT_BASE_COLOR"
 38-        unset _DISPLAY
 39+# vim:ft=zsh ts=2 sw=2 sts=2
 40+#
 41+function svn_prompt_info() {
 42+  if in_svn; then
 43+    if [ "x$SVN_SHOW_BRANCH" = "xtrue" ]; then
 44+      unset SVN_SHOW_BRANCH
 45+      _DISPLAY=$(svn_get_branch_name)
 46+    else
 47+      _DISPLAY=$(svn_get_repo_name)
 48     fi
 49+    echo "$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_PREFIX\
 50+$ZSH_THEME_REPO_NAME_COLOR$_DISPLAY$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_SUFFIX$ZSH_PROMPT_BASE_COLOR$(svn_dirty)$ZSH_PROMPT_BASE_COLOR"
 51+    unset _DISPLAY
 52+  fi
 53 }
 54 
 55 
 56 function in_svn() {
 57-    if [[ -d .svn ]]; then
 58-        echo 1
 59-    fi
 60+  if $(svn info >/dev/null 2>&1); then
 61+    return 0
 62+  fi
 63+  return 1
 64 }
 65 
 66-function svn_get_repo_name {
 67-    if [ $(in_svn) ]; then
 68-        svn info | sed -n 's/Repository\ Root:\ .*\///p' | read SVN_ROOT
 69-
 70-        svn info | sed -n "s/URL:\ .*$SVN_ROOT\///p"
 71-    fi
 72+function svn_get_repo_name() {
 73+  if in_svn; then
 74+    svn info | sed -n 's/Repository\ Root:\ .*\///p' | read SVN_ROOT
 75+    svn info | sed -n "s/URL:\ .*$SVN_ROOT\///p"
 76+  fi
 77 }
 78 
 79-function svn_get_branch_name {
 80-    _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 } } }')
 81-    if [ "x$_DISPLAY" = "x" ]; then
 82-        svn_get_repo_name
 83-    else
 84-        echo $_DISPLAY
 85-    fi
 86-    unset _DISPLAY
 87+function svn_get_branch_name() {
 88+  _DISPLAY=$(
 89+    svn info 2> /dev/null | \
 90+      awk -F/ \
 91+      '/^URL:/ { \
 92+        for (i=0; i<=NF; i++) { \
 93+          if ($i == "branches" || $i == "tags" ) { \
 94+            print $(i+1); \
 95+            break;\
 96+          }; \
 97+          if ($i == "trunk") { print $i; break; } \
 98+        } \
 99+      }'
100+  )
101+  
102+  if [ "x$_DISPLAY" = "x" ]; then
103+    svn_get_repo_name
104+  else
105+    echo $_DISPLAY
106+  fi
107+  unset _DISPLAY
108 }
109 
110-function svn_get_rev_nr {
111-    if [ $(in_svn) ]; then
112-        svn info 2> /dev/null | sed -n s/Revision:\ //p
113-    fi
114+function svn_get_rev_nr() {
115+  if in_svn; then
116+    svn info 2> /dev/null | sed -n 's/Revision:\ //p'
117+  fi
118 }
119 
120-function svn_dirty_choose {
121-    if [ $(in_svn) ]; then
122-        svn status 2> /dev/null | grep -Eq '^\s*[ACDIM!?L]'
123-        if [ $pipestatus[-1] -eq 0 ]; then
124-            # Grep exits with 0 when "One or more lines were selected", return "dirty".
125-            echo $1