subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1546109 - /subversion/branches/verify-keep-going/subversion/svnadmin/svnadmin.c
Date Wed, 27 Nov 2013 16:59:27 GMT
Author: stsp
Date: Wed Nov 27 16:59:26 2013
New Revision: 1546109

URL: http://svn.apache.org/r1546109
Log:
On the verify-keep-going branch, uncouple the --keep-going option from
the --quiet option. Currently, --quiet suppresses notifications, and
hence also the summary printed by --keep-going. But there is no need
to encode this assumption in the --keep-going code path.

* subversion/svnadmin/svnadmin.c
  (subcommand_verify): Create error summary list, and show the summary if
   the list is not empty, even if --quiet was given,
   Always create a result pool for the notification callback to use.
   I've included a drive-by indentation fix as well.

Modified:
    subversion/branches/verify-keep-going/subversion/svnadmin/svnadmin.c

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=1546109&r1=1546108&r2=1546109&view=diff
==============================================================================
--- subversion/branches/verify-keep-going/subversion/svnadmin/svnadmin.c (original)
+++ subversion/branches/verify-keep-going/subversion/svnadmin/svnadmin.c Wed Nov 27 16:59:26
2013
@@ -1741,16 +1741,13 @@ subcommand_verify(apr_getopt_t *os, void
     }
 
   if (! opt_state->quiet)
-    {
-      notify_baton.feedback_stream = recode_stream_create(stdout, pool);
+    notify_baton.feedback_stream = recode_stream_create(stdout, pool);
 
-      if (opt_state->keep_going)
-        {
-          notify_baton.error_summary =
-            apr_array_make(pool, 0, sizeof(struct verification_error *));
-          notify_baton.result_pool = pool;
-        }
-    }
+  if (opt_state->keep_going)
+    notify_baton.error_summary =
+      apr_array_make(pool, 0, sizeof(struct verification_error *));
+
+  notify_baton.result_pool = pool;
 
   verify_err = svn_repos_verify_fs3(repos, lower, upper,
                                     opt_state->keep_going,
@@ -1761,8 +1758,7 @@ subcommand_verify(apr_getopt_t *os, void
                                     NULL, pool);
 
   /* Show the --keep-going error summary. */
-  if (!opt_state->quiet && opt_state->keep_going &&
-      notify_baton.error_summary->nelts > 0)
+  if (opt_state->keep_going && notify_baton.error_summary->nelts > 0)
     {
       apr_pool_t *iterpool;
       int i;
@@ -1781,7 +1777,7 @@ subcommand_verify(apr_getopt_t *os, void
           svn_pool_clear(iterpool);
 
           verr = APR_ARRAY_IDX(notify_baton.error_summary, i,
-                                   struct verification_error *);
+                               struct verification_error *);
           rev_str = apr_psprintf(iterpool, "r%ld", verr->rev);
           for (err = svn_error_purge_tracing(verr->err);
                err != SVN_NO_ERROR; err = err->child)



Mime
View raw message