You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by da...@apache.org on 2013/04/06 01:22:02 UTC

svn commit: r1465157 - /subversion/trunk/subversion/libsvn_subr/error.c

Author: danielsh
Date: Fri Apr  5 23:22:01 2013
New Revision: 1465157

URL: http://svn.apache.org/r1465157
Log:
In maintainer mode, print symbolic error names in stack traces:

  % $svn ci
  subversion/svn/svn.c:2857: (apr_err=SVN_ERR_WC_UPGRADE_REQUIRED)
  svn: E155036: Please see the 'svn upgrade' command
  subversion/libsvn_wc/wc_db_wcroot.c:743: (apr_err=SVN_ERR_WC_UPGRADE_REQUIRED)
  subversion/libsvn_wc/wc_db_wcroot.c:317: (apr_err=SVN_ERR_WC_UPGRADE_REQUIRED)
  svn: E155036: The working copy at '/tmp/wc-1.6' is too old (format 10) to \
  work with client version '1.8.0-dev (under development)' (expects format 31). You need to upgrade the working copy first.

* subversion/libsvn_subr/error.c
  (print_error): Print the symbolic name, using svn_error_symbolic_name().

Modified:
    subversion/trunk/subversion/libsvn_subr/error.c

Modified: subversion/trunk/subversion/libsvn_subr/error.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/error.c?rev=1465157&r1=1465156&r2=1465157&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/error.c (original)
+++ subversion/trunk/subversion/libsvn_subr/error.c Fri Apr  5 23:22:01 2013
@@ -481,8 +481,15 @@ print_error(svn_error_t *err, FILE *stre
       svn_error_clear(temp_err);
     }
 
-  svn_error_clear(svn_cmdline_fprintf(stream, err->pool,
-                                      ": (apr_err=%d)\n", err->apr_err));
+  {
+    const char *symbolic_name = svn_error_symbolic_name(err->apr_err);
+    if (symbolic_name)
+      svn_error_clear(svn_cmdline_fprintf(stream, err->pool,
+                                          ": (apr_err=%s)\n", symbolic_name));
+    else
+      svn_error_clear(svn_cmdline_fprintf(stream, err->pool,
+                                          ": (apr_err=%d)\n", err->apr_err));
+  }
 #endif /* SVN_DEBUG */
 
   /* "traced call" */