Author: prabhugs
Date: Wed Jul 3 10:49:01 2013
New Revision: 1499315
URL: http://svn.apache.org/r1499315
Log:
Format the summary of corrupt revisions.
* subversion/libsvn_repos/dump.c
(notify_verification_error_summary): Show the best error message instead of
the entire error chain in the summary.
* subversion/svnadmin/svnadmin.c
(repos_notify_handler): Do not print the entire error chain in the summary
of corrupt revisions.
Modified:
subversion/branches/verify-keep-going/subversion/libsvn_repos/dump.c
subversion/branches/verify-keep-going/subversion/svnadmin/svnadmin.c
Modified: subversion/branches/verify-keep-going/subversion/libsvn_repos/dump.c
URL:
http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/subversion/libsvn_repos/dump.c?rev=1499315&r1=1499314&r2=1499315&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/subversion/libsvn_repos/dump.c
(original)
+++ subversion/branches/verify-keep-going/subversion/libsvn_repos/dump.c Wed
Jul 3 10:49:01 2013
@@ -1375,6 +1375,7 @@ notify_verification_error_summary(svn_re
apr_pool_t *pool)
{
svn_repos_notify_t *notify_failure;
+ char errbuf[512]; /* ### svn_strerror() magic number */
if (notify_func == NULL)
return;
@@ -1382,6 +1383,11 @@ notify_verification_error_summary(svn_re
notify_failure = svn_repos_notify_create(svn_repos_notify_failure_summary,
pool);
notify_failure->err = err;
+ notify_failure->warning_str = apr_psprintf(pool,
+ _("E%06d: %s"),
+ err->apr_err,
+ svn_err_best_message(err, errbuf,
+
sizeof(errbuf)));
notify_failure->revision = rev;
notify_func(notify_baton, notify_failure, pool);
}
Modified: subversion/branches/verify-keep-going/subversion/svnadmin/svnadmin.c
URL:
http://svn.apache.org/viewvc/subversion/branches/verify-keep-going/subversion/svnadmin/svnadmin.c?rev=1499315&r1=1499314&r2=1499315&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/subversion/svnadmin/svnadmin.c
(original)
+++ subversion/branches/verify-keep-going/subversion/svnadmin/svnadmin.c Wed
Jul 3 10:49:01 2013
@@ -850,16 +850,13 @@ repos_notify_handler(void *baton,
case svn_repos_notify_failure_summary:
if (notify->revision != SVN_INVALID_REVNUM)
cmdline_stream_printf(feedback_stream, scratch_pool,
- _("\nRevision %ld \n"),
- notify->revision);
- if (notify->err)
- svn_handle_error2(notify->err, stderr, FALSE /* non-fatal */,
- "svnadmin: ");
+ _("Revision %ld: %s \n"),
+ notify->revision, notify->warning_str);
return;
case svn_repos_notify_summary:
cmdline_stream_printf(feedback_stream, scratch_pool,
- _("\n-----Summary of corrupt revisions-----"));
+ _("\n-----Summary of corrupt revisions-----\n"));
return;
case svn_repos_notify_dump_rev_end:
