Author: rhuijben
Date: Tue May 3 23:45:29 2011
New Revision: 1099296
URL: http://svn.apache.org/viewvc?rev=1099296&view=rev
Log:
In libsvn_ra_serf rename repos_url(_str) to session_url(_str) to make it
obvious to all users that it is NOT repos_root.
No functional changes.
But reviewing this patch might be useful to find existing problems anyway,
as in our test suite these paths usually have the same value.
* subversion/libsvn_ra_serf/blame.c
(svn_ra_serf__get_file_revs): Update user.
* subversion/libsvn_ra_serf/commit.c
(get_version_url,
setup_copy_file_headers,
open_root,
add_file,
close_edit): Update user.
* subversion/libsvn_ra_serf/getlocks.c
(svn_ra_serf__get_locks): Update user.
* subversion/libsvn_ra_serf/locks.c
(svn_ra_serf__get_lock,
svn_ra_serf__lock,
svn_ra_serf__unlock): Update users.
* subversion/libsvn_ra_serf/merge.c
(svn_ra_serf__merge_create_req): Update user.
* subversion/libsvn_ra_serf/options.c
(capabilities_headers_iterator_callback): Update user.
* subversion/libsvn_ra_serf/property.c
(svn_ra_serf__get_baseline_info): Update user.
* subversion/libsvn_ra_serf/ra_serf.h
(svn_ra_serf__session_t): Rename two variables.
* subversion/libsvn_ra_serf/replay.c
(svn_ra_serf__replay,
svn_ra_serf__replay_range): Update users.
* subversion/libsvn_ra_serf/serf.c
(load_config,
svn_ra_serf__open,
svn_ra_serf__reparent,
svn_ra_serf__get_session_url,
svn_ra_serf__get_latest_revnum,
fetch_path_props,
svn_ra_serf__get_dir): Update users.
* subversion/libsvn_ra_serf/update.c
(end_report,
open_connection_if_needed,
svn_ra_serf__do_update,
svn_ra_serf__do_diff,
svn_ra_serf__do_status,
svn_ra_serf__do_switch,
svn_ra_serf__get_file): Update users.
* subversion/libsvn_ra_serf/util.c
(construct_realm): Update user.
Modified:
subversion/trunk/subversion/libsvn_ra_serf/blame.c
subversion/trunk/subversion/libsvn_ra_serf/commit.c
subversion/trunk/subversion/libsvn_ra_serf/getlocks.c
subversion/trunk/subversion/libsvn_ra_serf/locks.c
subversion/trunk/subversion/libsvn_ra_serf/merge.c
subversion/trunk/subversion/libsvn_ra_serf/options.c
subversion/trunk/subversion/libsvn_ra_serf/property.c
subversion/trunk/subversion/libsvn_ra_serf/ra_serf.h
subversion/trunk/subversion/libsvn_ra_serf/replay.c
subversion/trunk/subversion/libsvn_ra_serf/serf.c
subversion/trunk/subversion/libsvn_ra_serf/update.c
subversion/trunk/subversion/libsvn_ra_serf/util.c
Modified: subversion/trunk/subversion/libsvn_ra_serf/blame.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/blame.c?rev=1099296&r1=1099295&r2=1099296&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/blame.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/blame.c Tue May 3 23:45:29 2011
@@ -454,7 +454,7 @@ svn_ra_serf__get_file_revs(svn_ra_sessio
blame_ctx->done = FALSE;
SVN_ERR(svn_ra_serf__get_baseline_info(&basecoll_url, &relative_url, session,
- NULL, session->repos_url.path,
+ NULL, session->session_url.path,
end, NULL, pool));
req_url = svn_path_url_add_component2(basecoll_url, relative_url, pool);
Modified: subversion/trunk/subversion/libsvn_ra_serf/commit.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/commit.c?rev=1099296&r1=1099295&r2=1099296&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/commit.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/commit.c Tue May 3 23:45:29 2011
@@ -507,13 +507,13 @@ get_version_url(const char **checked_in_
baseline collection. */
SVN_ERR(svn_ra_serf__get_baseline_info(&bc_url, &bc_relpath,
session, conn,
- session->repos_url.path,
+ session->session_url.path,
base_revision, NULL, pool));
propfind_url = svn_path_url_add_component2(bc_url, bc_relpath, pool);
}
else
{
- propfind_url = session->repos_url.path;
+ propfind_url = session->session_url.path;
}
SVN_ERR(svn_ra_serf__deliver_props(&propfind_ctx, props, session, conn,
@@ -531,7 +531,7 @@ get_version_url(const char **checked_in_
if (!root_checkout)
return svn_error_createf(SVN_ERR_RA_DAV_REQUEST_FAILED, NULL,
_("Path '%s' not present"),
- session->repos_url.path);
+ session->session_url.path);
root_checkout = svn_urlpath__canonicalize(root_checkout, pool);
}
@@ -1062,7 +1062,7 @@ setup_copy_file_headers(serf_bucket_t *h
const char *absolute_uri;
/* The Dest URI must be absolute. Bummer. */
- uri = file->commit->session->repos_url;
+ uri = file->commit->session->session_url;
uri.path = (char*)file->url;
absolute_uri = apr_uri_unparse(pool, &uri, 0);
@@ -1084,7 +1084,7 @@ setup_copy_dir_headers(serf_bucket_t *he
const char *absolute_uri;
/* The Dest URI must be absolute. Bummer. */
- uri = dir->commit->session->repos_url;
+ uri = dir->commit->session->session_url;
if (USING_HTTPV2_COMMIT_SUPPORT(dir->commit))
{
@@ -1334,8 +1334,8 @@ open_root(void *edit_baton,
_("%s of '%s': %d %s (%s://%s)"),
handler->method, handler->path,
post_ctx->status, post_ctx->reason,
- ctx->session->repos_url.scheme,
- ctx->session->repos_url.hostinfo);
+ ctx->session->session_url.scheme,
+ ctx->session->session_url.hostinfo);
}
if (! (ctx->txn_name && ctx->txn_root_url && ctx->txn_url))
{
@@ -1346,7 +1346,7 @@ open_root(void *edit_baton,
/* Fixup the txn_root_url to point to the anchor of the commit. */
SVN_ERR(svn_ra_serf__get_relative_path(&rel_path,
- ctx->session->repos_url.path,
+ ctx->session->session_url.path,
ctx->session, NULL, dir_pool));
ctx->txn_root_url = svn_path_url_add_component2(ctx->txn_root_url,
rel_path, ctx->pool);
@@ -1371,7 +1371,7 @@ open_root(void *edit_baton,
SVN_ERR(svn_ra_serf__create_options_req(&opt_ctx, ctx->session,
ctx->session->conns[0],
- ctx->session->repos_url.path,
+ ctx->session->session_url.path,
ctx->pool));
SVN_ERR(svn_ra_serf__context_run_wait(
@@ -1411,8 +1411,8 @@ open_root(void *edit_baton,
_("%s of '%s': %d %s (%s://%s)"),
handler->method, handler->path,
mkact_ctx->status, mkact_ctx->reason,
- ctx->session->repos_url.scheme,
- ctx->session->repos_url.hostinfo);
+ ctx->session->session_url.scheme,
+ ctx->session->session_url.hostinfo);
}
/* Now go fetch our VCC and baseline so we can do a CHECKOUT. */
@@ -1899,7 +1899,7 @@ add_file(const char *path,
handler->conn = new_file->commit->conn;
handler->method = "HEAD";
handler->path = svn_path_url_add_component2(
- dir->commit->session->repos_url.path,
+ dir->commit->session->session_url.path,
path, new_file->pool);
handler->response_handler = svn_ra_serf__handle_status_only;
handler->response_baton = head_ctx;
@@ -2196,7 +2196,7 @@ close_edit(void *edit_baton,
/* MERGE our activity */
SVN_ERR(svn_ra_serf__merge_create_req(&merge_ctx, ctx->session,
ctx->session->conns[0],
- ctx->session->repos_url.path,
+ ctx->session->session_url.path,
merge_target,
ctx->lock_tokens,
ctx->keep_locks,
Modified: subversion/trunk/subversion/libsvn_ra_serf/getlocks.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/getlocks.c?rev=1099296&r1=1099295&r2=1099296&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/getlocks.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/getlocks.c Tue May 3 23:45:29
2011
@@ -331,7 +331,7 @@ svn_ra_serf__get_locks(svn_ra_session_t
const char *req_url, *rel_path;
int status_code;
- req_url = svn_path_url_add_component2(session->repos_url.path, path, pool);
+ req_url = svn_path_url_add_component2(session->session_url.path, path, pool);
SVN_ERR(svn_ra_serf__get_relative_path(&rel_path, req_url, session,
NULL, pool));
Modified: subversion/trunk/subversion/libsvn_ra_serf/locks.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/locks.c?rev=1099296&r1=1099295&r2=1099296&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/locks.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/locks.c Tue May 3 23:45:29 2011
@@ -515,7 +515,7 @@ svn_ra_serf__get_lock(svn_ra_session_t *
svn_error_t *err;
int status_code;
- req_url = svn_path_url_add_component2(session->repos_url.path, path, pool);
+ req_url = svn_path_url_add_component2(session->session_url.path, path, pool);
lock_ctx = apr_pcalloc(pool, sizeof(*lock_ctx));
@@ -609,7 +609,7 @@ svn_ra_serf__lock(svn_ra_session_t *ra_s
lock_ctx->lock->comment = comment;
lock_ctx->force = force;
- req_url = svn_path_url_add_component2(session->repos_url.path,
+ req_url = svn_path_url_add_component2(session->session_url.path,
lock_ctx->path, subpool);
handler = apr_pcalloc(subpool, sizeof(*handler));
@@ -735,7 +735,7 @@ svn_ra_serf__unlock(svn_ra_session_t *ra
unlock_ctx.force = force;
unlock_ctx.token = apr_pstrcat(subpool, "<", token, ">", (char *)NULL);
- req_url = svn_path_url_add_component2(session->repos_url.path, path,
+ req_url = svn_path_url_add_component2(session->session_url.path, path,
subpool);
handler = apr_pcalloc(subpool, sizeof(*handler));
Modified: subversion/trunk/subversion/libsvn_ra_serf/merge.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/merge.c?rev=1099296&r1=1099295&r2=1099296&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/merge.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/merge.c Tue May 3 23:45:29 2011
@@ -541,7 +541,7 @@ svn_ra_serf__merge_create_req(svn_ra_ser
merge_ctx->commit_info = svn_create_commit_info(pool);
- merge_ctx->merge_url = session->repos_url.path;
+ merge_ctx->merge_url = session->session_url.path;
handler = apr_pcalloc(pool, sizeof(*handler));
Modified: subversion/trunk/subversion/libsvn_ra_serf/options.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/options.c?rev=1099296&r1=1099295&r2=1099296&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/options.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/options.c Tue May 3 23:45:29
2011
@@ -332,7 +332,7 @@ capabilities_headers_iterator_callback(v
{
if (svn_cstring_casecmp(key, SVN_DAV_ROOT_URI_HEADER) == 0)
{
- orc->session->repos_root = orc->session->repos_url;
+ orc->session->repos_root = orc->session->session_url;
orc->session->repos_root.path = apr_pstrdup(orc->session->pool, val);
orc->session->repos_root_str =
svn_urlpath__canonicalize(
@@ -504,7 +504,7 @@ svn_ra_serf__exchange_capabilities(svn_r
/* This routine automatically fills in serf_sess->capabilities */
SVN_ERR(svn_ra_serf__create_options_req(&opt_ctx, serf_sess,
serf_sess->conns[0],
- serf_sess->repos_url.path, pool));
+ serf_sess->session_url.path, pool));
err = svn_ra_serf__context_run_wait(
svn_ra_serf__get_options_done_ptr(opt_ctx), serf_sess, pool);
@@ -522,7 +522,7 @@ svn_ra_serf__exchange_capabilities(svn_r
return svn_error_compose_create(
svn_ra_serf__error_on_status(opt_ctx->status_code,
- serf_sess->repos_url.path,
+ serf_sess->session_url.path,
opt_ctx->parser_ctx->location),
err);
}
Modified: subversion/trunk/subversion/libsvn_ra_serf/property.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/property.c?rev=1099296&r1=1099295&r2=1099296&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/property.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/property.c Tue May 3 23:45:29
2011
@@ -953,7 +953,7 @@ svn_ra_serf__get_baseline_info(const cha
/* No URL? No sweat. We'll use the session URL. */
if (! url)
- url = session->repos_url.path;
+ url = session->session_url.path;
/* If the caller didn't provide a specific connection for us to use,
we'll use the default one. */
@@ -979,7 +979,7 @@ svn_ra_serf__get_baseline_info(const cha
svn_ra_serf__options_context_t *opt_ctx;
SVN_ERR(svn_ra_serf__create_options_req(&opt_ctx, session, conn,
- session->repos_url.path,
+ session->session_url.path,
pool));
SVN_ERR(svn_ra_serf__context_run_wait(
svn_ra_serf__get_options_done_ptr(opt_ctx), session, pool));
Modified: subversion/trunk/subversion/libsvn_ra_serf/ra_serf.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/ra_serf.h?rev=1099296&r1=1099295&r2=1099296&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/ra_serf.h (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/ra_serf.h Tue May 3 23:45:29
2011
@@ -124,8 +124,8 @@ struct svn_ra_serf__session_t {
int cur_conn;
/* The URL that was passed into _open() */
- apr_uri_t repos_url;
- const char *repos_url_str;
+ apr_uri_t session_url;
+ const char *session_url_str;
/* The actual discovered root; may be NULL until we know it. */
apr_uri_t repos_root;
Modified: subversion/trunk/subversion/libsvn_ra_serf/replay.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/replay.c?rev=1099296&r1=1099295&r2=1099296&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/replay.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/replay.c Tue May 3 23:45:29 2011
@@ -647,7 +647,7 @@ svn_ra_serf__replay(svn_ra_session_t *ra
handler = apr_pcalloc(pool, sizeof(*handler));
handler->method = "REPORT";
- handler->path = session->repos_url_str;
+ handler->path = session->session_url_str;
handler->body_delegate = create_replay_body;
handler->body_delegate_baton = replay_ctx;
handler->body_type = "text/xml";
@@ -790,7 +790,7 @@ svn_ra_serf__replay_range(svn_ra_session
handler = apr_pcalloc(replay_ctx->src_rev_pool, sizeof(*handler));
handler->method = "REPORT";
- handler->path = session->repos_url_str;
+ handler->path = session->session_url_str;
handler->body_delegate = create_replay_body;
handler->body_delegate_baton = replay_ctx;
handler->conn = session->conns[0];
Modified: subversion/trunk/subversion/libsvn_ra_serf/serf.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/serf.c?rev=1099296&r1=1099295&r2=1099296&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/serf.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/serf.c Tue May 3 23:45:29 2011
@@ -187,7 +187,8 @@ load_config(svn_ra_serf__session_t *sess
if (exceptions)
{
apr_array_header_t *l = svn_cstring_split(exceptions, ",", TRUE, pool);
- is_exception = svn_cstring_match_glob_list(session->repos_url.hostname,
l);
+ is_exception = svn_cstring_match_glob_list(session->session_url.hostname,
+ l);
}
if (! is_exception)
{
@@ -214,7 +215,7 @@ load_config(svn_ra_serf__session_t *sess
if (config)
server_group = svn_config_find_group(config,
- session->repos_url.hostname,
+ session->session_url.hostname,
SVN_CONFIG_SECTION_GROUPS, pool);
else
server_group = NULL;
@@ -381,8 +382,8 @@ svn_ra_serf__open(svn_ra_session_t *sess
{
url.port = apr_uri_port_of_scheme(url.scheme);
}
- serf_sess->repos_url = url;
- serf_sess->repos_url_str = apr_pstrdup(serf_sess->pool, repos_URL);
+ serf_sess->session_url = url;
+ serf_sess->session_url_str = apr_pstrdup(serf_sess->pool, repos_URL);
serf_sess->using_ssl = (svn_cstring_casecmp(url.scheme, "https") == 0);
serf_sess->capabilities = apr_hash_make(serf_sess->pool);
@@ -450,7 +451,7 @@ svn_ra_serf__reparent(svn_ra_session_t *
apr_status_t status;
/* If it's the URL we already have, wave our hands and do nothing. */
- if (strcmp(session->repos_url_str, url) == 0)
+ if (strcmp(session->session_url_str, url) == 0)
{
return SVN_NO_ERROR;
}
@@ -463,8 +464,8 @@ svn_ra_serf__reparent(svn_ra_session_t *
_("Illegal repository URL '%s'"), url);
}
- session->repos_url.path = new_url.path;
- session->repos_url_str = apr_pstrdup(session->pool, url);
+ session->session_url.path = new_url.path;
+ session->session_url_str = apr_pstrdup(session->pool, url);
return SVN_NO_ERROR;
}
@@ -475,7 +476,7 @@ svn_ra_serf__get_session_url(svn_ra_sess
apr_pool_t *pool)
{
svn_ra_serf__session_t *session = ra_session->priv;
- *url = apr_pstrdup(pool, session->repos_url_str);
+ *url = apr_pstrdup(pool, session->session_url_str);
return SVN_NO_ERROR;
}
@@ -488,7 +489,7 @@ svn_ra_serf__get_latest_revnum(svn_ra_se
svn_ra_serf__session_t *session = ra_session->priv;
return svn_ra_serf__get_baseline_info(&basecoll_url, &relative_url, session,
- NULL, session->repos_url.path,
+ NULL, session->session_url.path,
SVN_INVALID_REVNUM, latest_revnum,
pool);
}
@@ -564,7 +565,7 @@ fetch_path_props(svn_ra_serf__propfind_c
apr_hash_t *props;
const char *path;
- path = session->repos_url.path;
+ path = session->session_url.path;
/* If we have a relative path, append it. */
if (rel_path)
@@ -892,7 +893,7 @@ svn_ra_serf__get_dir(svn_ra_session_t *r
apr_hash_t *props;
const char *path;
- path = session->repos_url.path;
+ path = session->session_url.path;
/* If we have a relative path, URI encode and append it. */
if (rel_path)
Modified: subversion/trunk/subversion/libsvn_ra_serf/update.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/update.c?rev=1099296&r1=1099295&r2=1099296&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/update.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/update.c Tue May 3 23:45:29 2011
@@ -1796,7 +1796,7 @@ end_report(svn_ra_serf__xml_parser_t *pa
{
const char *fs_path;
const char *full_path =
- svn_fspath__join(ctx->sess->repos_url.path,
+ svn_fspath__join(ctx->sess->session_url.path,
svn_path_uri_encode(info->name, info->pool),
info->pool);
@@ -2203,7 +2203,7 @@ open_connection_if_needed(svn_ra_serf__s
sess->conns[cur]->session = sess;
status = serf_connection_create2(&sess->conns[cur]->conn,
sess->context,
- sess->repos_url,
+ sess->session_url,
svn_ra_serf__conn_setup,
sess->conns[cur],
svn_ra_serf__conn_closed,
@@ -2617,7 +2617,7 @@ svn_ra_serf__do_update(svn_ra_session_t
return make_update_reporter(ra_session, reporter, report_baton,
revision_to_update_to,
- session->repos_url.path, NULL, update_target,
+ session->session_url.path, NULL, update_target,
depth, FALSE, TRUE, send_copyfrom_args,
update_editor, update_baton, pool);
}
@@ -2640,7 +2640,7 @@ svn_ra_serf__do_diff(svn_ra_session_t *r
return make_update_reporter(ra_session, reporter, report_baton,
revision,
- session->repos_url.path, versus_url, diff_target,
+ session->session_url.path, versus_url,
diff_target,
depth, ignore_ancestry, text_deltas, FALSE,
diff_editor, diff_baton, pool);
}
@@ -2660,7 +2660,7 @@ svn_ra_serf__do_status(svn_ra_session_t
return make_update_reporter(ra_session, reporter, report_baton,
revision,
- session->repos_url.path, NULL, status_target,
+ session->session_url.path, NULL, status_target,
depth, FALSE, FALSE, FALSE,
status_editor, status_baton, pool);
}
@@ -2681,7 +2681,7 @@ svn_ra_serf__do_switch(svn_ra_session_t
return make_update_reporter(ra_session, reporter, report_baton,
revision_to_switch_to,
- session->repos_url.path,
+ session->session_url.path,
switch_url, switch_target,
depth, TRUE, TRUE, FALSE /* TODO(sussman) */,
switch_editor, switch_baton, pool);
@@ -2709,7 +2709,7 @@ svn_ra_serf__get_file(svn_ra_session_t *
/* Fetch properties. */
fetch_props = apr_hash_make(pool);
- fetch_url = svn_path_url_add_component2(session->repos_url.path, path, pool);
+ fetch_url = svn_path_url_add_component2(session->session_url.path, path,
pool);
/* The simple case is if we want HEAD - then a GET on the fetch_url is fine.
*
Modified: subversion/trunk/subversion/libsvn_ra_serf/util.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/util.c?rev=1099296&r1=1099295&r2=1099296&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/util.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/util.c Tue May 3 23:45:29 2011
@@ -96,18 +96,18 @@ construct_realm(svn_ra_serf__session_t *
const char *realm;
apr_port_t port;
- if (session->repos_url.port_str)
+ if (session->session_url.port_str)
{
- port = session->repos_url.port;
+ port = session->session_url.port;
}
else
{
- port = apr_uri_port_of_scheme(session->repos_url.scheme);
+ port = apr_uri_port_of_scheme(session->session_url.scheme);
}
realm = apr_psprintf(pool, "%s://%s:%d",
- session->repos_url.scheme,
- session->repos_url.hostname,
+ session->session_url.scheme,
+ session->session_url.hostname,
port);
return realm;
@@ -1656,7 +1656,7 @@ svn_ra_serf__discover_vcc(const char **v
}
props = apr_hash_make(pool);
- path = session->repos_url.path;
+ path = session->session_url.path;
*vcc_url = NULL;
uuid = NULL;
@@ -1734,7 +1734,7 @@ svn_ra_serf__discover_vcc(const char **v
svn_path_component_count(relative_path));
/* Now recreate the root_url. */
- session->repos_root = session->repos_url;
+ session->repos_root = session->session_url;
session->repos_root.path = apr_pstrdup(session->pool, url_buf->data);
session->repos_root_str =
svn_urlpath__canonicalize(apr_uri_unparse(session->pool,
