From f207fb90d8a86c5968e1a3d702ea4cf778bd79d8 Mon Sep 17 00:00:00 2001
From: Daniel Shahaf <d.s@daniel.shahaf.name>
Date: Thu, 26 Mar 2020 01:32:51 +0000
Subject: 45625: vcs_info svn: Detect the "working copy format is too new"
 error.

---
 Functions/VCS_Info/Backends/VCS_INFO_get_data_svn | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'Functions')

diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_svn b/Functions/VCS_Info/Backends/VCS_INFO_get_data_svn
index 6fbd673a7..b33efc2fb 100644
--- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_svn
+++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_svn
@@ -10,6 +10,7 @@ local -i rc
 local -A svninfo parentinfo cwdinfo
 local -A hook_com
 integer -r SVN_ERR_WC_UPGRADE_REQUIRED=155036 # from /usr/local/include/subversion-1/svn_error_codes.h
+integer -r SVN_ERR_WC_UNSUPPORTED_FORMAT=155021
 
 svnbase=".";
 svninfo=()
@@ -22,7 +23,14 @@ rc=$?
 if (( rc != 0 )) ; then
   if (( rc == 1 )) && [[ -n ${(M)dat:#"svn: E${SVN_ERR_WC_UPGRADE_REQUIRED}: "*} ]]; then
     hook_com=()
-    VCS_INFO_formats '' '?' '?' '' '' '?' 'upgrade required'
+    # User should run 'svn upgrade'
+    VCS_INFO_formats '' '?' '?' '' '' '?' 'working copy upgrade required'
+    return $?
+  elif (( rc == 1 )) && [[ -n ${(M)dat:#"svn: E${SVN_ERR_WC_UNSUPPORTED_FORMAT}: "*} ]]; then
+    hook_com=()
+    # User probably needs to install a newer svn, but we're not sure, so point
+    # the user to svn's error message.
+    VCS_INFO_formats '' '?' '?' '' '' '?' 'svn error'
     return $?
   else
     return 1
-- 
cgit 1.4.1