about summary refs log tree commit diff
path: root/Functions
diff options
context:
space:
mode:
Diffstat (limited to 'Functions')
-rw-r--r--Functions/VCS_Info/Backends/VCS_INFO_get_data_svn22
1 files changed, 15 insertions, 7 deletions
diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_svn b/Functions/VCS_Info/Backends/VCS_INFO_get_data_svn
index ae3c49959..e56afee02 100644
--- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_svn
+++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_svn
@@ -30,13 +30,21 @@ done
 
 cwdinfo=(${(kv)svninfo})
 
-while [[ -d "${svnbase}/../.svn" ]]; do
-    parentinfo=()
-    ${vcs_comm[cmd]} info --non-interactive "${svnbase}/.." | while IFS=: read a b; do parentinfo[${a// /_}]="${b## #}"; done
-    [[ ${parentinfo[Repository_UUID]} != ${svninfo[Repository_UUID]} ]] && break
-    svninfo=(${(kv)parentinfo})
-    svnbase="${svnbase}/.."
-done
+# Set svnbase to the wcroot path and svninfo to its `svn info`.
+if (( ${+svninfo[Working_Copy_Root_Path]} )); then
+  # svn 1.7+
+  svnbase=${svninfo[Working_Copy_Root_Path]}
+  ${vcs_comm[cmd]} info --non-interactive -- "${svnbase}" | while IFS=: read a b; do svninfo[${a// /_}]="${b## #}"; done
+else
+  # svn 1.0-1.6
+  while [[ -d "${svnbase}/../.svn" ]]; do
+      parentinfo=()
+      ${vcs_comm[cmd]} info --non-interactive -- "${svnbase}/.." | while IFS=: read a b; do parentinfo[${a// /_}]="${b## #}"; done
+      [[ ${parentinfo[Repository_UUID]} != ${svninfo[Repository_UUID]} ]] && break
+      svninfo=(${(kv)parentinfo})
+      svnbase="${svnbase}/.."
+  done
+fi
 
 svnbase="$(VCS_INFO_realpath ${svnbase})"