Hi Jonathan,
Jonathan Nieder writes:
> Ramkumar Ramachandra wrote:
>
> > Add a basic SVN command-line client along with a Makefile that does
> > just enough to establish a connection with the ASF subversion server;
>
> Thanks for splitting this out.
Thanks for getting the review process started :)
> Let’s see what’s needed to set up a connection:
>
> > +++ b/Makefile
> > @@ -0,0 +1,8 @@
> > +svndumpr: *.c *.h
> > + $(CC) -Wall -Werror -DAPR_POOL_DEBUG -ggdb3 -O0 -o $@ svndumpr.c
> > -lsvn_client-1 -I. -I/usr/include/subversion-1 -I/usr/include/apr-1.0
>
> Links against libsvnclient-1. Good.
>
> I assume the details of the Makefile are not important, since it is
> probably going to be revamped in the style of the svn build system
> anyway.
Right.
> > +++ b/svndumpr.c
> > @@ -0,0 +1,68 @@
> [...]
> > +svn_error_t *populate_context()
> [...]
> > +svn_error_t *open_connection(const char *url)
> [...]
> > +svn_error_t *replay_range(svn_revnum_t start_revision, svn_revnum_t
> > end_revision)
>
> Why not static?
Changed (see end of email).
> > +svn_error_t *populate_context()
> > +{
> > + const char *http_library;
> > +
> > + SVN_ERR(svn_config_get_config(&(ctx->config), NULL, pool));
> > +
> > + http_library = getenv("SVN_HTTP_LIBRARY");
> > + if (http_library)
> > + svn_config_set(apr_hash_get(ctx->config, "servers",
> > APR_HASH_KEY_STRING),
> > + "global", "http-library", http_library);
>
> I tried googling for this SVN_HTTP_LIBRARY setting, but no
> useful hints. I take it that this overrides the [global] http-library
> setting from ~/.subversion/servers? Do other commands honor this
> environment variable or just svndumpr?
I originally had this to switch between neon and serf libraries. It
seems that this is no more necessary.
> [...]
> > +svn_error_t *open_connection(const char *url)
> > +{
> > + SVN_ERR(svn_config_ensure (NULL, pool));
> > + SVN_ERR(svn_client_create_context (&ctx, pool));
> > + SVN_ERR(svn_ra_initialize(pool));
> > +
> > +#if defined(WIN32) || defined(__CYGWIN__)
> > + if (getenv("SVN_ASP_DOT_NET_HACK"))
> > + SVN_ERR(svn_wc_set_adm_dir("_svn", pool));
> > +#endif
>
> I guess it’s water under the bridge now (from 5 years ago), but why do
> clients have to do this themselves? It would not be so difficult for
> libsvnclient to automatically set the admin dir according to whether
> SVN_ASP_DOT_NET_HACK is set or not, or at least to provide a single
> function to call and do so.
Good question. I copied this out from some legacy code in the
Subversion trunk. Additionally, since I don't have a working copy,
this is completely unnecessary. Removed now.
> > +
> > + SVN_ERR(populate_context());
> > + SVN_ERR(svn_cmdline_create_auth_baton(&(ctx->auth_baton), TRUE,
> > + NULL, NULL, NULL, FALSE,
> > + FALSE, NULL, NULL, NULL,
> > + pool));
>
> Maybe comments would help, for the boolean arguments.
Fixed.
> > + SVN_ERR(svn_client_open_ra_session(&session, url, ctx, pool));
> > + return SVN_NO_ERROR;
> > +}
> > +
> > +svn_error_t *replay_range(svn_revnum_t start_revision, svn_revnum_t
> > end_revision)
> > +{
> > + return SVN_NO_ERROR;
> > +}
>
> Might be more self-explanatory without this function, but that
> is just nitpicking.
I've filled in the function in a future patch. It's just to say that
I'm "opening a connection and then calling replay_range, in that
order". Yes, replay_range does nothing in this patch.
> > +
> > +int main()
> > +{
> > + const char url[] = "http://svn.apache.org/repos/asf";;
> > + svn_revnum_t start_revision = 1, end_revision = 500;
> > + if (svn_cmdline_init ("svndumpr", stderr) != EXIT_SUCCESS)
> > + return 1;
> > +
> > + pool = svn_pool_create(NULL);
> > +
> > + SVN_INT_ERR(open_connection(url));
> > + SVN_INT_ERR(replay_range(start_revision, end_revision));
> > +
> > + svn_pool_destroy(pool);
> > +
> > + return 0;
> > +}
>
> So: this is an expensive no-op.
Exactly. I built up the patches so that at every stage, the program
compiles and runs fine, implementing part of full functionality.
Here's a diff of the modifications I made after your review:
diff --git a/svndumpr.c b/svndumpr.c
index 011941f..f3117aa 100644
--- a/svndumpr.c
+++ b/svndumpr.c
@@ -76,31 +76,19 @@ static svn_error_t *replay_revend(svn_revnum_t revision,
return SVN_NO_ERROR;
}
-svn_error_t *populate_context()
-{
- const char *http_library;
-
- SVN_ERR(svn_config_get_config(&(ctx->config), NULL, pool));
-
- http_library = getenv("SVN_HTTP_LIBRARY");
- if (http_library)
- svn_config_set(apr_hash_get(ctx->config, "servers",
APR_HASH_KEY_STRING),
- "global", "http-library", http_library);
- return SVN_NO_ERROR;
-}
-
-svn_error_t *open_connection(const char *url)
+static svn_error_t *open_connection(const char *url)
{
SVN_ERR(svn_config_ensure (NULL, pool));
SVN_ERR(svn_client_create_context (&ctx, pool));
SVN_ERR(svn_ra_initialize(pool));
-#if defined(WIN32) || defined(__CYGWIN__)
- if (getenv("SVN_ASP_DOT_NET_HACK"))
- SVN_ERR(svn_wc_set_adm_dir("_svn", pool));
-#endif
+ SVN_ERR(svn_config_get_config(&(ctx->config), NULL, pool));
- SVN_ERR(populate_context());
+ /* Populte ctx->auth_baton with the auth baton
+ non-interactively. Arguments 3, 4 and 5 are for username,
+ password and config_dir which is NULL in this case. Set
+ no_auth_cache and trust_serv_cert to FALSE, don't provide a
+ config, and omit cancel_func/ cancel_baton */
SVN_ERR(svn_cmdline_create_auth_baton(&(ctx->auth_baton), TRUE,
NULL, NULL, NULL, FALSE,
FALSE, NULL, NULL, NULL,
@@ -109,7 +97,7 @@ svn_error_t *open_connection(const char *url)
return SVN_NO_ERROR;
}
-svn_error_t *replay_range(svn_revnum_t start_revision, svn_revnum_t
end_revision)
+static svn_error_t *replay_range(svn_revnum_t start_revision, svn_revnum_t
end_revision)
{
const svn_delta_editor_t *dump_editor, *debug_editor;
void *debug_baton, *dump_baton;
-- Ram
