Author: cmpilato
Date: Tue May 10 19:17:55 2011
New Revision: 1101603
URL: http://svn.apache.org/viewvc?rev=1101603&view=rev
Log:
Some API cleanup in ra_serf.
* subversion/libsvn_ra_serf/ra_serf.h
(svn_ra_serf__merge_create_req): Add real docstring. Remove 'path'
paramter.
* subversion/libsvn_ra_serf/merge.c
(struct svn_ra_serf__merge_context_t): Rename 'activity_url' to
'merge_resource_url'.
(create_merge_body): Track renamed structure variable.
(svn_ra_serf__merge_create_req): Rename 'activity_url' parameter to
'merge_resource_url', and track a similar change in the
svn_ra_serf__merge_context_t structure. Remove related TODO.
Also, lose unused 'path' parameter.
* subversion/libsvn_ra_serf/commit.c
(close_edit): Update call to svn_ra_serf__merge_create_req().
Modified:
subversion/trunk/subversion/libsvn_ra_serf/commit.c
subversion/trunk/subversion/libsvn_ra_serf/merge.c
subversion/trunk/subversion/libsvn_ra_serf/ra_serf.h
Modified: subversion/trunk/subversion/libsvn_ra_serf/commit.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/commit.c?rev=1101603&r1=1101602&r2=1101603&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/commit.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/commit.c Tue May 10 19:17:55 2011
@@ -2199,7 +2199,6 @@ 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->session_url.path,
merge_target,
ctx->lock_tokens,
ctx->keep_locks,
Modified: subversion/trunk/subversion/libsvn_ra_serf/merge.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/merge.c?rev=1101603&r1=1101602&r2=1101603&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/merge.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/merge.c Tue May 10 19:17:55 2011
@@ -98,8 +98,8 @@ struct svn_ra_serf__merge_context_t
apr_hash_t *lock_tokens;
svn_boolean_t keep_locks;
- const char *activity_url;
- const char *merge_url;
+ const char *merge_resource_url; /* URL of resource to be merged. */
+ const char *merge_url; /* URL at which the MERGE request is aimed. */
int status;
@@ -488,8 +488,8 @@ create_merge_body(serf_bucket_t **bkt,
svn_ra_serf__add_open_tag_buckets(body_bkt, alloc, "D:href", NULL);
svn_ra_serf__add_cdata_len_buckets(body_bkt, alloc,
- ctx->activity_url,
- strlen(ctx->activity_url));
+ ctx->merge_resource_url,
+ strlen(ctx->merge_resource_url));
svn_ra_serf__add_close_tag_buckets(body_bkt, alloc, "D:href");
svn_ra_serf__add_close_tag_buckets(body_bkt, alloc, "D:source");
@@ -516,17 +516,11 @@ create_merge_body(serf_bucket_t **bkt,
}
-/* ### FIXME: As of HTTPv2, this isn't necessarily merging an
- ### "activity". It might be merging a transaction. So,
- ### ACTIVITY_URL might be a transaction root URL, not an actual
- ### activity URL, etc. Probably should rename ACTIVITY_URL to
- ### MERGE_RESOURCE_URL or something. */
svn_error_t *
svn_ra_serf__merge_create_req(svn_ra_serf__merge_context_t **ret_ctx,
svn_ra_serf__session_t *session,
svn_ra_serf__connection_t *conn,
- const char *path,
- const char *activity_url,
+ const char *merge_resource_url,
apr_hash_t *lock_tokens,
svn_boolean_t keep_locks,
apr_pool_t *pool)
@@ -540,7 +534,7 @@ svn_ra_serf__merge_create_req(svn_ra_ser
merge_ctx->pool = pool;
merge_ctx->session = session;
- merge_ctx->activity_url = activity_url;
+ merge_ctx->merge_resource_url = merge_resource_url;
merge_ctx->lock_tokens = lock_tokens;
merge_ctx->keep_locks = keep_locks;
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=1101603&r1=1101602&r2=1101603&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/ra_serf.h (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/ra_serf.h Tue May 10 19:17:55
2011
@@ -1033,13 +1033,16 @@ svn_ra_serf__merge_lock_token_list(apr_h
serf_bucket_alloc_t *alloc,
apr_pool_t *pool);
-/* Create an MERGE request */
+/* Create an MERGE request aimed at the SESSION url, requesting the
+ merge of the resource identified by MERGE_RESOURCE_URL.
+ LOCK_TOKENS is a hash mapping paths to lock tokens owned by the
+ client. If KEEP_LOCKS is set, instruct the server to not release
+ locks set on the paths included in this commit. */
svn_error_t *
svn_ra_serf__merge_create_req(svn_ra_serf__merge_context_t **merge_ctx,
svn_ra_serf__session_t *session,
svn_ra_serf__connection_t *conn,
- const char *path,
- const char *activity_url,
+ const char *merge_resource_url,
apr_hash_t *lock_tokens,
svn_boolean_t keep_locks,
apr_pool_t *pool);
