Re: [PATCH] Fix verify -r N for non-trivial repositories

OK to commit then?

Eric Gillespie <epg@pretzelnet.org> writes:

> [[[
> Stop svnadmin verify -r N from dumping the entire contents of the
> repository at N, making it possible to verify individual revisions of
> repositories of significant size.
>
> * subversion/svnadmin/main.c
> (dump_repo): Take incremental argument and pass along to
> svn_repos_dump_fs2 instead of opt_state->incremental .
> (subcommand_dump): Pass opt_state->incremental to dump_repo .
> (subcommand_verify): Pass opt_state->start_revision.kind !=
> svn_opt_revision_unspecified to dump_repo for incremental .
> ]]]
>
> Index: subversion/svnadmin/main.c
> ===================================================================
> --- subversion/svnadmin/main.c (revision 24529)
> +++ subversion/svnadmin/main.c (working copy)
> @@ -619,7 +619,8 @@
> whether to send the dump to stdout or an empty stream. */
> static svn_error_t *
> dump_repo(apr_getopt_t *os, void *baton,
> - apr_pool_t *pool, svn_boolean_t dump_contents)
> + apr_pool_t *pool, svn_boolean_t dump_contents,
> + svn_boolean_t incremental)
> {
> struct svnadmin_opt_state *opt_state = baton;
> svn_repos_t *repos;
> @@ -666,7 +667,7 @@
> stderr_stream = recode_stream_create(stderr, pool);
>
> SVN_ERR(svn_repos_dump_fs2(repos, stdout_stream, stderr_stream,
> - lower, upper, opt_state->incremental,
> + lower, upper, incremental,
> opt_state->use_deltas, check_cancel, NULL,
> pool));
>
> @@ -678,7 +679,8 @@
> static svn_error_t *
> subcommand_dump(apr_getopt_t *os, void *baton, apr_pool_t *pool)
> {
> - return dump_repo(os, baton, pool, TRUE);
> + struct svnadmin_opt_state *opt_state = baton;
> + return dump_repo(os, baton, pool, TRUE, opt_state->incremental);
> }
>
>
> @@ -1061,7 +1063,9 @@
> static svn_error_t *
> subcommand_verify(apr_getopt_t *os, void *baton, apr_pool_t *pool)
> {
> - return dump_repo(os, baton, pool, FALSE);
> + struct svnadmin_opt_state *opt_state = baton;
> + return dump_repo(os, baton, pool, FALSE,
> + opt_state->start_revision.kind != svn_opt_revision_unspecified);
> }
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org
>

-- 
Eric Gillespie <*> epg@pretzelnet.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org