Author: cmpilato
Date: Fri May 27 14:55:31 2011
New Revision: 1128340
URL: http://svn.apache.org/viewvc?rev=1128340&view=rev
Log:
Make 'svnrdump load --quiet' actually quiet.
* subversion/svnrdump/svnrdump.c
(load_revisions): Update call to svn_rdump__load_dumpstream, passing
the 'quiet' variable.
* subversion/svnrdump/svnrdump.h
(svn_rdump__load_dumpstream): Add 'quiet' parameter.
* subversion/svnrdump/load_editor.c
(struct parse_baton): Add 'quiet' member.
(commit_callback, close_revision): Honor the parse baton's 'quiet' value.
(svn_rdump__load_dumpstream): Add 'quiet' parameter, tossed into the
parse baton structure.
Modified:
subversion/trunk/subversion/svnrdump/load_editor.c
subversion/trunk/subversion/svnrdump/svnrdump.c
subversion/trunk/subversion/svnrdump/svnrdump.h
Modified: subversion/trunk/subversion/svnrdump/load_editor.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svnrdump/load_editor.c?rev=1128340&r1=1128339&r2=1128340&view=diff
==============================================================================
--- subversion/trunk/subversion/svnrdump/load_editor.c (original)
+++ subversion/trunk/subversion/svnrdump/load_editor.c Fri May 27 14:55:31 2011
@@ -63,6 +63,9 @@ struct parse_baton
svn_ra_session_t *session;
svn_ra_session_t *aux_session;
+ /* To bleep, or not to bleep? (What kind of question is that?) */
+ svn_boolean_t quiet;
+
/* UUID found in the dumpstream, if any; NULL otherwise. */
const char *uuid;
@@ -338,8 +341,9 @@ commit_callback(const svn_commit_info_t
struct parse_baton *pb = rb->pb;
/* ### Don't print directly; generate a notification. */
- SVN_ERR(svn_cmdline_printf(pool, "* Loaded revision %ld.\n",
- commit_info->revision));
+ if (! pb->quiet)
+ SVN_ERR(svn_cmdline_printf(pool, "* Loaded revision %ld.\n",
+ commit_info->revision));
/* Add the mapping of the dumpstream revision to the committed revision. */
set_revision_mapping(pb->rev_map, rb->rev, commit_info->revision);
@@ -939,7 +943,8 @@ close_revision(void *baton)
if (rb->rev == 0)
{
/* ### Don't print directly; generate a notification. */
- SVN_ERR(svn_cmdline_printf(rb->pool, "* Loaded revision 0.\n"));
+ if (! rb->pb->quiet)
+ SVN_ERR(svn_cmdline_printf(rb->pool, "* Loaded revision 0.\n"));
}
else if (commit_editor)
{
@@ -1012,6 +1017,7 @@ svn_error_t *
svn_rdump__load_dumpstream(svn_stream_t *stream,
svn_ra_session_t *session,
svn_ra_session_t *aux_session,
+ svn_boolean_t quiet,
svn_cancel_func_t cancel_func,
void *cancel_baton,
apr_pool_t *pool)
@@ -1048,6 +1054,7 @@ svn_rdump__load_dumpstream(svn_stream_t
parse_baton = apr_pcalloc(pool, sizeof(*parse_baton));
parse_baton->session = session;
parse_baton->aux_session = aux_session;
+ parse_baton->quiet = quiet;
parse_baton->root_url = root_url;
parse_baton->parent_dir = parent_dir;
parse_baton->rev_map = apr_hash_make(pool);
Modified: subversion/trunk/subversion/svnrdump/svnrdump.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svnrdump/svnrdump.c?rev=1128340&r1=1128339&r2=1128340&view=diff
==============================================================================
--- subversion/trunk/subversion/svnrdump/svnrdump.c (original)
+++ subversion/trunk/subversion/svnrdump/svnrdump.c Fri May 27 14:55:31 2011
@@ -448,7 +448,7 @@ load_revisions(svn_ra_session_t *session
stdin_stream = svn_stream_from_aprfile2(stdin_file, FALSE, pool);
SVN_ERR(svn_rdump__load_dumpstream(stdin_stream, session, aux_session,
- check_cancel, NULL, pool));
+ quiet, check_cancel, NULL, pool));
SVN_ERR(svn_stream_close(stdin_stream));
Modified: subversion/trunk/subversion/svnrdump/svnrdump.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svnrdump/svnrdump.h?rev=1128340&r1=1128339&r2=1128340&view=diff
==============================================================================
--- subversion/trunk/subversion/svnrdump/svnrdump.h (original)
+++ subversion/trunk/subversion/svnrdump/svnrdump.h Fri May 27 14:55:31 2011
@@ -56,14 +56,16 @@ svn_rdump__get_dump_editor(const svn_del
* Load the dumpstream carried in @a stream to the location described
* by @a session. Use @a aux_session (which is opened to the same URL
* as @a session) for any secondary, out-of-band RA communications
- * required. Use @a pool for all memory allocations. Use @a
- * cancel_func and @a cancel_baton to check for user cancellation of
- * the operation (for timely-but-safe termination).
+ * required. If @a quiet is set, suppress notifications. Use @a pool
+ * for all memory allocations. Use @a cancel_func and @a cancel_baton
+ * to check for user cancellation of the operation (for
+ * timely-but-safe termination).
*/
svn_error_t *
svn_rdump__load_dumpstream(svn_stream_t *stream,
svn_ra_session_t *session,
svn_ra_session_t *aux_session,
+ svn_boolean_t quiet,
svn_cancel_func_t cancel_func,
void *cancel_baton,
apr_pool_t *pool);
