You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2011/11/11 17:06:51 UTC
svn commit: r1200926 [6/12] - in /subversion/branches/moves-scan-log: ./
build/ build/ac-macros/ build/generator/ build/generator/templates/
build/win32/ contrib/client-side/emacs/ notes/
subversion/bindings/javahl/native/ subversion/include/ subversio...
Modified: subversion/branches/moves-scan-log/subversion/libsvn_delta/svndiff.c
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/libsvn_delta/svndiff.c?rev=1200926&r1=1200925&r2=1200926&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/libsvn_delta/svndiff.c (original)
+++ subversion/branches/moves-scan-log/subversion/libsvn_delta/svndiff.c Fri Nov 11 16:06:45 2011
@@ -182,9 +182,9 @@ window_handler(svn_txdelta_window_t *win
{
struct encoder_baton *eb = baton;
apr_pool_t *pool = svn_pool_create(eb->pool);
- svn_stringbuf_t *instructions = svn_stringbuf_create("", pool);
- svn_stringbuf_t *i1 = svn_stringbuf_create("", pool);
- svn_stringbuf_t *header = svn_stringbuf_create("", pool);
+ svn_stringbuf_t *instructions = svn_stringbuf_create_empty(pool);
+ svn_stringbuf_t *i1 = svn_stringbuf_create_empty(pool);
+ svn_stringbuf_t *header = svn_stringbuf_create_empty(pool);
const svn_string_t *newdata;
unsigned char ibuf[MAX_INSTRUCTION_LEN], *ip;
const svn_txdelta_op_t *op;
@@ -254,8 +254,8 @@ window_handler(svn_txdelta_window_t *win
append_encoded_int(header, instructions->len);
if (eb->version == 1)
{
- svn_stringbuf_t *temp = svn_stringbuf_create("", pool);
- svn_string_t *tempstr = svn_string_create("", pool);
+ svn_stringbuf_t *temp = svn_stringbuf_create_empty(pool);
+ svn_string_t *tempstr = svn_string_create_empty(pool);
SVN_ERR(zlib_encode(window->new_data->data, window->new_data->len,
temp, eb->compression_level));
tempstr->data = temp->data;
@@ -431,20 +431,24 @@ decode_size(apr_size_t *val,
return NULL;
}
-/* Decode the possibly-zlib compressed string that is in IN, into OUT.
- We expect an integer is prepended to IN that specifies the original
- size, and that if encoded size == original size, that the remaining
- data is not compressed. */
+/* Decode the possibly-zlib compressed string of length INLEN that is in
+ IN, into OUT. We expect an integer is prepended to IN that specifies
+ the original size, and that if encoded size == original size, that the
+ remaining data is not compressed.
+ In that case, we will simply return pointer into IN as data pointer for
+ OUT. The caller is expected not to modify the contents of OUT.
+ An error is returned if the decoded length exceeds the given LIMIT.
+ */
static svn_error_t *
-zlib_decode(svn_stringbuf_t *in, svn_stringbuf_t *out, apr_size_t limit)
+zlib_decode(const unsigned char *in, apr_size_t inLen, svn_stringbuf_t *out,
+ apr_size_t limit)
{
apr_size_t len;
- char *oldplace = in->data;
+ const unsigned char *oldplace = in;
/* First thing in the string is the original length. */
- in->data = (char *)decode_size(&len, (unsigned char *)in->data,
- (unsigned char *)in->data+in->len);
- if (in->data == NULL)
+ in = decode_size(&len, in, in + inLen);
+ if (in == NULL)
return svn_error_create(SVN_ERR_SVNDIFF_INVALID_COMPRESSED_DATA, NULL,
_("Decompression of svndiff data failed: no size"));
if (len > limit)
@@ -453,33 +457,36 @@ zlib_decode(svn_stringbuf_t *in, svn_str
"size too large"));
/* We need to subtract the size of the encoded original length off the
* still remaining input length. */
- in->len -= (in->data - oldplace);
- if (in->len == len)
+ inLen -= (in - oldplace);
+ if (inLen == len)
{
- svn_stringbuf_appendstr(out, in);
+ /* "in" is no longer used but the memory remains allocated for
+ * at least as long as "out" will be used by the caller.
+ */
+ out->data = (char *)in;
+ out->len = len;
+ out->blocksize = len; /* sic! */
+
return SVN_NO_ERROR;
}
else
{
- unsigned long zliblen;
+ unsigned long zlen = len;
svn_stringbuf_ensure(out, len);
-
- zliblen = len;
- if (uncompress ((unsigned char *)out->data, &zliblen,
- (const unsigned char *)in->data, in->len) != Z_OK)
+ if (uncompress((unsigned char *)out->data, &zlen, in, inLen) != Z_OK)
return svn_error_create(SVN_ERR_SVNDIFF_INVALID_COMPRESSED_DATA,
NULL,
_("Decompression of svndiff data failed"));
/* Zlib should not produce something that has a different size than the
original length we stored. */
- if (zliblen != len)
+ if (zlen != len)
return svn_error_create(SVN_ERR_SVNDIFF_INVALID_COMPRESSED_DATA,
NULL,
_("Size of uncompressed data "
"does not match stored original length"));
- out->len = zliblen;
+ out->len = zlen;
}
return SVN_NO_ERROR;
}
@@ -627,16 +634,15 @@ decode_window(svn_txdelta_window_t *wind
if (version == 1)
{
- svn_stringbuf_t *instin, *ndin;
- svn_stringbuf_t *instout, *ndout;
+ svn_stringbuf_t *instout = svn_stringbuf_create_empty(pool);
+ svn_stringbuf_t *ndout = svn_stringbuf_create_empty(pool);
- instin = svn_stringbuf_ncreate((const char *)data, insend - data, pool);
- instout = svn_stringbuf_create("", pool);
- SVN_ERR(zlib_decode(instin, instout, MAX_INSTRUCTION_SECTION_LEN));
-
- ndin = svn_stringbuf_ncreate((const char *)insend, newlen, pool);
- ndout = svn_stringbuf_create("", pool);
- SVN_ERR(zlib_decode(ndin, ndout, SVN_DELTA_WINDOW_SIZE));
+ /* these may in fact simply return references to insend */
+
+ SVN_ERR(zlib_decode(insend, newlen, ndout,
+ SVN_DELTA_WINDOW_SIZE));
+ SVN_ERR(zlib_decode(data, insend - data, instout,
+ MAX_INSTRUCTION_SECTION_LEN));
newlen = ndout->len;
data = (unsigned char *)instout->data;
@@ -846,7 +852,7 @@ svn_txdelta_parse_svndiff(svn_txdelta_wi
db->consumer_baton = handler_baton;
db->pool = subpool;
db->subpool = svn_pool_create(subpool);
- db->buffer = svn_stringbuf_create("", db->subpool);
+ db->buffer = svn_stringbuf_create_empty(db->subpool);
db->last_sview_offset = 0;
db->last_sview_len = 0;
db->header_bytes = 0;
Modified: subversion/branches/moves-scan-log/subversion/libsvn_delta/text_delta.c
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/libsvn_delta/text_delta.c?rev=1200926&r1=1200925&r2=1200926&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/libsvn_delta/text_delta.c (original)
+++ subversion/branches/moves-scan-log/subversion/libsvn_delta/text_delta.c Fri Nov 11 16:06:45 2011
@@ -150,7 +150,7 @@ compute_window(const char *data, apr_siz
svn_txdelta_window_t *window;
/* Compute the delta operations. */
- build_baton.new_data = svn_stringbuf_create("", pool);
+ build_baton.new_data = svn_stringbuf_create_empty(pool);
if (source_len == 0)
svn_txdelta__insert_op(&build_baton, svn_txdelta_new, 0, target_len, data,
Modified: subversion/branches/moves-scan-log/subversion/libsvn_diff/diff_file.c
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/libsvn_diff/diff_file.c?rev=1200926&r1=1200925&r2=1200926&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/libsvn_diff/diff_file.c (original)
+++ subversion/branches/moves-scan-log/subversion/libsvn_diff/diff_file.c Fri Nov 11 16:06:45 2011
@@ -1755,9 +1755,9 @@ svn_diff_file_output_unified3(svn_stream
baton.header_encoding = header_encoding;
baton.path[0] = original_path;
baton.path[1] = modified_path;
- baton.hunk = svn_stringbuf_create("", pool);
+ baton.hunk = svn_stringbuf_create_empty(pool);
baton.show_c_function = show_c_function;
- baton.extra_context = svn_stringbuf_create("", pool);
+ baton.extra_context = svn_stringbuf_create_empty(pool);
baton.extra_skip_match = apr_array_make(pool, 3, sizeof(char **));
c = apr_array_push(baton.extra_skip_match);
Modified: subversion/branches/moves-scan-log/subversion/libsvn_diff/diff_memory.c
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/libsvn_diff/diff_memory.c?rev=1200926&r1=1200925&r2=1200926&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/libsvn_diff/diff_memory.c (original)
+++ subversion/branches/moves-scan-log/subversion/libsvn_diff/diff_memory.c Fri Nov 11 16:06:45 2011
@@ -584,7 +584,7 @@ svn_diff_mem_string_output_unified2(svn_
baton.output_stream = output_stream;
baton.pool = svn_pool_create(pool);
baton.header_encoding = header_encoding;
- baton.hunk = svn_stringbuf_create("", pool);
+ baton.hunk = svn_stringbuf_create_empty(pool);
baton.hunk_delimiter = hunk_delimiter;
SVN_ERR(svn_utf_cstring_from_utf8_ex2
Modified: subversion/branches/moves-scan-log/subversion/libsvn_diff/parse-diff.c
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/libsvn_diff/parse-diff.c?rev=1200926&r1=1200925&r2=1200926&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/libsvn_diff/parse-diff.c (original)
+++ subversion/branches/moves-scan-log/subversion/libsvn_diff/parse-diff.c Fri Nov 11 16:06:45 2011
@@ -396,7 +396,7 @@ hunk_readline_original_or_modified(apr_f
*eof = TRUE;
if (eol)
*eol = NULL;
- *stringbuf = svn_stringbuf_create("", result_pool);
+ *stringbuf = svn_stringbuf_create_empty(result_pool);
return SVN_NO_ERROR;
}
@@ -490,7 +490,7 @@ svn_diff_hunk_readline_diff_text(svn_dif
*eof = TRUE;
if (eol)
*eol = NULL;
- *stringbuf = svn_stringbuf_create("", result_pool);
+ *stringbuf = svn_stringbuf_create_empty(result_pool);
return SVN_NO_ERROR;
}
Modified: subversion/branches/moves-scan-log/subversion/libsvn_fs/fs-loader.c
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/libsvn_fs/fs-loader.c?rev=1200926&r1=1200925&r2=1200926&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/libsvn_fs/fs-loader.c (original)
+++ subversion/branches/moves-scan-log/subversion/libsvn_fs/fs-loader.c Fri Nov 11 16:06:45 2011
@@ -891,6 +891,21 @@ svn_fs_closest_copy(svn_fs_root_t **root
}
svn_error_t *
+svn_fs_get_mergeinfo2(svn_mergeinfo_catalog_t *catalog,
+ svn_fs_root_t *root,
+ const apr_array_header_t *paths,
+ svn_mergeinfo_inheritance_t inherit,
+ svn_boolean_t include_descendants,
+ svn_boolean_t adjust_inherited_mergeinfo,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool)
+{
+ return svn_error_trace(root->vtable->get_mergeinfo(
+ catalog, root, paths, inherit, include_descendants,
+ adjust_inherited_mergeinfo, result_pool, scratch_pool));
+}
+
+svn_error_t *
svn_fs_get_mergeinfo(svn_mergeinfo_catalog_t *catalog,
svn_fs_root_t *root,
const apr_array_header_t *paths,
@@ -901,7 +916,7 @@ svn_fs_get_mergeinfo(svn_mergeinfo_catal
return svn_error_trace(root->vtable->get_mergeinfo(catalog, root, paths,
inherit,
include_descendants,
- pool));
+ TRUE, pool, pool));
}
svn_error_t *
Modified: subversion/branches/moves-scan-log/subversion/libsvn_fs/fs-loader.h
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/libsvn_fs/fs-loader.h?rev=1200926&r1=1200925&r2=1200926&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/libsvn_fs/fs-loader.h (original)
+++ subversion/branches/moves-scan-log/subversion/libsvn_fs/fs-loader.h Fri Nov 11 16:06:45 2011
@@ -333,7 +333,9 @@ typedef struct root_vtable_t
const apr_array_header_t *paths,
svn_mergeinfo_inheritance_t inherit,
svn_boolean_t include_descendants,
- apr_pool_t *pool);
+ svn_boolean_t adjust_inherited_mergeinfo,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool);
} root_vtable_t;
Modified: subversion/branches/moves-scan-log/subversion/libsvn_fs_base/bdb/changes-table.c
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/libsvn_fs_base/bdb/changes-table.c?rev=1200926&r1=1200925&r2=1200926&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/libsvn_fs_base/bdb/changes-table.c (original)
+++ subversion/branches/moves-scan-log/subversion/libsvn_fs_base/bdb/changes-table.c Fri Nov 11 16:06:45 2011
@@ -325,14 +325,14 @@ svn_fs_bdb__changes_fetch(apr_hash_t **c
/* KEY is the path. */
const void *hashkey;
apr_ssize_t klen;
- apr_hash_this(hi, &hashkey, &klen, NULL);
+ const char *child_relpath;
- /* If we come across our own path, ignore it. */
- if (strcmp(change->path, hashkey) == 0)
- continue;
+ apr_hash_this(hi, &hashkey, &klen, NULL);
- /* If we come across a child of our path, remove it. */
- if (svn_fspath__is_child(change->path, hashkey, subpool))
+ /* If we come across our own path, ignore it.
+ If we come across a child of our path, remove it. */
+ child_relpath = svn_fspath__skip_ancestor(change->path, hashkey);
+ if (child_relpath && *child_relpath)
apr_hash_set(changes, hashkey, klen, NULL);
}
}
Modified: subversion/branches/moves-scan-log/subversion/libsvn_fs_base/bdb/locks-table.c
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/libsvn_fs_base/bdb/locks-table.c?rev=1200926&r1=1200925&r2=1200926&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/libsvn_fs_base/bdb/locks-table.c (original)
+++ subversion/branches/moves-scan-log/subversion/libsvn_fs_base/bdb/locks-table.c Fri Nov 11 16:06:45 2011
@@ -274,7 +274,7 @@ svn_fs_bdb__locks_get(svn_fs_t *fs,
same set of results. So just see if CHILD_PATH is an
immediate child of PATH. If not, we don't care about
this item. */
- const char *rel_path = svn_fspath__is_child(path, child_path, subpool);
+ const char *rel_path = svn_fspath__skip_ancestor(path, child_path);
if (!rel_path || (svn_path_component_count(rel_path) != 1))
goto loop_it;
}
Modified: subversion/branches/moves-scan-log/subversion/libsvn_fs_base/tree.c
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/libsvn_fs_base/tree.c?rev=1200926&r1=1200925&r2=1200926&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/libsvn_fs_base/tree.c (original)
+++ subversion/branches/moves-scan-log/subversion/libsvn_fs_base/tree.c Fri Nov 11 16:06:45 2011
@@ -2523,7 +2523,7 @@ verify_locks(const char *txn_name,
/* If this path has already been verified as part of a recursive
check of one of its parents, no need to do it again. */
if (last_recursed
- && svn_fspath__is_child(last_recursed->data, path, subpool))
+ && svn_fspath__skip_ancestor(last_recursed->data, path))
continue;
/* Fetch the change associated with our path. */
@@ -2722,7 +2722,7 @@ svn_fs_base__commit_txn(const char **con
merge_args.ancestor_node = NULL;
merge_args.source_node = youngish_root_node;
merge_args.txn = txn;
- merge_args.conflict = svn_stringbuf_create("", pool); /* use pool */
+ merge_args.conflict = svn_stringbuf_create_empty(pool); /* use pool */
err = svn_fs_base__retry_txn(fs, txn_body_merge, &merge_args,
FALSE, subpool);
if (err)
@@ -2832,7 +2832,7 @@ base_merge(const char **conflict_p,
merge_args.source_node = source;
merge_args.ancestor_node = ancestor;
merge_args.txn = txn;
- merge_args.conflict = svn_stringbuf_create("", pool);
+ merge_args.conflict = svn_stringbuf_create_empty(pool);
err = svn_fs_base__retry_txn(fs, txn_body_merge, &merge_args, FALSE, pool);
if (err)
{
@@ -3762,7 +3762,7 @@ txn_body_apply_textdelta(void *baton, tr
/* Make a writable "string" stream which writes data to
tb->target_string. */
- tb->target_string = svn_stringbuf_create("", tb->pool);
+ tb->target_string = svn_stringbuf_create_empty(tb->pool);
tb->string_stream = svn_stream_create(tb, tb->pool);
svn_stream_set_write(tb->string_stream, write_to_string);
@@ -4349,10 +4349,7 @@ txn_body_history_prev(void *baton, trail
the copy source. Finally, if our current path doesn't meet
one of these other criteria ... ### for now just fallback to
the old copy hunt algorithm. */
- if (strcmp(path, copy_dst) == 0)
- remainder = "";
- else
- remainder = svn_fspath__is_child(copy_dst, path, trail->pool);
+ remainder = svn_fspath__skip_ancestor(copy_dst, path);
if (remainder)
{
@@ -4745,7 +4742,7 @@ prev_location(const char **prev_path,
const char *path,
apr_pool_t *pool)
{
- const char *copy_path, *copy_src_path, *remainder = "";
+ const char *copy_path, *copy_src_path, *remainder;
svn_fs_root_t *copy_root;
svn_revnum_t copy_src_rev;
@@ -4774,8 +4771,7 @@ prev_location(const char **prev_path,
*/
SVN_ERR(base_copied_from(©_src_rev, ©_src_path,
copy_root, copy_path, pool));
- if (! strcmp(copy_path, path) == 0)
- remainder = svn_fspath__is_child(copy_path, path, pool);
+ remainder = svn_fspath__skip_ancestor(copy_path, path);
*prev_path = svn_fspath__join(copy_src_path, remainder, pool);
*prev_rev = copy_src_rev;
return SVN_NO_ERROR;
@@ -5142,6 +5138,7 @@ struct get_mergeinfo_for_path_baton
svn_fs_root_t *root;
const char *path;
svn_mergeinfo_inheritance_t inherit;
+ svn_boolean_t adjust_inherited_mergeinfo;
apr_pool_t *pool;
};
@@ -5237,7 +5234,7 @@ txn_body_get_mergeinfo_for_path(void *ba
can return the mergeinfo results directly. Otherwise, we're
inheriting the mergeinfo, so we need to a) remove non-inheritable
ranges and b) telescope the merged-from paths. */
- if (nearest_ancestor != parent_path)
+ if (args->adjust_inherited_mergeinfo && (nearest_ancestor != parent_path))
{
svn_mergeinfo_t tmp_mergeinfo;
@@ -5291,10 +5288,12 @@ get_mergeinfos_for_paths(svn_fs_root_t *
const apr_array_header_t *paths,
svn_mergeinfo_inheritance_t inherit,
svn_boolean_t include_descendants,
- apr_pool_t *pool)
+ svn_boolean_t adjust_inherited_mergeinfo,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool)
{
- svn_mergeinfo_catalog_t result_catalog = apr_hash_make(pool);
- apr_pool_t *iterpool = svn_pool_create(pool);
+ svn_mergeinfo_catalog_t result_catalog = apr_hash_make(result_pool);
+ apr_pool_t *iterpool = svn_pool_create(scratch_pool);
int i;
for (i = 0; i < paths->nelts; i++)
@@ -5312,12 +5311,13 @@ get_mergeinfos_for_paths(svn_fs_root_t *
gmfp_args.root = root;
gmfp_args.path = path;
gmfp_args.inherit = inherit;
- gmfp_args.pool = pool;
+ gmfp_args.pool = result_pool;
+ gmfp_args.adjust_inherited_mergeinfo = adjust_inherited_mergeinfo;
SVN_ERR(svn_fs_base__retry_txn(root->fs,
txn_body_get_mergeinfo_for_path,
&gmfp_args, FALSE, iterpool));
if (path_mergeinfo)
- apr_hash_set(result_catalog, apr_pstrdup(pool, path),
+ apr_hash_set(result_catalog, apr_pstrdup(result_pool, path),
APR_HASH_KEY_STRING,
path_mergeinfo);
@@ -5363,7 +5363,9 @@ base_get_mergeinfo(svn_mergeinfo_catalog
const apr_array_header_t *paths,
svn_mergeinfo_inheritance_t inherit,
svn_boolean_t include_descendants,
- apr_pool_t *pool)
+ svn_boolean_t adjust_inherited_mergeinfo,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool)
{
/* Verify that our filesystem version supports mergeinfo stuff. */
SVN_ERR(svn_fs_base__test_required_feature_format
@@ -5376,7 +5378,8 @@ base_get_mergeinfo(svn_mergeinfo_catalog
/* Retrieve a path -> mergeinfo mapping. */
return get_mergeinfos_for_paths(root, catalog, paths,
inherit, include_descendants,
- pool);
+ adjust_inherited_mergeinfo,
+ result_pool, scratch_pool);
}
Modified: subversion/branches/moves-scan-log/subversion/libsvn_fs_fs/fs_fs.c
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/libsvn_fs_fs/fs_fs.c?rev=1200926&r1=1200925&r2=1200926&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/branches/moves-scan-log/subversion/libsvn_fs_fs/fs_fs.c Fri Nov 11 16:06:45 2011
@@ -2905,29 +2905,32 @@ set_revision_proplist(svn_fs_t *fs,
apr_hash_t *proplist,
apr_pool_t *pool)
{
- const char *final_path;
- const char *tmp_path;
- const char *perms_reference;
- svn_stream_t *stream;
-
SVN_ERR(ensure_revision_exists(fs, rev, pool));
- final_path = path_revprops(fs, rev, pool);
+ /* if (1); null condition for easier merging to revprop-packing */
+ {
+ const char *final_path = path_revprops(fs, rev, pool);
+ const char *tmp_path;
+ const char *perms_reference;
+ svn_stream_t *stream;
+
+ /* ### do we have a directory sitting around already? we really shouldn't
+ ### have to get the dirname here. */
+ SVN_ERR(svn_stream_open_unique(&stream, &tmp_path,
+ svn_dirent_dirname(final_path, pool),
+ svn_io_file_del_none, pool, pool));
+ SVN_ERR(svn_hash_write2(proplist, stream, SVN_HASH_TERMINATOR, pool));
+ SVN_ERR(svn_stream_close(stream));
- /* ### do we have a directory sitting around already? we really shouldn't
- ### have to get the dirname here. */
- SVN_ERR(svn_stream_open_unique(&stream, &tmp_path,
- svn_dirent_dirname(final_path, pool),
- svn_io_file_del_none, pool, pool));
- SVN_ERR(svn_hash_write2(proplist, stream, SVN_HASH_TERMINATOR, pool));
- SVN_ERR(svn_stream_close(stream));
+ /* We use the rev file of this revision as the perms reference,
+ because when setting revprops for the first time, the revprop
+ file won't exist and therefore can't serve as its own reference.
+ (Whereas the rev file should already exist at this point.) */
+ SVN_ERR(svn_fs_fs__path_rev_absolute(&perms_reference, fs, rev, pool));
+ SVN_ERR(move_into_place(tmp_path, final_path, perms_reference, pool));
- /* We use the rev file of this revision as the perms reference,
- because when setting revprops for the first time, the revprop
- file won't exist and therefore can't serve as its own reference.
- (Whereas the rev file should already exist at this point.) */
- SVN_ERR(svn_fs_fs__path_rev_absolute(&perms_reference, fs, rev, pool));
- SVN_ERR(move_into_place(tmp_path, final_path, perms_reference, pool));
+ return SVN_NO_ERROR;
+ }
return SVN_NO_ERROR;
}
@@ -2942,7 +2945,7 @@ revision_proplist(apr_hash_t **proplist_
SVN_ERR(ensure_revision_exists(fs, rev, pool));
- if (1)
+ /* if (1); null condition for easier merging to revprop-packing */
{
apr_file_t *revprop_file = NULL;
svn_error_t *err = SVN_NO_ERROR;
@@ -6384,7 +6387,7 @@ commit_body(void *baton, apr_pool_t *poo
fails because the shard already existed for some reason. */
if (ffd->max_files_per_dir && new_rev % ffd->max_files_per_dir == 0)
{
- if (1)
+ /* if (1); null condition for easier merging to revprop-packing */
{
const char *new_dir = path_rev_shard(cb->fs, new_rev, pool);
svn_error_t *err = svn_io_dir_make(new_dir, APR_OS_DEFAULT, pool);
@@ -7040,7 +7043,7 @@ recover_body(void *baton, apr_pool_t *po
&youngest_revprops_kind, pool));
if (youngest_revprops_kind == svn_node_none)
{
- if (1)
+ /* if (1); null condition for easier merging to revprop-packing */
{
return svn_error_createf(SVN_ERR_FS_CORRUPT, NULL,
_("Revision %ld has a revs file but no "
Modified: subversion/branches/moves-scan-log/subversion/libsvn_fs_fs/key-gen.c
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/libsvn_fs_fs/key-gen.c?rev=1200926&r1=1200925&r2=1200926&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/libsvn_fs_fs/key-gen.c (original)
+++ subversion/branches/moves-scan-log/subversion/libsvn_fs_fs/key-gen.c Fri Nov 11 16:06:45 2011
@@ -41,8 +41,8 @@
void
svn_fs_fs__add_keys(const char *key1, const char *key2, char *result)
{
- apr_size_t i1 = strlen(key1) - 1;
- apr_size_t i2 = strlen(key2) - 1;
+ apr_ssize_t i1 = strlen(key1) - 1;
+ apr_ssize_t i2 = strlen(key2) - 1;
int i3 = 0;
int val;
int carry = 0;
Modified: subversion/branches/moves-scan-log/subversion/libsvn_fs_fs/lock.c
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/libsvn_fs_fs/lock.c?rev=1200926&r1=1200925&r2=1200926&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/libsvn_fs_fs/lock.c (original)
+++ subversion/branches/moves-scan-log/subversion/libsvn_fs_fs/lock.c Fri Nov 11 16:06:45 2011
@@ -205,7 +205,7 @@ write_digest_file(apr_hash_t *children,
}
if (apr_hash_count(children))
{
- svn_stringbuf_t *children_list = svn_stringbuf_create("", pool);
+ svn_stringbuf_t *children_list = svn_stringbuf_create_empty(pool);
for (hi = apr_hash_first(pool, children); hi; hi = apr_hash_next(hi))
{
svn_stringbuf_appendbytes(children_list,
@@ -1036,7 +1036,7 @@ get_locks_filter_func(void *baton,
else if ((b->requested_depth == svn_depth_files) ||
(b->requested_depth == svn_depth_immediates))
{
- const char *rel_uri = svn_fspath__is_child(b->path, lock->path, pool);
+ const char *rel_uri = svn_fspath__skip_ancestor(b->path, lock->path);
if (rel_uri && (svn_path_component_count(rel_uri) == 1))
SVN_ERR(b->get_locks_func(b->get_locks_baton, lock, pool));
}
Propchange: subversion/branches/moves-scan-log/subversion/libsvn_fs_fs/temp_serializer.c
('svn:mergeinfo' removed)
Propchange: subversion/branches/moves-scan-log/subversion/libsvn_fs_fs/temp_serializer.h
('svn:mergeinfo' removed)
Modified: subversion/branches/moves-scan-log/subversion/libsvn_fs_fs/tree.c
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/libsvn_fs_fs/tree.c?rev=1200926&r1=1200925&r2=1200926&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/libsvn_fs_fs/tree.c (original)
+++ subversion/branches/moves-scan-log/subversion/libsvn_fs_fs/tree.c Fri Nov 11 16:06:45 2011
@@ -1648,7 +1648,7 @@ svn_fs_fs__commit_txn(const char **confl
*/
svn_error_t *err = SVN_NO_ERROR;
- svn_stringbuf_t *conflict = svn_stringbuf_create("", pool);
+ svn_stringbuf_t *conflict = svn_stringbuf_create_empty(pool);
svn_fs_t *fs = txn->fs;
/* Limit memory usage when the repository has a high commit rate and
@@ -1756,7 +1756,7 @@ fs_merge(const char **conflict_p,
dag_node_t *source, *ancestor;
svn_fs_txn_t *txn;
svn_error_t *err;
- svn_stringbuf_t *conflict = svn_stringbuf_create("", pool);
+ svn_stringbuf_t *conflict = svn_stringbuf_create_empty(pool);
if (! target_root->is_txn_root)
return SVN_FS__NOT_TXN(target_root);
@@ -2455,7 +2455,7 @@ apply_textdelta(void *baton, apr_pool_t
/* Make a writable "string" stream which writes data to
tb->target_string. */
- tb->target_string = svn_stringbuf_create("", tb->pool);
+ tb->target_string = svn_stringbuf_create_empty(tb->pool);
tb->string_stream = svn_stream_create(tb, tb->pool);
svn_stream_set_write(tb->string_stream, write_to_string);
@@ -2925,7 +2925,7 @@ prev_location(const char **prev_path,
const char *path,
apr_pool_t *pool)
{
- const char *copy_path, *copy_src_path, *remainder_path = "";
+ const char *copy_path, *copy_src_path, *remainder_path;
svn_fs_root_t *copy_root;
svn_revnum_t copy_src_rev;
@@ -2954,8 +2954,7 @@ prev_location(const char **prev_path,
*/
SVN_ERR(fs_copied_from(©_src_rev, ©_src_path,
copy_root, copy_path, pool));
- if (strcmp(copy_path, path) != 0)
- remainder_path = svn_relpath__is_child(copy_path, path, pool);
+ remainder_path = svn_relpath_skip_ancestor(copy_path, path);
*prev_path = svn_fspath__join(copy_src_path, remainder_path, pool);
*prev_rev = copy_src_rev;
return SVN_NO_ERROR;
@@ -3202,10 +3201,7 @@ history_prev(void *baton, apr_pool_t *po
the copy source. Finally, if our current path doesn't meet
one of these other criteria ... ### for now just fallback to
the old copy hunt algorithm. */
- if (strcmp(path, copy_dst) == 0)
- remainder_path = "";
- else
- remainder_path = svn_relpath__is_child(copy_dst, path, pool);
+ remainder_path = svn_fspath__skip_ancestor(copy_dst, path);
if (remainder_path)
{
@@ -3463,6 +3459,7 @@ get_mergeinfo_for_path(svn_mergeinfo_t *
svn_fs_root_t *rev_root,
const char *path,
svn_mergeinfo_inheritance_t inherit,
+ svn_boolean_t adjust_inherited_mergeinfo,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
@@ -3549,7 +3546,7 @@ get_mergeinfo_for_path(svn_mergeinfo_t *
can return the mergeinfo results directly. Otherwise, we're
inheriting the mergeinfo, so we need to a) remove non-inheritable
ranges and b) telescope the merged-from paths. */
- if (nearest_ancestor != parent_path)
+ if (adjust_inherited_mergeinfo && (nearest_ancestor != parent_path))
{
svn_mergeinfo_t tmp_mergeinfo;
@@ -3604,10 +3601,12 @@ get_mergeinfos_for_paths(svn_fs_root_t *
const apr_array_header_t *paths,
svn_mergeinfo_inheritance_t inherit,
svn_boolean_t include_descendants,
- apr_pool_t *pool)
+ svn_boolean_t adjust_inherited_mergeinfo,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool)
{
- svn_mergeinfo_catalog_t result_catalog = apr_hash_make(pool);
- apr_pool_t *iterpool = svn_pool_create(pool);
+ svn_mergeinfo_catalog_t result_catalog = apr_hash_make(result_pool);
+ apr_pool_t *iterpool = svn_pool_create(scratch_pool);
int i;
for (i = 0; i < paths->nelts; i++)
@@ -3619,7 +3618,8 @@ get_mergeinfos_for_paths(svn_fs_root_t *
svn_pool_clear(iterpool);
err = get_mergeinfo_for_path(&path_mergeinfo, root, path,
- inherit, pool, iterpool);
+ inherit, adjust_inherited_mergeinfo,
+ result_pool, iterpool);
if (err)
{
if (err->apr_err == SVN_ERR_MERGEINFO_PARSE_ERROR)
@@ -3638,8 +3638,8 @@ get_mergeinfos_for_paths(svn_fs_root_t *
apr_hash_set(result_catalog, path, APR_HASH_KEY_STRING,
path_mergeinfo);
if (include_descendants)
- SVN_ERR(add_descendant_mergeinfo(result_catalog, root, path, pool,
- iterpool));
+ SVN_ERR(add_descendant_mergeinfo(result_catalog, root, path,
+ result_pool, scratch_pool));
}
svn_pool_destroy(iterpool);
@@ -3655,7 +3655,9 @@ fs_get_mergeinfo(svn_mergeinfo_catalog_t
const apr_array_header_t *paths,
svn_mergeinfo_inheritance_t inherit,
svn_boolean_t include_descendants,
- apr_pool_t *pool)
+ svn_boolean_t adjust_inherited_mergeinfo,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool)
{
fs_fs_data_t *ffd = root->fs->fsap_data;
@@ -3674,7 +3676,9 @@ fs_get_mergeinfo(svn_mergeinfo_catalog_t
/* Retrieve a path -> mergeinfo hash mapping. */
return get_mergeinfos_for_paths(root, catalog, paths,
inherit,
- include_descendants, pool);
+ include_descendants,
+ adjust_inherited_mergeinfo,
+ result_pool, scratch_pool);
}
Modified: subversion/branches/moves-scan-log/subversion/libsvn_ra/compat.c
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/libsvn_ra/compat.c?rev=1200926&r1=1200925&r2=1200926&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/libsvn_ra/compat.c (original)
+++ subversion/branches/moves-scan-log/subversion/libsvn_ra/compat.c Fri Nov 11 16:06:45 2011
@@ -154,7 +154,7 @@ prev_log_path(const char **prev_path_p,
path, to the change's copyfrom path. Otherwise, this
change isn't really interesting to us, and our search
continues. */
- change = apr_hash_get(changed_paths, ch_path, len);
+ change = item.value;
if (change->copyfrom_path)
{
if (action_p)
Modified: subversion/branches/moves-scan-log/subversion/libsvn_ra/ra_loader.c
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/libsvn_ra/ra_loader.c?rev=1200926&r1=1200925&r2=1200926&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/libsvn_ra/ra_loader.c (original)
+++ subversion/branches/moves-scan-log/subversion/libsvn_ra/ra_loader.c Fri Nov 11 16:06:45 2011
@@ -601,6 +601,22 @@ svn_error_t *svn_ra_get_path_relative_to
return SVN_NO_ERROR;
}
+svn_error_t *
+svn_ra__get_fspath_relative_to_root(svn_ra_session_t *ra_session,
+ const char **fspath,
+ const char *url,
+ apr_pool_t *pool)
+{
+ const char *relpath;
+
+ SVN_ERR(svn_ra_get_path_relative_to_root(ra_session, &relpath, url, pool));
+ if (*relpath)
+ *fspath = apr_pstrcat(pool, "/", relpath, (char *)NULL);
+ else
+ *fspath = "/";
+ return SVN_NO_ERROR;
+}
+
svn_error_t *svn_ra_get_latest_revnum(svn_ra_session_t *session,
svn_revnum_t *latest_revnum,
apr_pool_t *pool)
@@ -1285,7 +1301,7 @@ svn_ra_print_ra_libraries(svn_stringbuf_
void *ra_baton,
apr_pool_t *pool)
{
- *descriptions = svn_stringbuf_create("", pool);
+ *descriptions = svn_stringbuf_create_empty(pool);
return svn_ra_print_modules(*descriptions, pool);
}
Modified: subversion/branches/moves-scan-log/subversion/libsvn_ra_local/ra_plugin.c
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/libsvn_ra_local/ra_plugin.c?rev=1200926&r1=1200925&r2=1200926&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/libsvn_ra_local/ra_plugin.c (original)
+++ subversion/branches/moves-scan-log/subversion/libsvn_ra_local/ra_plugin.c Fri Nov 11 16:06:45 2011
@@ -220,21 +220,21 @@ reporter_link_path(void *reporter_baton,
apr_pool_t *pool)
{
reporter_baton_t *rbaton = reporter_baton;
- const char *fs_path = NULL;
const char *repos_url = rbaton->sess->repos_url;
+ const char *relpath = svn_uri_skip_ancestor(repos_url, url, pool);
+ const char *fs_path;
- if (!svn_uri__is_ancestor(repos_url, url))
+ if (!relpath)
return svn_error_createf(SVN_ERR_RA_ILLEGAL_URL, NULL,
_("'%s'\n"
"is not the same repository as\n"
"'%s'"), url, rbaton->sess->repos_url);
- /* Skip the repos_url, but keep the last '/' to create an fspath */
- fs_path = svn_uri_skip_ancestor(repos_url, url, pool);
- if (fs_path[0] == '\0')
+ /* Convert the relpath to an fspath */
+ if (relpath[0] == '\0')
fs_path = "/";
else
- fs_path = apr_pstrcat(pool, "/", fs_path, (char *)NULL);
+ fs_path = apr_pstrcat(pool, "/", relpath, (char *)NULL);
return svn_repos_link_path3(rbaton->report_baton, path, fs_path, revision,
depth, start_empty, lock_token, pool);
@@ -541,12 +541,10 @@ svn_ra_local__reparent(svn_ra_session_t
apr_pool_t *pool)
{
svn_ra_local__session_baton_t *sess = session->priv;
- const char *relpath = "";
+ const char *relpath = svn_uri_skip_ancestor(sess->repos_url, url, pool);
/* If the new URL isn't the same as our repository root URL, then
let's ensure that it's some child of it. */
- if (strcmp(url, sess->repos_url) != 0)
- relpath = svn_uri__is_child(sess->repos_url, url, pool);
if (! relpath)
return svn_error_createf
(SVN_ERR_RA_ILLEGAL_URL, NULL,
Modified: subversion/branches/moves-scan-log/subversion/libsvn_ra_neon/commit.c
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/libsvn_ra_neon/commit.c?rev=1200926&r1=1200925&r2=1200926&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/libsvn_ra_neon/commit.c (original)
+++ subversion/branches/moves-scan-log/subversion/libsvn_ra_neon/commit.c Fri Nov 11 16:06:45 2011
@@ -633,22 +633,20 @@ static apr_hash_t *get_child_tokens(apr_
{
apr_hash_index_t *hi;
apr_hash_t *tokens = apr_hash_make(pool);
- apr_pool_t *subpool = svn_pool_create(pool);
for (hi = apr_hash_first(pool, lock_tokens); hi; hi = apr_hash_next(hi))
{
const void *key;
apr_ssize_t klen;
void *val;
+ const char *child_relpath;
- svn_pool_clear(subpool);
apr_hash_this(hi, &key, &klen, &val);
-
- if (svn_relpath__is_child(dir, key, subpool))
+ child_relpath = svn_relpath_skip_ancestor(dir, key);
+ if (child_relpath && *child_relpath)
apr_hash_set(tokens, key, klen, val);
}
- svn_pool_destroy(subpool);
return tokens;
}
@@ -1572,6 +1570,8 @@ svn_error_t * svn_ra_neon__get_commit_ed
svn_delta_editor_t *commit_editor;
commit_ctx_t *cc;
apr_hash_index_t *hi;
+ svn_delta_shim_callbacks_t *shim_callbacks =
+ svn_delta_shim_callbacks_default(pool);
/* Build the main commit editor's baton. */
cc = apr_pcalloc(pool, sizeof(*cc));
@@ -1622,7 +1622,7 @@ svn_error_t * svn_ra_neon__get_commit_ed
*edit_baton = cc;
SVN_ERR(svn_editor__insert_shims(editor, edit_baton, *editor, *edit_baton,
- NULL, NULL, NULL, NULL, pool, pool));
+ shim_callbacks, pool, pool));
return SVN_NO_ERROR;
}
Modified: subversion/branches/moves-scan-log/subversion/libsvn_ra_neon/fetch.c
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/libsvn_ra_neon/fetch.c?rev=1200926&r1=1200925&r2=1200926&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/libsvn_ra_neon/fetch.c (original)
+++ subversion/branches/moves-scan-log/subversion/libsvn_ra_neon/fetch.c Fri Nov 11 16:06:45 2011
@@ -1487,7 +1487,7 @@ start_element(int *elem, void *userdata,
if (DIR_DEPTH(rb) == 0)
{
/* pathbuf has to live for the whole edit! */
- pathbuf = svn_stringbuf_create("", rb->pool);
+ pathbuf = svn_stringbuf_create_empty(rb->pool);
/* During switch operations, we need to invalidate the
tree's version resource URLs in case something goes
@@ -2544,7 +2544,7 @@ make_reporter(svn_ra_session_t *session,
rb->edit_baton = edit_baton;
rb->fetch_content = fetch_content;
rb->in_resource = FALSE;
- rb->current_wcprop_path = svn_stringbuf_create("", pool);
+ rb->current_wcprop_path = svn_stringbuf_create_empty(pool);
rb->is_switch = dst_path != NULL;
rb->target = target;
rb->receiving_all = FALSE;
@@ -2553,7 +2553,7 @@ make_reporter(svn_ra_session_t *session,
rb->whandler_baton = NULL;
rb->svndiff_decoder = NULL;
rb->base64_decoder = NULL;
- rb->cdata_accum = svn_stringbuf_create("", pool);
+ rb->cdata_accum = svn_stringbuf_create_empty(pool);
rb->send_copyfrom_args = send_copyfrom_args;
rb->lock_tokens = apr_hash_make(pool);
Modified: subversion/branches/moves-scan-log/subversion/libsvn_ra_neon/file_revs.c
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/libsvn_ra_neon/file_revs.c?rev=1200926&r1=1200925&r2=1200926&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/libsvn_ra_neon/file_revs.c (original)
+++ subversion/branches/moves-scan-log/subversion/libsvn_ra_neon/file_revs.c Fri Nov 11 16:06:45 2011
@@ -307,7 +307,7 @@ svn_ra_neon__get_file_revs(svn_ra_sessio
apr_pool_t *pool)
{
svn_ra_neon__session_t *ras = session->priv;
- svn_stringbuf_t *request_body = svn_stringbuf_create("", pool);
+ svn_stringbuf_t *request_body = svn_stringbuf_create_empty(pool);
const char *bc_url;
const char *bc_relative;
const char *final_bc_url;
@@ -349,7 +349,7 @@ svn_ra_neon__get_file_revs(svn_ra_sessio
/* Initialize the baton. */
rb.handler = handler;
rb.handler_baton = handler_baton;
- rb.cdata_accum = svn_stringbuf_create("", pool);
+ rb.cdata_accum = svn_stringbuf_create_empty(pool);
rb.subpool = svn_pool_create(pool);
reset_file_rev(&rb);
Modified: subversion/branches/moves-scan-log/subversion/libsvn_ra_neon/get_dated_rev.c
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/libsvn_ra_neon/get_dated_rev.c?rev=1200926&r1=1200925&r2=1200926&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/libsvn_ra_neon/get_dated_rev.c (original)
+++ subversion/branches/moves-scan-log/subversion/libsvn_ra_neon/get_dated_rev.c Fri Nov 11 16:06:45 2011
@@ -93,7 +93,7 @@ drev_start_element(int *elem, void *bato
return SVN_NO_ERROR;
if (elm->id == ELEM_version_name)
- b->cdata = svn_stringbuf_create("", b->pool);
+ b->cdata = svn_stringbuf_create_empty(b->pool);
return SVN_NO_ERROR;
}
Modified: subversion/branches/moves-scan-log/subversion/libsvn_ra_neon/get_deleted_rev.c
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/libsvn_ra_neon/get_deleted_rev.c?rev=1200926&r1=1200925&r2=1200926&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/libsvn_ra_neon/get_deleted_rev.c (original)
+++ subversion/branches/moves-scan-log/subversion/libsvn_ra_neon/get_deleted_rev.c Fri Nov 11 16:06:45 2011
@@ -89,7 +89,7 @@ drev_start_element(int *elem, void *bato
return SVN_NO_ERROR;
if (elm->id == ELEM_version_name)
- b->cdata = svn_stringbuf_create("", b->pool);
+ b->cdata = svn_stringbuf_create_empty(b->pool);
return SVN_NO_ERROR;
}
Modified: subversion/branches/moves-scan-log/subversion/libsvn_ra_neon/get_location_segments.c
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/libsvn_ra_neon/get_location_segments.c?rev=1200926&r1=1200925&r2=1200926&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/libsvn_ra_neon/get_location_segments.c (original)
+++ subversion/branches/moves-scan-log/subversion/libsvn_ra_neon/get_location_segments.c Fri Nov 11 16:06:45 2011
@@ -150,7 +150,7 @@ svn_ra_neon__get_location_segments(svn_r
apr_pool_t *subpool = svn_pool_create(pool);
/* Build the request body. */
- request_body = svn_stringbuf_create("", subpool);
+ request_body = svn_stringbuf_create_empty(subpool);
svn_stringbuf_appendcstr(request_body,
"<?xml version=\"1.0\" encoding=\"utf-8\"?>"
DEBUG_CR "<S:get-location-segments xmlns:S=\""
Modified: subversion/branches/moves-scan-log/subversion/libsvn_ra_neon/get_locations.c
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/libsvn_ra_neon/get_locations.c?rev=1200926&r1=1200925&r2=1200926&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/libsvn_ra_neon/get_locations.c (original)
+++ subversion/branches/moves-scan-log/subversion/libsvn_ra_neon/get_locations.c Fri Nov 11 16:06:45 2011
@@ -138,7 +138,7 @@ svn_ra_neon__get_locations(svn_ra_sessio
*locations = apr_hash_make(pool);
- request_body = svn_stringbuf_create("", pool);
+ request_body = svn_stringbuf_create_empty(pool);
svn_stringbuf_appendcstr(request_body,
"<?xml version=\"1.0\" encoding=\"utf-8\"?>" DEBUG_CR
"<S:get-locations xmlns:S=\"" SVN_XML_NAMESPACE
Modified: subversion/branches/moves-scan-log/subversion/libsvn_ra_neon/get_locks.c
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/libsvn_ra_neon/get_locks.c?rev=1200926&r1=1200925&r2=1200926&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/libsvn_ra_neon/get_locks.c (original)
+++ subversion/branches/moves-scan-log/subversion/libsvn_ra_neon/get_locks.c Fri Nov 11 16:06:45 2011
@@ -257,13 +257,11 @@ getlocks_end_element(void *userdata, int
else if ((baton->requested_depth == svn_depth_files) ||
(baton->requested_depth == svn_depth_immediates))
{
- const char *rel_uri = svn_fspath__is_child(baton->path,
- baton->current_lock->path,
- baton->scratchpool);
+ const char *rel_uri = svn_fspath__skip_ancestor(
+ baton->path, baton->current_lock->path);
if (rel_uri && (svn_path_component_count(rel_uri) == 1))
apr_hash_set(baton->lock_hash, baton->current_lock->path,
APR_HASH_KEY_STRING, baton->current_lock);
- svn_pool_clear(baton->scratchpool);
}
break;
@@ -389,7 +387,7 @@ svn_ra_neon__get_locks(svn_ra_session_t
baton.scratchpool = svn_pool_create(pool);
baton.current_lock = NULL;
baton.encoding = NULL;
- baton.cdata_accum = svn_stringbuf_create("", pool);
+ baton.cdata_accum = svn_stringbuf_create_empty(pool);
body = apr_psprintf(pool,
"<?xml version=\"1.0\" encoding=\"utf-8\"?>"
Modified: subversion/branches/moves-scan-log/subversion/libsvn_ra_neon/lock.c
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/libsvn_ra_neon/lock.c?rev=1200926&r1=1200925&r2=1200926&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/libsvn_ra_neon/lock.c (original)
+++ subversion/branches/moves-scan-log/subversion/libsvn_ra_neon/lock.c Fri Nov 11 16:06:45 2011
@@ -105,13 +105,13 @@ lock_start_element(int *elem, void *bato
case ELEM_lock_timeout:
case ELEM_lock_depth:
case ELEM_status:
- b->cdata = svn_stringbuf_create("", b->pool);
+ b->cdata = svn_stringbuf_create_empty(b->pool);
break;
case ELEM_href:
if (parent == ELEM_lock_token
|| parent == ELEM_response)
- b->cdata = svn_stringbuf_create("", b->pool);
+ b->cdata = svn_stringbuf_create_empty(b->pool);
break;
default:
Modified: subversion/branches/moves-scan-log/subversion/libsvn_ra_neon/log.c
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/libsvn_ra_neon/log.c?rev=1200926&r1=1200925&r2=1200926&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/libsvn_ra_neon/log.c (original)
+++ subversion/branches/moves-scan-log/subversion/libsvn_ra_neon/log.c Fri Nov 11 16:06:45 2011
@@ -365,7 +365,7 @@ svn_error_t * svn_ra_neon__get_log(svn_r
int i;
svn_ra_neon__session_t *ras = session->priv;
- svn_stringbuf_t *request_body = svn_stringbuf_create("", pool);
+ svn_stringbuf_t *request_body = svn_stringbuf_create_empty(pool);
svn_boolean_t want_custom_revprops;
struct log_baton lb;
const char *bc_url;
@@ -491,7 +491,7 @@ svn_error_t * svn_ra_neon__get_log(svn_r
lb.count = 0;
lb.nest_level = 0;
lb.limit_compat_bailout = FALSE;
- lb.cdata = svn_stringbuf_create("", pool);
+ lb.cdata = svn_stringbuf_create_empty(pool);
lb.log_entry = svn_log_entry_create(pool);
lb.want_cdata = NULL;
reset_log_item(&lb);
Modified: subversion/branches/moves-scan-log/subversion/libsvn_ra_neon/merge.c
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/libsvn_ra_neon/merge.c?rev=1200926&r1=1200925&r2=1200926&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/libsvn_ra_neon/merge.c (original)
+++ subversion/branches/moves-scan-log/subversion/libsvn_ra_neon/merge.c Fri Nov 11 16:06:45 2011
@@ -259,7 +259,7 @@ static svn_error_t * handle_resource(mer
}
/* a collection or regular resource */
- if (! svn_urlpath__is_ancestor(mc->base_href, mc->href->data))
+ if (! svn_urlpath__skip_ancestor(mc->base_href, mc->href->data))
{
/* ### need something better than APR_EGENERAL */
return svn_error_createf(APR_EGENERAL, NULL,
@@ -269,9 +269,7 @@ static svn_error_t * handle_resource(mer
}
/* given HREF of the form: BASE "/" RELATIVE, extract the relative portion */
- relative = svn_urlpath__is_child(mc->base_href, mc->href->data, NULL);
- if (! relative) /* the paths are equal */
- relative = "";
+ relative = svn_urlpath__skip_ancestor(mc->base_href, mc->href->data);
/* bump the resource */
relative = svn_path_uri_decode(relative, pool);
@@ -704,9 +702,9 @@ svn_error_t * svn_ra_neon__merge_activit
merge_ctx_t mc = { 0 };
const char *body;
apr_hash_t *extra_headers = NULL;
- svn_stringbuf_t *lockbuf = svn_stringbuf_create("", pool);
+ svn_stringbuf_t *lockbuf = svn_stringbuf_create_empty(pool);
- mc.cdata = svn_stringbuf_create("", pool);
+ mc.cdata = svn_stringbuf_create_empty(pool);
mc.pool = pool;
mc.scratchpool = svn_pool_create(pool);
mc.base_href = repos_url;
Modified: subversion/branches/moves-scan-log/subversion/libsvn_ra_neon/mergeinfo.c
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/libsvn_ra_neon/mergeinfo.c?rev=1200926&r1=1200925&r2=1200926&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/libsvn_ra_neon/mergeinfo.c (original)
+++ subversion/branches/moves-scan-log/subversion/libsvn_ra_neon/mergeinfo.c Fri Nov 11 16:06:45 2011
@@ -167,7 +167,7 @@ svn_ra_neon__get_mergeinfo(svn_ra_sessio
apr_pool_t *pool)
{
svn_ra_neon__session_t *ras = session->priv;
- svn_stringbuf_t *request_body = svn_stringbuf_create("", pool);
+ svn_stringbuf_t *request_body = svn_stringbuf_create_empty(pool);
struct mergeinfo_baton mb;
const char *bc_url;
const char *bc_relative;
@@ -221,8 +221,8 @@ svn_ra_neon__get_mergeinfo(svn_ra_sessio
svn_stringbuf_appendcstr(request_body, minfo_report_tail);
mb.pool = pool;
- mb.curr_path = svn_stringbuf_create("", pool);
- mb.curr_info = svn_stringbuf_create("", pool);
+ mb.curr_path = svn_stringbuf_create_empty(pool);
+ mb.curr_info = svn_stringbuf_create_empty(pool);
mb.catalog = apr_hash_make(pool);
mb.err = SVN_NO_ERROR;
Modified: subversion/branches/moves-scan-log/subversion/libsvn_ra_neon/options.c
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/libsvn_ra_neon/options.c?rev=1200926&r1=1200925&r2=1200926&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/libsvn_ra_neon/options.c (original)
+++ subversion/branches/moves-scan-log/subversion/libsvn_ra_neon/options.c Fri Nov 11 16:06:45 2011
@@ -288,7 +288,7 @@ svn_ra_neon__exchange_capabilities(svn_r
int status_code;
oc.pool = pool;
- oc.cdata = svn_stringbuf_create("", pool);
+ oc.cdata = svn_stringbuf_create_empty(pool);
if (youngest_rev)
*youngest_rev = SVN_INVALID_REVNUM;
Modified: subversion/branches/moves-scan-log/subversion/libsvn_ra_neon/props.c
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/libsvn_ra_neon/props.c?rev=1200926&r1=1200925&r2=1200926&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/libsvn_ra_neon/props.c (original)
+++ subversion/branches/moves-scan-log/subversion/libsvn_ra_neon/props.c Fri Nov 11 16:06:45 2011
@@ -547,7 +547,7 @@ svn_error_t * svn_ra_neon__get_props(apr
pc.pool = pool;
pc.propbuffer = apr_hash_make(pool);
pc.props = apr_hash_make(pool);
- pc.cdata = svn_stringbuf_create("", pool);
+ pc.cdata = svn_stringbuf_create_empty(pool);
/* Create and dispatch the request! */
SVN_ERR(svn_ra_neon__parsed_request(sess, "PROPFIND", url,
Modified: subversion/branches/moves-scan-log/subversion/libsvn_ra_neon/replay.c
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/libsvn_ra_neon/replay.c?rev=1200926&r1=1200925&r2=1200926&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/libsvn_ra_neon/replay.c (original)
+++ subversion/branches/moves-scan-log/subversion/libsvn_ra_neon/replay.c Fri Nov 11 16:06:45 2011
@@ -345,7 +345,7 @@ start_element(int *elem, void *baton, in
if (svn_xml_get_attr_value("del", atts))
rb->prop_accum = NULL;
else
- rb->prop_accum = svn_stringbuf_create("", rb->prop_pool);
+ rb->prop_accum = svn_stringbuf_create_empty(rb->prop_pool);
rb->prop_name = apr_pstrdup(rb->prop_pool, name);
}
@@ -479,7 +479,7 @@ svn_ra_neon__replay(svn_ra_session_t *se
rb.pool = pool;
rb.dirs = apr_array_make(pool, 5, sizeof(dir_item_t));
rb.prop_pool = svn_pool_create(pool);
- rb.prop_accum = svn_stringbuf_create("", rb.prop_pool);
+ rb.prop_accum = svn_stringbuf_create_empty(rb.prop_pool);
return svn_ra_neon__parsed_request(ras, "REPORT", ras->url->data, body,
NULL, NULL,
Modified: subversion/branches/moves-scan-log/subversion/libsvn_ra_neon/util.c
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/libsvn_ra_neon/util.c?rev=1200926&r1=1200925&r2=1200926&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/libsvn_ra_neon/util.c (original)
+++ subversion/branches/moves-scan-log/subversion/libsvn_ra_neon/util.c Fri Nov 11 16:06:45 2011
@@ -313,12 +313,12 @@ multistatus_parser_create(svn_ra_neon__r
start_207_element,
svn_ra_neon__xml_collect_cdata,
end_207_element, b);
- b->cdata = svn_stringbuf_create("", req->pool);
- b->description = svn_stringbuf_create("", req->pool);
+ b->cdata = svn_stringbuf_create_empty(req->pool);
+ b->description = svn_stringbuf_create_empty(req->pool);
b->req = req;
- b->propname = svn_stringbuf_create("", req->pool);
- b->propstat_description = svn_stringbuf_create("", req->pool);
+ b->propname = svn_stringbuf_create_empty(req->pool);
+ b->propstat_description = svn_stringbuf_create_empty(req->pool);
}
@@ -895,7 +895,7 @@ error_parser_create(svn_ra_neon__request
b->tmp_err = NULL;
b->want_cdata = NULL;
- b->cdata = svn_stringbuf_create("", req->pool);
+ b->cdata = svn_stringbuf_create_empty(req->pool);
/* attach a standard <D:error> body parser to the request */
error_parser = xml_parser_create(req);
Modified: subversion/branches/moves-scan-log/subversion/libsvn_ra_serf/blame.c
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/libsvn_ra_serf/blame.c?rev=1200926&r1=1200925&r2=1200926&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/libsvn_ra_serf/blame.c (original)
+++ subversion/branches/moves-scan-log/subversion/libsvn_ra_serf/blame.c Fri Nov 11 16:06:45 2011
@@ -54,7 +54,7 @@ typedef enum blame_state_e {
SET_PROP,
REMOVE_PROP,
MERGED_REVISION,
- TXDELTA,
+ TXDELTA
} blame_state_e;
typedef struct blame_info_t {
@@ -151,7 +151,7 @@ create_propval(blame_info_t *info)
if (!info->prop_attr)
{
- return svn_string_create("", info->pool);
+ return svn_string_create_empty(info->pool);
}
else
{
Modified: subversion/branches/moves-scan-log/subversion/libsvn_ra_serf/commit.c
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/libsvn_ra_serf/commit.c?rev=1200926&r1=1200925&r2=1200926&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/libsvn_ra_serf/commit.c (original)
+++ subversion/branches/moves-scan-log/subversion/libsvn_ra_serf/commit.c Fri Nov 11 16:06:45 2011
@@ -527,9 +527,8 @@ checkout_file(file_context_t *file)
file->checkout->activity_url = file->commit->activity_url;
file->checkout->resource_url =
svn_path_url_add_component2(parent_dir->checkout->resource_url,
- svn_relpath__is_child(parent_dir->relpath,
- file->relpath,
- file->pool),
+ svn_relpath_skip_ancestor(
+ parent_dir->relpath, file->relpath),
file->pool);
return SVN_NO_ERROR;
}
@@ -1800,7 +1799,7 @@ change_dir_prop(void *dir_baton,
}
else
{
- value = svn_string_create("", dir->pool);
+ value = svn_string_create_empty(dir->pool);
svn_ra_serf__set_prop(dir->removed_props, proppatch_target,
ns, name, value, dir->pool);
}
@@ -2048,7 +2047,7 @@ change_file_prop(void *file_baton,
}
else
{
- value = svn_string_create("", file->pool);
+ value = svn_string_create_empty(file->pool);
svn_ra_serf__set_prop(file->removed_props, file->url,
ns, name, value, file->pool);
@@ -2320,6 +2319,8 @@ svn_ra_serf__get_commit_editor(svn_ra_se
svn_delta_editor_t *editor;
commit_context_t *ctx;
apr_hash_index_t *hi;
+ svn_delta_shim_callbacks_t *shim_callbacks =
+ svn_delta_shim_callbacks_default(pool);
ctx = apr_pcalloc(pool, sizeof(*ctx));
@@ -2367,8 +2368,7 @@ svn_ra_serf__get_commit_editor(svn_ra_se
*edit_baton = ctx;
SVN_ERR(svn_editor__insert_shims(ret_editor, edit_baton, *ret_editor,
- *edit_baton, NULL, NULL, NULL, NULL,
- pool, pool));
+ *edit_baton, shim_callbacks, pool, pool));
return SVN_NO_ERROR;
}
@@ -2462,7 +2462,7 @@ svn_ra_serf__change_rev_prop(svn_ra_sess
}
else if (old_value_p)
{
- svn_string_t *dummy_value = svn_string_create("", proppatch_ctx->pool);
+ svn_string_t *dummy_value = svn_string_create_empty(proppatch_ctx->pool);
svn_ra_serf__set_prop(proppatch_ctx->previous_removed_props,
proppatch_ctx->path,
@@ -2476,7 +2476,7 @@ svn_ra_serf__change_rev_prop(svn_ra_sess
}
else
{
- value = svn_string_create("", proppatch_ctx->pool);
+ value = svn_string_create_empty(proppatch_ctx->pool);
svn_ra_serf__set_prop(proppatch_ctx->removed_props, proppatch_ctx->path,
ns, name, value, proppatch_ctx->pool);
Modified: subversion/branches/moves-scan-log/subversion/libsvn_ra_serf/get_deleted_rev.c
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/libsvn_ra_serf/get_deleted_rev.c?rev=1200926&r1=1200925&r2=1200926&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/libsvn_ra_serf/get_deleted_rev.c (original)
+++ subversion/branches/moves-scan-log/subversion/libsvn_ra_serf/get_deleted_rev.c Fri Nov 11 16:06:45 2011
@@ -37,7 +37,7 @@
*/
typedef enum drev_state_e {
NONE = 0,
- VERSION_NAME,
+ VERSION_NAME
} drev_state_e;
typedef struct drev_context_t {
Modified: subversion/branches/moves-scan-log/subversion/libsvn_ra_serf/getdate.c
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/libsvn_ra_serf/getdate.c?rev=1200926&r1=1200925&r2=1200926&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/libsvn_ra_serf/getdate.c (original)
+++ subversion/branches/moves-scan-log/subversion/libsvn_ra_serf/getdate.c Fri Nov 11 16:06:45 2011
@@ -48,7 +48,7 @@
*/
typedef enum date_state_e {
NONE = 0,
- VERSION_NAME,
+ VERSION_NAME
} date_state_e;
typedef struct date_info_t {
Modified: subversion/branches/moves-scan-log/subversion/libsvn_ra_serf/getlocations.c
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/libsvn_ra_serf/getlocations.c?rev=1200926&r1=1200925&r2=1200926&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/libsvn_ra_serf/getlocations.c (original)
+++ subversion/branches/moves-scan-log/subversion/libsvn_ra_serf/getlocations.c Fri Nov 11 16:06:45 2011
@@ -43,7 +43,7 @@
*/
typedef enum loc_state_e {
REPORT,
- LOCATION,
+ LOCATION
} loc_state_e;
typedef struct loc_state_list_t {
Modified: subversion/branches/moves-scan-log/subversion/libsvn_ra_serf/getlocks.c
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/libsvn_ra_serf/getlocks.c?rev=1200926&r1=1200925&r2=1200926&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/libsvn_ra_serf/getlocks.c (original)
+++ subversion/branches/moves-scan-log/subversion/libsvn_ra_serf/getlocks.c Fri Nov 11 16:06:45 2011
@@ -55,7 +55,7 @@ typedef enum lock_state_e {
OWNER,
COMMENT,
CREATION_DATE,
- EXPIRATION_DATE,
+ EXPIRATION_DATE
} lock_state_e;
typedef struct lock_info_t {
@@ -200,9 +200,8 @@ end_getlocks(svn_ra_serf__xml_parser_t *
else if ((lock_ctx->requested_depth == svn_depth_files) ||
(lock_ctx->requested_depth == svn_depth_immediates))
{
- const char *rel_path = svn_fspath__is_child(lock_ctx->path,
- info->lock->path,
- info->pool);
+ const char *rel_path = svn_fspath__skip_ancestor(lock_ctx->path,
+ info->lock->path);
if (rel_path && (svn_path_component_count(rel_path) == 1))
apr_hash_set(lock_ctx->hash, info->lock->path,
APR_HASH_KEY_STRING, info->lock);
Modified: subversion/branches/moves-scan-log/subversion/libsvn_ra_serf/locks.c
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/libsvn_ra_serf/locks.c?rev=1200926&r1=1200925&r2=1200926&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/libsvn_ra_serf/locks.c (original)
+++ subversion/branches/moves-scan-log/subversion/libsvn_ra_serf/locks.c Fri Nov 11 16:06:45 2011
@@ -55,7 +55,7 @@ typedef enum lock_state_e {
DEPTH,
TIMEOUT,
LOCK_TOKEN,
- COMMENT,
+ COMMENT
} lock_state_e;
typedef struct lock_prop_info_t {
Modified: subversion/branches/moves-scan-log/subversion/libsvn_ra_serf/log.c
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/libsvn_ra_serf/log.c?rev=1200926&r1=1200925&r2=1200926&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/libsvn_ra_serf/log.c (original)
+++ subversion/branches/moves-scan-log/subversion/libsvn_ra_serf/log.c Fri Nov 11 16:06:45 2011
@@ -61,7 +61,7 @@ typedef enum log_state_e {
REPLACED_PATH,
DELETED_PATH,
MODIFIED_PATH,
- SUBTRACTIVE_MERGE,
+ SUBTRACTIVE_MERGE
} log_state_e;
typedef struct log_info_t {
Modified: subversion/branches/moves-scan-log/subversion/libsvn_ra_serf/merge.c
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/libsvn_ra_serf/merge.c?rev=1200926&r1=1200925&r2=1200926&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/libsvn_ra_serf/merge.c (original)
+++ subversion/branches/moves-scan-log/subversion/libsvn_ra_serf/merge.c Fri Nov 11 16:06:45 2011
@@ -60,14 +60,14 @@ typedef enum merge_state_e {
DATE,
IGNORE_PROP_NAME,
NEED_PROP_NAME,
- PROP_VAL,
+ PROP_VAL
} merge_state_e;
typedef enum resource_type_e {
UNSET,
BASELINE,
COLLECTION,
- CHECKED_IN,
+ CHECKED_IN
} resource_type_e;
typedef struct merge_info_t {
@@ -292,7 +292,7 @@ end_merge(svn_ra_serf__xml_parser_t *par
const char *href;
href = apr_hash_get(info->props, "href", APR_HASH_KEY_STRING);
- if (! svn_urlpath__is_ancestor(ctx->merge_url, href))
+ if (! svn_urlpath__skip_ancestor(ctx->merge_url, href))
{
return svn_error_createf(SVN_ERR_RA_DAV_REQUEST_FAILED, NULL,
_("A MERGE response for '%s' is not "
@@ -311,11 +311,9 @@ end_merge(svn_ra_serf__xml_parser_t *par
/* From the above check, we know that CTX->MERGE_URL is
an ancestor of HREF. All that remains is to
- determine of HREF is the same as CTX->MERGE_URL, or --
- if not -- is relative value as a child thereof. */
- href = svn_urlpath__is_child(ctx->merge_url, href, NULL);
- if (! href)
- href = "";
+ determine if HREF is the same as CTX->MERGE_URL, or --
+ if not -- its relative value as a child thereof. */
+ href = svn_urlpath__skip_ancestor(ctx->merge_url, href);
checked_in = apr_hash_get(info->props, "checked-in",
APR_HASH_KEY_STRING);
@@ -447,7 +445,7 @@ svn_ra_serf__merge_lock_token_list(apr_h
path.data = key;
path.len = klen;
- if (parent && !svn_relpath__is_ancestor(parent, key))
+ if (parent && !svn_relpath_skip_ancestor(parent, key))
continue;
svn_ra_serf__add_open_tag_buckets(body, alloc, "S:lock", NULL);
Modified: subversion/branches/moves-scan-log/subversion/libsvn_ra_serf/mergeinfo.c
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/libsvn_ra_serf/mergeinfo.c?rev=1200926&r1=1200925&r2=1200926&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/libsvn_ra_serf/mergeinfo.c (original)
+++ subversion/branches/moves-scan-log/subversion/libsvn_ra_serf/mergeinfo.c Fri Nov 11 16:06:45 2011
@@ -256,8 +256,8 @@ svn_ra_serf__get_mergeinfo(svn_ra_sessio
mergeinfo_ctx = apr_pcalloc(pool, sizeof(*mergeinfo_ctx));
mergeinfo_ctx->pool = pool;
- mergeinfo_ctx->curr_path = svn_stringbuf_create("", pool);
- mergeinfo_ctx->curr_info = svn_stringbuf_create("", pool);
+ mergeinfo_ctx->curr_path = svn_stringbuf_create_empty(pool);
+ mergeinfo_ctx->curr_info = svn_stringbuf_create_empty(pool);
mergeinfo_ctx->done = FALSE;
mergeinfo_ctx->result_catalog = apr_hash_make(pool);
mergeinfo_ctx->paths = paths;
Modified: subversion/branches/moves-scan-log/subversion/libsvn_ra_serf/options.c
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/libsvn_ra_serf/options.c?rev=1200926&r1=1200925&r2=1200926&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/libsvn_ra_serf/options.c (original)
+++ subversion/branches/moves-scan-log/subversion/libsvn_ra_serf/options.c Fri Nov 11 16:06:45 2011
@@ -51,7 +51,7 @@
typedef enum options_state_e {
OPTIONS,
ACTIVITY_COLLECTION,
- HREF,
+ HREF
} options_state_e;
typedef struct options_state_list_t {
Modified: subversion/branches/moves-scan-log/subversion/libsvn_ra_serf/property.c
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/libsvn_ra_serf/property.c?rev=1200926&r1=1200925&r2=1200926&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/libsvn_ra_serf/property.c (original)
+++ subversion/branches/moves-scan-log/subversion/libsvn_ra_serf/property.c Fri Nov 11 16:06:45 2011
@@ -43,7 +43,7 @@ typedef enum prop_state_e {
NONE = 0,
RESPONSE,
PROP,
- PROPVAL,
+ PROPVAL
} prop_state_e;
typedef struct prop_info_t {
Modified: subversion/branches/moves-scan-log/subversion/libsvn_ra_serf/replay.c
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/libsvn_ra_serf/replay.c?rev=1200926&r1=1200925&r2=1200926&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/libsvn_ra_serf/replay.c (original)
+++ subversion/branches/moves-scan-log/subversion/libsvn_ra_serf/replay.c Fri Nov 11 16:06:45 2011
@@ -55,7 +55,7 @@ typedef enum replay_state_e {
ADD_FILE,
DELETE_ENTRY,
APPLY_TEXTDELTA,
- CHANGE_PROP,
+ CHANGE_PROP
} replay_state_e;
typedef struct replay_info_t replay_info_t;
Modified: subversion/branches/moves-scan-log/subversion/libsvn_ra_serf/update.c
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/libsvn_ra_serf/update.c?rev=1200926&r1=1200925&r2=1200926&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/libsvn_ra_serf/update.c (original)
+++ subversion/branches/moves-scan-log/subversion/libsvn_ra_serf/update.c Fri Nov 11 16:06:45 2011
@@ -68,7 +68,7 @@ typedef enum report_state_e {
ADD_FILE,
PROP,
IGNORE_PROP_NAME,
- NEED_PROP_NAME,
+ NEED_PROP_NAME
} report_state_e;
Modified: subversion/branches/moves-scan-log/subversion/libsvn_ra_serf/util.c
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/libsvn_ra_serf/util.c?rev=1200926&r1=1200925&r2=1200926&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/libsvn_ra_serf/util.c (original)
+++ subversion/branches/moves-scan-log/subversion/libsvn_ra_serf/util.c Fri Nov 11 16:06:45 2011
@@ -914,7 +914,7 @@ svn_ra_serf__handle_discard_body(serf_re
server_err->error = svn_error_create(APR_SUCCESS, NULL, NULL);
server_err->has_xml_response = TRUE;
server_err->contains_precondition_error = FALSE;
- server_err->cdata = svn_stringbuf_create("", pool);
+ server_err->cdata = svn_stringbuf_create_empty(pool);
server_err->collect_cdata = FALSE;
server_err->parser.pool = server_err->error->pool;
server_err->parser.user_data = server_err;
@@ -1182,7 +1182,7 @@ svn_ra_serf__handle_multistatus_only(ser
server_err->error = svn_error_create(APR_SUCCESS, NULL, NULL);
server_err->has_xml_response = TRUE;
server_err->contains_precondition_error = FALSE;
- server_err->cdata = svn_stringbuf_create("", server_err->error->pool);
+ server_err->cdata = svn_stringbuf_create_empty(server_err->error->pool);
server_err->collect_cdata = FALSE;
server_err->parser.pool = server_err->error->pool;
server_err->parser.user_data = server_err;
@@ -2408,15 +2408,8 @@ svn_ra_serf__get_relative_path(const cha
decoded_root = svn_path_uri_decode(session->repos_root.path, pool);
decoded_orig = svn_path_uri_decode(orig_path, pool);
- if (strcmp(decoded_root, decoded_orig) == 0)
- {
- *rel_path = "";
- }
- else
- {
- *rel_path = svn_urlpath__is_child(decoded_root, decoded_orig, pool);
- SVN_ERR_ASSERT(*rel_path != NULL);
- }
+ *rel_path = svn_urlpath__skip_ancestor(decoded_root, decoded_orig);
+ SVN_ERR_ASSERT(*rel_path != NULL);
return SVN_NO_ERROR;
}
Modified: subversion/branches/moves-scan-log/subversion/libsvn_ra_svn/client.c
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/libsvn_ra_svn/client.c?rev=1200926&r1=1200925&r2=1200926&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/libsvn_ra_svn/client.c (original)
+++ subversion/branches/moves-scan-log/subversion/libsvn_ra_svn/client.c Fri Nov 11 16:06:45 2011
@@ -2340,7 +2340,7 @@ static svn_error_t *ra_svn_get_locks(svn
}
else if ((depth == svn_depth_files) || (depth == svn_depth_immediates))
{
- const char *relpath = svn_fspath__is_child(abs_path, lock->path, pool);
+ const char *relpath = svn_fspath__skip_ancestor(abs_path, lock->path);
if (relpath && (svn_path_component_count(relpath) == 1))
apr_hash_set(*locks, lock->path, APR_HASH_KEY_STRING, lock);
}
Modified: subversion/branches/moves-scan-log/subversion/libsvn_ra_svn/editorp.c
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/libsvn_ra_svn/editorp.c?rev=1200926&r1=1200925&r2=1200926&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/libsvn_ra_svn/editorp.c (original)
+++ subversion/branches/moves-scan-log/subversion/libsvn_ra_svn/editorp.c Fri Nov 11 16:06:45 2011
@@ -408,6 +408,8 @@ void svn_ra_svn_get_editor(const svn_del
{
svn_delta_editor_t *ra_svn_editor = svn_delta_default_editor(pool);
ra_svn_edit_baton_t *eb;
+ svn_delta_shim_callbacks_t *shim_callbacks =
+ svn_delta_shim_callbacks_default(pool);
eb = apr_palloc(pool, sizeof(*eb));
eb->conn = conn;
@@ -437,8 +439,8 @@ void svn_ra_svn_get_editor(const svn_del
*edit_baton = eb;
svn_error_clear(svn_editor__insert_shims(editor, edit_baton, *editor,
- *edit_baton, NULL, NULL,
- NULL, NULL, pool, pool));
+ *edit_baton, shim_callbacks,
+ pool, pool));
}
/* --- DRIVING AN EDITOR --- */
Modified: subversion/branches/moves-scan-log/subversion/libsvn_repos/commit.c
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/libsvn_repos/commit.c?rev=1200926&r1=1200925&r2=1200926&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/libsvn_repos/commit.c (original)
+++ subversion/branches/moves-scan-log/subversion/libsvn_repos/commit.c Fri Nov 11 16:06:45 2011
@@ -782,6 +782,40 @@ abort_edit(void *edit_baton,
}
+static svn_error_t *
+prop_fetch_func(apr_hash_t **props,
+ void *baton,
+ const char *path,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool)
+{
+ struct edit_baton *eb = baton;
+ svn_fs_root_t *fs_root;
+
+ SVN_ERR(svn_fs_revision_root(&fs_root, eb->fs,
+ svn_fs_txn_base_revision(eb->txn),
+ scratch_pool));
+ SVN_ERR(svn_fs_node_proplist(props, fs_root, path, result_pool));
+
+ return SVN_NO_ERROR;
+}
+
+static svn_error_t *
+kind_fetch_func(svn_kind_t *kind,
+ void *baton,
+ const char *path,
+ apr_pool_t *scratch_pool)
+{
+ struct edit_baton *eb = baton;
+ svn_node_kind_t node_kind;
+
+ SVN_ERR(svn_fs_check_path(&node_kind, eb->txn_root, path, scratch_pool));
+ *kind = svn__kind_from_node_kind(node_kind, FALSE);
+
+ return SVN_NO_ERROR;
+}
+
+
/*** Public interfaces. ***/
@@ -802,6 +836,8 @@ svn_repos_get_commit_editor5(const svn_d
svn_delta_editor_t *e;
apr_pool_t *subpool = svn_pool_create(pool);
struct edit_baton *eb;
+ svn_delta_shim_callbacks_t *shim_callbacks =
+ svn_delta_shim_callbacks_default(pool);
/* Do a global authz access lookup. Users with no write access
whatsoever to the repository don't get a commit editor. */
@@ -853,8 +889,13 @@ svn_repos_get_commit_editor5(const svn_d
*edit_baton = eb;
*editor = e;
+ shim_callbacks->fetch_props_func = prop_fetch_func;
+ shim_callbacks->fetch_props_baton = eb;
+ shim_callbacks->fetch_kind_func = kind_fetch_func;
+ shim_callbacks->fetch_kind_baton = eb;
+
SVN_ERR(svn_editor__insert_shims(editor, edit_baton, *editor, *edit_baton,
- NULL, NULL, NULL, NULL, pool, pool));
+ shim_callbacks, pool, pool));
return SVN_NO_ERROR;
}
Modified: subversion/branches/moves-scan-log/subversion/libsvn_repos/deprecated.c
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/libsvn_repos/deprecated.c?rev=1200926&r1=1200925&r2=1200926&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/libsvn_repos/deprecated.c (original)
+++ subversion/branches/moves-scan-log/subversion/libsvn_repos/deprecated.c Fri Nov 11 16:06:45 2011
@@ -715,6 +715,28 @@ svn_repos_verify_fs(svn_repos_t *repos,
/*** From load.c ***/
svn_error_t *
+svn_repos_load_fs3(svn_repos_t *repos,
+ svn_stream_t *dumpstream,
+ enum svn_repos_load_uuid uuid_action,
+ const char *parent_dir,
+ svn_boolean_t use_pre_commit_hook,
+ svn_boolean_t use_post_commit_hook,
+ svn_boolean_t validate_props,
+ svn_repos_notify_func_t notify_func,
+ void *notify_baton,
+ svn_cancel_func_t cancel_func,
+ void *cancel_baton,
+ apr_pool_t *pool)
+{
+ return svn_repos_load_fs4(repos, dumpstream,
+ SVN_INVALID_REVNUM, SVN_INVALID_REVNUM,
+ uuid_action, parent_dir,
+ use_pre_commit_hook, use_post_commit_hook,
+ validate_props, notify_func, notify_baton,
+ cancel_func, cancel_baton, pool);
+}
+
+svn_error_t *
svn_repos_load_fs2(svn_repos_t *repos,
svn_stream_t *dumpstream,
svn_stream_t *feedback_stream,
@@ -803,6 +825,25 @@ svn_repos_load_fs(svn_repos_t *repos,
}
svn_error_t *
+svn_repos_get_fs_build_parser3(const svn_repos_parse_fns2_t **callbacks,
+ void **parse_baton,
+ svn_repos_t *repos,
+ svn_boolean_t use_history,
+ svn_boolean_t validate_props,
+ enum svn_repos_load_uuid uuid_action,
+ const char *parent_dir,
+ svn_repos_notify_func_t notify_func,
+ void *notify_baton,
+ apr_pool_t *pool)
+{
+ return svn_repos_get_fs_build_parser4(callbacks, parse_baton, repos,
+ SVN_INVALID_REVNUM, SVN_INVALID_REVNUM,
+ use_history, validate_props,
+ uuid_action, parent_dir,
+ notify_func, notify_baton, pool);
+}
+
+svn_error_t *
svn_repos_get_fs_build_parser2(const svn_repos_parse_fns2_t **parser,
void **parse_baton,
svn_repos_t *repos,
Modified: subversion/branches/moves-scan-log/subversion/libsvn_repos/dump.c
URL: http://svn.apache.org/viewvc/subversion/branches/moves-scan-log/subversion/libsvn_repos/dump.c?rev=1200926&r1=1200925&r2=1200926&view=diff
==============================================================================
--- subversion/branches/moves-scan-log/subversion/libsvn_repos/dump.c (original)
+++ subversion/branches/moves-scan-log/subversion/libsvn_repos/dump.c Fri Nov 11 16:06:45 2011
@@ -870,6 +870,8 @@ get_dump_editor(const svn_delta_editor_t
root baton. */
struct edit_baton *eb = apr_pcalloc(pool, sizeof(*eb));
svn_delta_editor_t *dump_editor = svn_delta_default_editor(pool);
+ svn_delta_shim_callbacks_t *shim_callbacks =
+ svn_delta_shim_callbacks_default(pool);
/* Set up the edit baton. */
eb->stream = stream;
@@ -897,7 +899,7 @@ get_dump_editor(const svn_delta_editor_t
*editor = dump_editor;
SVN_ERR(svn_editor__insert_shims(editor, edit_baton, *editor, *edit_baton,
- NULL, NULL, NULL, NULL, pool, pool));
+ shim_callbacks, pool, pool));
return SVN_NO_ERROR;
}