You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by da...@apache.org on 2010/09/10 17:02:35 UTC
svn commit: r995818 - in
/subversion/branches/atomic-revprop/subversion/libsvn_ra_serf: commit.c
property.c ra_serf.h replay.c serf.c update.c
Author: danielsh
Date: Fri Sep 10 15:02:35 2010
New Revision: 995818
URL: http://svn.apache.org/viewvc?rev=995818&view=rev
Log:
On the atomic-revprop branch:
Revert the ra_serf portions of r983269 and r983225.
Modified:
subversion/branches/atomic-revprop/subversion/libsvn_ra_serf/commit.c
subversion/branches/atomic-revprop/subversion/libsvn_ra_serf/property.c
subversion/branches/atomic-revprop/subversion/libsvn_ra_serf/ra_serf.h
subversion/branches/atomic-revprop/subversion/libsvn_ra_serf/replay.c
subversion/branches/atomic-revprop/subversion/libsvn_ra_serf/serf.c
subversion/branches/atomic-revprop/subversion/libsvn_ra_serf/update.c
Modified: subversion/branches/atomic-revprop/subversion/libsvn_ra_serf/commit.c
URL: http://svn.apache.org/viewvc/subversion/branches/atomic-revprop/subversion/libsvn_ra_serf/commit.c?rev=995818&r1=995817&r2=995818&view=diff
==============================================================================
--- subversion/branches/atomic-revprop/subversion/libsvn_ra_serf/commit.c (original)
+++ subversion/branches/atomic-revprop/subversion/libsvn_ra_serf/commit.c Fri Sep 10 15:02:35 2010
@@ -108,7 +108,6 @@ typedef struct {
/* Changed and removed properties. */
apr_hash_t *changed_props;
apr_hash_t *removed_props;
- apr_hash_t *atomic_props;
/* In HTTP v2, this is the file/directory version we think we're changing. */
svn_revnum_t base_revision;
@@ -640,17 +639,16 @@ checkout_file(file_context_t *file)
/* Helper function for proppatch_walker() below. */
static svn_error_t *
get_encoding_and_cdata(const char **encoding_p,
- const svn_string_t **encoded_value_p,
+ serf_bucket_t **cdata_bkt_p,
serf_bucket_alloc_t *alloc,
const svn_string_t *value,
apr_pool_t *pool)
{
- if (value == NULL)
- {
- *encoding_p = NULL;
- *encoded_value_p = NULL;
- return SVN_NO_ERROR;
- }
+ const char *encoding;
+ const char *cdata;
+ apr_size_t len; /* of cdata */
+
+ SVN_ERR_ASSERT(value);
/* If a property is XML-safe, XML-encode it. Else, base64-encode
it. */
@@ -658,15 +656,23 @@ get_encoding_and_cdata(const char **enco
{
svn_stringbuf_t *xml_esc = NULL;
svn_xml_escape_cdata_string(&xml_esc, value, pool);
- *encoding_p = NULL;
- *encoded_value_p = svn_string_create_from_buf(xml_esc, pool);
+ encoding = NULL;
+ cdata = xml_esc->data;
+ len = xml_esc->len;
}
else
{
- *encoding_p = "base64";
- *encoded_value_p = svn_base64_encode_string2(value, TRUE, pool);
+ const svn_string_t *base64ed = svn_base64_encode_string2(value, TRUE,
+ pool);
+ encoding = "base64";
+ cdata = base64ed->data;
+ len = base64ed->len;
}
+ /* ENCODING, CDATA, and LEN are now set. */
+
+ *encoding_p = encoding;
+ *cdata_bkt_p = SERF_BUCKET_SIMPLE_STRING_LEN(cdata, len, alloc);
return SVN_NO_ERROR;
}
@@ -674,14 +680,12 @@ static svn_error_t *
proppatch_walker(void *baton,
const char *ns, apr_ssize_t ns_len,
const char *name, apr_ssize_t name_len,
- const svn_string_t *const *old_val_p,
const svn_string_t *val,
apr_pool_t *pool)
{
serf_bucket_t *body_bkt = baton;
serf_bucket_t *cdata_bkt;
serf_bucket_alloc_t *alloc;
- const svn_string_t *encoded_value;
const char *encoding;
char *prop_name;
@@ -695,66 +699,12 @@ proppatch_walker(void *baton,
alloc = body_bkt->allocator;
- SVN_ERR(get_encoding_and_cdata(&encoding, &encoded_value, alloc, val, pool));
- if (encoded_value)
- {
- cdata_bkt = SERF_BUCKET_SIMPLE_STRING_LEN(encoded_value->data,
- encoded_value->len,
- alloc);
- }
- else
- {
- cdata_bkt = NULL;
- }
+ SVN_ERR(get_encoding_and_cdata(&encoding, &cdata_bkt, alloc, val, pool));
- if (cdata_bkt)
- svn_ra_serf__add_open_tag_buckets(body_bkt, alloc, prop_name,
- "V:encoding", encoding,
- NULL);
- else
- svn_ra_serf__add_open_tag_buckets(body_bkt, alloc, prop_name,
- "V:" SVN_DAV__OLD_VALUE__ABSENT, "1",
- NULL);
-
- if (old_val_p)
- {
- const char *encoding2;
- const svn_string_t *encoded_value2;
- serf_bucket_t *cdata_bkt2;
-
- SVN_ERR(get_encoding_and_cdata(&encoding2, &encoded_value2,
- alloc, *old_val_p, pool));
-
- if (encoded_value2)
- {
- cdata_bkt2 = SERF_BUCKET_SIMPLE_STRING_LEN(encoded_value2->data,
- encoded_value2->len,
- alloc);
- }
- else
- {
- cdata_bkt2 = NULL;
- }
-
- if (cdata_bkt2)
- svn_ra_serf__add_open_tag_buckets(body_bkt, alloc,
- SVN_DAV__OLD_VALUE,
- "V:encoding", encoding2,
- NULL);
- else
- svn_ra_serf__add_open_tag_buckets(body_bkt, alloc,
- SVN_DAV__OLD_VALUE,
- "V:" SVN_DAV__OLD_VALUE__ABSENT, "1",
- NULL);
-
- if (cdata_bkt2)
- serf_bucket_aggregate_append(body_bkt, cdata_bkt2);
-
- svn_ra_serf__add_close_tag_buckets(body_bkt, alloc,
- SVN_DAV__OLD_VALUE);
- }
- if (cdata_bkt)
- serf_bucket_aggregate_append(body_bkt, cdata_bkt);
+ svn_ra_serf__add_open_tag_buckets(body_bkt, alloc, prop_name,
+ "V:encoding", encoding,
+ NULL);
+ serf_bucket_aggregate_append(body_bkt, cdata_bkt);
svn_ra_serf__add_close_tag_buckets(body_bkt, alloc, prop_name);
return SVN_NO_ERROR;
@@ -814,26 +764,13 @@ create_proppatch_body(serf_bucket_t **bk
"xmlns:S", SVN_DAV_PROP_NS_SVN,
NULL);
- if (ctx->atomic_props && apr_hash_count(ctx->atomic_props) > 0)
- {
- svn_ra_serf__add_open_tag_buckets(body_bkt, alloc, "D:set", NULL);
- svn_ra_serf__add_open_tag_buckets(body_bkt, alloc, "D:prop", NULL);
-
- svn_ra_serf__walk_all_props(ctx->atomic_props, ctx->path,
- SVN_INVALID_REVNUM, TRUE,
- proppatch_walker, body_bkt, pool);
-
- svn_ra_serf__add_close_tag_buckets(body_bkt, alloc, "D:prop");
- svn_ra_serf__add_close_tag_buckets(body_bkt, alloc, "D:set");
- }
-
if (apr_hash_count(ctx->changed_props) > 0)
{
svn_ra_serf__add_open_tag_buckets(body_bkt, alloc, "D:set", NULL);
svn_ra_serf__add_open_tag_buckets(body_bkt, alloc, "D:prop", NULL);
SVN_ERR(svn_ra_serf__walk_all_props(ctx->changed_props, ctx->path,
- SVN_INVALID_REVNUM, FALSE,
+ SVN_INVALID_REVNUM,
proppatch_walker, body_bkt, pool));
svn_ra_serf__add_close_tag_buckets(body_bkt, alloc, "D:prop");
@@ -846,7 +783,7 @@ create_proppatch_body(serf_bucket_t **bk
svn_ra_serf__add_open_tag_buckets(body_bkt, alloc, "D:prop", NULL);
SVN_ERR(svn_ra_serf__walk_all_props(ctx->removed_props, ctx->path,
- SVN_INVALID_REVNUM, FALSE,
+ SVN_INVALID_REVNUM,
proppatch_walker, body_bkt, pool));
svn_ra_serf__add_close_tag_buckets(body_bkt, alloc, "D:prop");
@@ -1384,7 +1321,7 @@ open_root(void *edit_baton,
}
svn_ra_serf__set_prop(proppatch_ctx->changed_props, proppatch_ctx->path,
- ns, name, NULL, value, proppatch_ctx->pool);
+ ns, name, value, proppatch_ctx->pool);
}
SVN_ERR(proppatch_resource(proppatch_ctx, dir->commit, ctx->pool));
@@ -1677,13 +1614,13 @@ change_dir_prop(void *dir_baton,
{
value = svn_string_dup(value, dir->pool);
svn_ra_serf__set_prop(dir->changed_props, proppatch_target,
- ns, name, NULL, value, dir->pool);
+ ns, name, value, dir->pool);
}
else
{
value = svn_string_create("", dir->pool);
svn_ra_serf__set_prop(dir->removed_props, proppatch_target,
- ns, name, NULL, value, dir->pool);
+ ns, name, value, dir->pool);
}
return SVN_NO_ERROR;
@@ -1929,14 +1866,14 @@ change_file_prop(void *file_baton,
{
value = svn_string_dup(value, file->pool);
svn_ra_serf__set_prop(file->changed_props, file->url,
- ns, name, NULL, value, file->pool);
+ ns, name, value, file->pool);
}
else
{
value = svn_string_create("", file->pool);
svn_ra_serf__set_prop(file->removed_props, file->url,
- ns, name, NULL, value, file->pool);
+ ns, name, value, file->pool);
}
return SVN_NO_ERROR;
@@ -2292,6 +2229,9 @@ svn_ra_serf__change_rev_prop(svn_ra_sess
/* How did you get past the same check in svn_ra_change_rev_prop2()? */
SVN_ERR_ASSERT(capable);
+
+ /* ### server-side support hasn't been implemented yet */
+ SVN__NOT_IMPLEMENTED();
}
commit = apr_pcalloc(pool, sizeof(*commit));
@@ -2340,25 +2280,19 @@ svn_ra_serf__change_rev_prop(svn_ra_sess
proppatch_ctx->path = proppatch_target;
proppatch_ctx->changed_props = apr_hash_make(proppatch_ctx->pool);
proppatch_ctx->removed_props = apr_hash_make(proppatch_ctx->pool);
- proppatch_ctx->atomic_props = apr_hash_make(proppatch_ctx->pool);
proppatch_ctx->base_revision = SVN_INVALID_REVNUM;
- if (old_value_p)
- {
- svn_ra_serf__set_prop(proppatch_ctx->atomic_props, proppatch_ctx->path,
- ns, name, old_value_p, value, proppatch_ctx->pool);
- }
- else if (value)
+ if (value)
{
svn_ra_serf__set_prop(proppatch_ctx->changed_props, proppatch_ctx->path,
- ns, name, old_value_p, value, proppatch_ctx->pool);
+ ns, name, value, proppatch_ctx->pool);
}
else
{
value = svn_string_create("", proppatch_ctx->pool);
svn_ra_serf__set_prop(proppatch_ctx->removed_props, proppatch_ctx->path,
- ns, name, old_value_p, value, proppatch_ctx->pool);
+ ns, name, value, proppatch_ctx->pool);
}
err = proppatch_resource(proppatch_ctx, commit, proppatch_ctx->pool);
Modified: subversion/branches/atomic-revprop/subversion/libsvn_ra_serf/property.c
URL: http://svn.apache.org/viewvc/subversion/branches/atomic-revprop/subversion/libsvn_ra_serf/property.c?rev=995818&r1=995817&r2=995818&view=diff
==============================================================================
--- subversion/branches/atomic-revprop/subversion/libsvn_ra_serf/property.c (original)
+++ subversion/branches/atomic-revprop/subversion/libsvn_ra_serf/property.c Fri Sep 10 15:02:35 2010
@@ -175,7 +175,6 @@ void
svn_ra_serf__set_ver_prop(apr_hash_t *props,
const char *path, svn_revnum_t rev,
const char *ns, const char *name,
- const svn_string_t *const *old_value_p,
const svn_string_t *val, apr_pool_t *pool)
{
apr_hash_t *ver_props, *path_props, *ns_props;
@@ -209,30 +208,17 @@ svn_ra_serf__set_ver_prop(apr_hash_t *pr
apr_hash_set(path_props, ns, APR_HASH_KEY_STRING, ns_props);
}
- if (old_value_p)
- {
- /* This must be PROPPATCH_CTX->ATOMIC_PROPS. */
- svn_dav__two_props_t *both_values;
- both_values = apr_palloc(pool, sizeof(*both_values));
- both_values->old_value_p = old_value_p;
- both_values->new_value = val;
- apr_hash_set(ns_props, name, APR_HASH_KEY_STRING, both_values);
- }
- else
- {
- apr_hash_set(ns_props, name, APR_HASH_KEY_STRING, val);
- }
+ apr_hash_set(ns_props, name, APR_HASH_KEY_STRING, val);
}
void
svn_ra_serf__set_prop(apr_hash_t *props,
const char *path,
const char *ns, const char *name,
- const svn_string_t *const *old_value_p,
const svn_string_t *val, apr_pool_t *pool)
{
svn_ra_serf__set_ver_prop(props, path, SVN_INVALID_REVNUM, ns, name,
- old_value_p, val, pool);
+ val, pool);
}
static prop_info_t *
@@ -384,7 +370,7 @@ end_propfind(svn_ra_serf__xml_parser_t *
/* set the return props and update our cache too. */
svn_ra_serf__set_ver_prop(ctx->ret_props,
ctx->current_path, ctx->rev,
- ns, pname, NULL, val_str,
+ ns, pname, val_str,
ctx->pool);
if (ctx->cache_props)
{
@@ -395,7 +381,7 @@ end_propfind(svn_ra_serf__xml_parser_t *
svn_ra_serf__set_ver_prop(ctx->sess->cached_props,
ctx->current_path, ctx->rev,
- ns, pname, NULL, val_str,
+ ns, pname, val_str,
ctx->sess->pool);
}
@@ -556,8 +542,7 @@ check_cache(apr_hash_t *ret_props,
if (val)
{
svn_ra_serf__set_ver_prop(ret_props, path, rev,
- prop->namespace, prop->name, NULL,
- val, pool);
+ prop->namespace, prop->name, val, pool);
}
else
{
@@ -757,7 +742,6 @@ svn_error_t *
svn_ra_serf__walk_all_props(apr_hash_t *props,
const char *name,
svn_revnum_t rev,
- svn_boolean_t values_are_proppairs,
svn_ra_serf__walker_visitor_t walker,
void *baton,
apr_pool_t *pool)
@@ -796,18 +780,8 @@ svn_ra_serf__walk_all_props(apr_hash_t *
apr_hash_this(name_hi, &prop_name, &prop_len, &prop_val);
/* use a subpool? */
- if (values_are_proppairs)
- {
- svn_dav__two_props_t *both_values = prop_val;
- SVN_ERR(walker(baton, ns_name, ns_len, prop_name, prop_len,
- both_values->old_value_p, both_values->new_value,
- pool));
- }
- else
- {
- SVN_ERR(walker(baton, ns_name, ns_len, prop_name, prop_len,
- NULL, prop_val, pool));
- }
+ SVN_ERR(walker(baton, ns_name, ns_len, prop_name, prop_len,
+ prop_val, pool));
}
}
@@ -954,7 +928,6 @@ svn_error_t *
svn_ra_serf__set_flat_props(void *baton,
const char *ns, apr_ssize_t ns_len,
const char *name, apr_ssize_t name_len,
- const svn_string_t *const *ignored,
const svn_string_t *val,
apr_pool_t *pool)
{
@@ -966,7 +939,6 @@ svn_error_t *
svn_ra_serf__set_bare_props(void *baton,
const char *ns, apr_ssize_t ns_len,
const char *name, apr_ssize_t name_len,
- const svn_string_t *const *ignored,
const svn_string_t *val,
apr_pool_t *pool)
{
Modified: subversion/branches/atomic-revprop/subversion/libsvn_ra_serf/ra_serf.h
URL: http://svn.apache.org/viewvc/subversion/branches/atomic-revprop/subversion/libsvn_ra_serf/ra_serf.h?rev=995818&r1=995817&r2=995818&view=diff
==============================================================================
--- subversion/branches/atomic-revprop/subversion/libsvn_ra_serf/ra_serf.h (original)
+++ subversion/branches/atomic-revprop/subversion/libsvn_ra_serf/ra_serf.h Fri Sep 10 15:02:35 2010
@@ -960,9 +960,6 @@ svn_ra_serf__retrieve_props(apr_hash_t *
apr_pool_t *pool);
/* Set PROPS for PATH at REV revision with a NS:NAME VAL.
- *
- * If OLD_VALUE_P is not NULL, it must equal the current value of the
- * revprop.
*
* The POOL governs allocation.
*/
@@ -970,7 +967,6 @@ void
svn_ra_serf__set_ver_prop(apr_hash_t *props,
const char *path, svn_revnum_t rev,
const char *ns, const char *name,
- const svn_string_t *const *old_value_p,
const svn_string_t *val, apr_pool_t *pool);
#define svn_ra_serf__set_rev_prop svn_ra_serf__set_ver_prop
@@ -980,7 +976,6 @@ typedef svn_error_t *
(*svn_ra_serf__walker_visitor_t)(void *baton,
const char *ns, apr_ssize_t ns_len,
const char *name, apr_ssize_t name_len,
- const svn_string_t *const *old_val_p,
const svn_string_t *val,
apr_pool_t *pool);
@@ -988,7 +983,6 @@ svn_error_t *
svn_ra_serf__walk_all_props(apr_hash_t *props,
const char *name,
svn_revnum_t rev,
- svn_boolean_t values_are_proppairs,
svn_ra_serf__walker_visitor_t walker,
void *baton,
apr_pool_t *pool);
@@ -1024,7 +1018,6 @@ svn_error_t *
svn_ra_serf__set_flat_props(void *baton,
const char *ns, apr_ssize_t ns_len,
const char *name, apr_ssize_t name_len,
- const svn_string_t *const *ignored,
const svn_string_t *val,
apr_pool_t *pool);
@@ -1032,7 +1025,6 @@ svn_error_t *
svn_ra_serf__set_bare_props(void *baton,
const char *ns, apr_ssize_t ns_len,
const char *name, apr_ssize_t name_len,
- const svn_string_t *const *ignored,
const svn_string_t *val,
apr_pool_t *pool);
@@ -1057,7 +1049,6 @@ svn_ra_serf__get_prop(apr_hash_t *props,
void
svn_ra_serf__set_prop(apr_hash_t *props, const char *path,
const char *ns, const char *name,
- const svn_string_t *const *old_value_p,
const svn_string_t *val, apr_pool_t *pool);
/** MERGE-related functions **/
Modified: subversion/branches/atomic-revprop/subversion/libsvn_ra_serf/replay.c
URL: http://svn.apache.org/viewvc/subversion/branches/atomic-revprop/subversion/libsvn_ra_serf/replay.c?rev=995818&r1=995817&r2=995818&view=diff
==============================================================================
--- subversion/branches/atomic-revprop/subversion/libsvn_ra_serf/replay.c (original)
+++ subversion/branches/atomic-revprop/subversion/libsvn_ra_serf/replay.c Fri Sep 10 15:02:35 2010
@@ -184,7 +184,7 @@ start_replay(svn_ra_serf__xml_parser_t *
ctx->dst_rev_pool = svn_pool_create(ctx->src_rev_pool);
ctx->props = apr_hash_make(ctx->dst_rev_pool);
SVN_ERR(svn_ra_serf__walk_all_props(ctx->revs_props, ctx->report_target,
- ctx->revision, FALSE,
+ ctx->revision,
svn_ra_serf__set_bare_props,
ctx->props, ctx->dst_rev_pool));
if (ctx->revstart_func)
Modified: subversion/branches/atomic-revprop/subversion/libsvn_ra_serf/serf.c
URL: http://svn.apache.org/viewvc/subversion/branches/atomic-revprop/subversion/libsvn_ra_serf/serf.c?rev=995818&r1=995817&r2=995818&view=diff
==============================================================================
--- subversion/branches/atomic-revprop/subversion/libsvn_ra_serf/serf.c (original)
+++ subversion/branches/atomic-revprop/subversion/libsvn_ra_serf/serf.c Fri Sep 10 15:02:35 2010
@@ -545,7 +545,7 @@ svn_ra_serf__rev_proplist(svn_ra_session
propfind_path, rev, "0", all_props,
pool));
- SVN_ERR(svn_ra_serf__walk_all_props(props, propfind_path, rev, FALSE,
+ SVN_ERR(svn_ra_serf__walk_all_props(props, propfind_path, rev,
svn_ra_serf__set_bare_props, *ret_props,
pool));
@@ -692,7 +692,6 @@ static svn_error_t *
dirent_walker(void *baton,
const char *ns, apr_ssize_t ns_len,
const char *name, apr_ssize_t name_len,
- const svn_string_t *const *ignored,
const svn_string_t *val,
apr_pool_t *pool)
{
@@ -778,7 +777,7 @@ path_dirent_walker(void *baton,
apr_hash_set(dirents->base_paths, base_name, APR_HASH_KEY_STRING, entry);
}
- return dirent_walker(entry, ns, ns_len, name, name_len, NULL, val, pool);
+ return dirent_walker(entry, ns, ns_len, name, name_len, val, pool);
}
static svn_error_t *
@@ -812,8 +811,8 @@ svn_ra_serf__stat(svn_ra_session_t *ra_s
entry = apr_pcalloc(pool, sizeof(*entry));
- SVN_ERR(svn_ra_serf__walk_all_props(props, path, fetched_rev, FALSE,
- dirent_walker, entry, pool));
+ SVN_ERR(svn_ra_serf__walk_all_props(props, path, fetched_rev, dirent_walker,
+ entry, pool));
*dirent = entry;
@@ -926,7 +925,7 @@ svn_ra_serf__get_dir(svn_ra_session_t *r
/* Check if the path is really a directory. */
SVN_ERR(resource_is_directory (props, path, revision));
- SVN_ERR(svn_ra_serf__walk_all_props(props, path, revision, FALSE,
+ SVN_ERR(svn_ra_serf__walk_all_props(props, path, revision,
svn_ra_serf__set_flat_props,
*ret_props, pool));
}
Modified: subversion/branches/atomic-revprop/subversion/libsvn_ra_serf/update.c
URL: http://svn.apache.org/viewvc/subversion/branches/atomic-revprop/subversion/libsvn_ra_serf/update.c?rev=995818&r1=995817&r2=995818&view=diff
==============================================================================
--- subversion/branches/atomic-revprop/subversion/libsvn_ra_serf/update.c (original)
+++ subversion/branches/atomic-revprop/subversion/libsvn_ra_serf/update.c Fri Sep 10 15:02:35 2010
@@ -439,7 +439,6 @@ static svn_error_t *
set_file_props(void *baton,
const char *ns, apr_ssize_t ns_len,
const char *name, apr_ssize_t name_len,
- const svn_string_t *const *ignored,
const svn_string_t *val,
apr_pool_t *pool)
{
@@ -461,7 +460,6 @@ static svn_error_t *
set_dir_props(void *baton,
const char *ns, apr_ssize_t ns_len,
const char *name, apr_ssize_t name_len,
- const svn_string_t *const *ignored,
const svn_string_t *val,
apr_pool_t *pool)
{
@@ -475,7 +473,6 @@ static svn_error_t *
remove_file_props(void *baton,
const char *ns, apr_ssize_t ns_len,
const char *name, apr_ssize_t name_len,
- const svn_string_t *const *ignored,
const svn_string_t *val,
apr_pool_t *pool)
{
@@ -491,7 +488,6 @@ static svn_error_t *
remove_dir_props(void *baton,
const char *ns, apr_ssize_t ns_len,
const char *name, apr_ssize_t name_len,
- const svn_string_t *const *ignored,
const svn_string_t *val,
apr_pool_t *pool)
{
@@ -565,18 +561,18 @@ close_dir(report_dir_t *dir)
SVN_ERR_ASSERT(! dir->ref_count);
SVN_ERR(svn_ra_serf__walk_all_props(dir->props, dir->base_name,
- dir->base_rev, FALSE,
+ dir->base_rev,
set_dir_props, dir,
dir->dir_baton_pool));
- SVN_ERR(svn_ra_serf__walk_all_props(dir->removed_props, dir->base_name, FALSE,
+ SVN_ERR(svn_ra_serf__walk_all_props(dir->removed_props, dir->base_name,
dir->base_rev, remove_dir_props, dir,
dir->dir_baton_pool));
if (dir->fetch_props)
{
SVN_ERR(svn_ra_serf__walk_all_props(dir->props, dir->url,
- dir->target_rev, FALSE,
+ dir->target_rev,
set_dir_props, dir,
dir->dir_baton_pool));
}
@@ -665,7 +661,7 @@ check_lock(report_info_t *info)
svn_ra_serf__set_ver_prop(info->dir->removed_props, info->base_name,
info->base_rev, "DAV:", "lock-token",
- NULL, str, info->dir->pool);
+ str, info->dir->pool);
}
}
@@ -948,7 +944,6 @@ handle_fetch(serf_request_t *request,
err = svn_ra_serf__walk_all_props(info->props,
info->base_name,
info->base_rev,
- FALSE,
set_file_props,
info, info->editor_pool);
@@ -956,7 +951,6 @@ handle_fetch(serf_request_t *request,
err = svn_ra_serf__walk_all_props(info->dir->removed_props,
info->base_name,
info->base_rev,
- FALSE,
remove_file_props,
info, info->editor_pool);
if (!err && info->fetch_props)
@@ -964,7 +958,6 @@ handle_fetch(serf_request_t *request,
err = svn_ra_serf__walk_all_props(info->props,
info->url,
info->target_rev,
- FALSE,
set_file_props,
info, info->editor_pool);
}
@@ -1145,18 +1138,17 @@ handle_propchange_only(report_info_t *in
/* set all of the properties we received */
SVN_ERR(svn_ra_serf__walk_all_props(info->props,
info->base_name, info->base_rev,
- FALSE, set_file_props, info,
+ set_file_props, info,
info->editor_pool));
SVN_ERR(svn_ra_serf__walk_all_props(info->dir->removed_props,
info->base_name, info->base_rev,
- FALSE, remove_file_props, info,
+ remove_file_props, info,
info->editor_pool));
if (info->fetch_props)
{
SVN_ERR(svn_ra_serf__walk_all_props(info->props, info->url,
- info->target_rev, FALSE,
- set_file_props, info,
- info->editor_pool));
+ info->target_rev, set_file_props,
+ info, info->editor_pool));
}
SVN_ERR(info->dir->update_editor->close_file(info->file_baton,
@@ -2013,8 +2005,7 @@ end_report(svn_ra_serf__xml_parser_t *pa
set_val_str = svn_string_ncreate(set_val, info->prop_val_len, pool);
svn_ra_serf__set_ver_prop(props, info->base_name, info->base_rev,
- ns->namespace, ns->url, NULL,
- set_val_str, pool);
+ ns->namespace, ns->url, set_val_str, pool);
svn_ra_serf__xml_pop_state(parser);
}
else if (state == IGNORE_PROP_NAME || state == NEED_PROP_NAME)
@@ -2740,7 +2731,7 @@ svn_ra_serf__get_file(svn_ra_session_t *
SVN_ERR(svn_ra_serf__retrieve_props(fetch_props, session, conn, fetch_url,
revision, "0", all_props, pool));
- SVN_ERR(svn_ra_serf__walk_all_props(fetch_props, fetch_url, revision, FALSE,
+ SVN_ERR(svn_ra_serf__walk_all_props(fetch_props, fetch_url, revision,
svn_ra_serf__set_flat_props, *props, pool));
}