You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2015/11/12 09:59:58 UTC
svn commit: r1713980 [4/6] - in
/subversion/branches/move-tracking-2/subversion: include/private/
libsvn_client/ libsvn_delta/ libsvn_ra/ libsvn_ra_local/ libsvn_repos/
libsvn_wc/ svnmover/
Modified: subversion/branches/move-tracking-2/subversion/libsvn_delta/element.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_delta/element.c?rev=1713980&r1=1713979&r2=1713980&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_delta/element.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_delta/element.c Thu Nov 12 08:59:57 2015
@@ -37,16 +37,16 @@
void *
-svn_eid_hash_get(apr_hash_t *ht,
- int key)
+svn_eid__hash_get(apr_hash_t *ht,
+ int key)
{
return apr_hash_get(ht, &key, sizeof(key));
}
void
-svn_eid_hash_set(apr_hash_t *ht,
- int key,
- const void *val)
+svn_eid__hash_set(apr_hash_t *ht,
+ int key,
+ const void *val)
{
int *id_p = apr_pmemdup(apr_hash_pool_get(ht), &key, sizeof(key));
@@ -54,7 +54,7 @@ svn_eid_hash_set(apr_hash_t *ht,
}
int
-svn_eid_hash_this_key(apr_hash_index_t *hi)
+svn_eid__hash_this_key(apr_hash_index_t *hi)
{
return *(const int *)apr_hash_this_key(hi);
}
@@ -108,7 +108,7 @@ svn_eid__hash_sort_compare_items_by_eid(
*/
svn_boolean_t
-svn_element_payload_invariants(const svn_element_payload_t *payload)
+svn_element__payload_invariants(const svn_element__payload_t *payload)
{
if (payload->is_subbranch_root)
return TRUE;
@@ -130,13 +130,13 @@ svn_element_payload_invariants(const svn
return FALSE;
}
-svn_element_payload_t *
-svn_element_payload_dup(const svn_element_payload_t *old,
- apr_pool_t *result_pool)
+svn_element__payload_t *
+svn_element__payload_dup(const svn_element__payload_t *old,
+ apr_pool_t *result_pool)
{
- svn_element_payload_t *new_payload;
+ svn_element__payload_t *new_payload;
- assert(! old || svn_element_payload_invariants(old));
+ assert(! old || svn_element__payload_invariants(old));
if (old == NULL)
return NULL;
@@ -155,14 +155,14 @@ svn_element_payload_dup(const svn_elemen
}
svn_boolean_t
-svn_element_payload_equal(const svn_element_payload_t *left,
- const svn_element_payload_t *right,
- apr_pool_t *scratch_pool)
+svn_element__payload_equal(const svn_element__payload_t *left,
+ const svn_element__payload_t *right,
+ apr_pool_t *scratch_pool)
{
apr_array_header_t *prop_diffs;
- assert(svn_element_payload_invariants(left));
- assert(svn_element_payload_invariants(right));
+ assert(svn_element__payload_invariants(left));
+ assert(svn_element__payload_invariants(right));
/* any two subbranch-root elements compare equal */
if (left->is_subbranch_root && right->is_subbranch_root)
@@ -214,25 +214,25 @@ svn_element_payload_equal(const svn_elem
return TRUE;
}
-svn_element_payload_t *
-svn_element_payload_create_subbranch(apr_pool_t *result_pool)
+svn_element__payload_t *
+svn_element__payload_create_subbranch(apr_pool_t *result_pool)
{
- svn_element_payload_t *new_payload
+ svn_element__payload_t *new_payload
= apr_pcalloc(result_pool, sizeof(*new_payload));
new_payload->pool = result_pool;
new_payload->is_subbranch_root = TRUE;
- assert(svn_element_payload_invariants(new_payload));
+ assert(svn_element__payload_invariants(new_payload));
return new_payload;
}
-svn_element_payload_t *
-svn_element_payload_create_ref(svn_revnum_t rev,
- const char *branch_id,
- int eid,
- apr_pool_t *result_pool)
+svn_element__payload_t *
+svn_element__payload_create_ref(svn_revnum_t rev,
+ const char *branch_id,
+ int eid,
+ apr_pool_t *result_pool)
{
- svn_element_payload_t *new_payload
+ svn_element__payload_t *new_payload
= apr_pcalloc(result_pool, sizeof(*new_payload));
new_payload->pool = result_pool;
@@ -240,30 +240,30 @@ svn_element_payload_create_ref(svn_revnu
new_payload->branch_ref.rev = rev;
new_payload->branch_ref.branch_id = apr_pstrdup(result_pool, branch_id);
new_payload->branch_ref.eid = eid;
- assert(svn_element_payload_invariants(new_payload));
+ assert(svn_element__payload_invariants(new_payload));
return new_payload;
}
-svn_element_payload_t *
-svn_element_payload_create_dir(apr_hash_t *props,
- apr_pool_t *result_pool)
+svn_element__payload_t *
+svn_element__payload_create_dir(apr_hash_t *props,
+ apr_pool_t *result_pool)
{
- svn_element_payload_t *new_payload
+ svn_element__payload_t *new_payload
= apr_pcalloc(result_pool, sizeof(*new_payload));
new_payload->pool = result_pool;
new_payload->kind = svn_node_dir;
new_payload->props = props ? svn_prop_hash_dup(props, result_pool) : NULL;
- assert(svn_element_payload_invariants(new_payload));
+ assert(svn_element__payload_invariants(new_payload));
return new_payload;
}
-svn_element_payload_t *
-svn_element_payload_create_file(apr_hash_t *props,
- svn_stringbuf_t *text,
- apr_pool_t *result_pool)
+svn_element__payload_t *
+svn_element__payload_create_file(apr_hash_t *props,
+ svn_stringbuf_t *text,
+ apr_pool_t *result_pool)
{
- svn_element_payload_t *new_payload
+ svn_element__payload_t *new_payload
= apr_pcalloc(result_pool, sizeof(*new_payload));
SVN_ERR_ASSERT_NO_RETURN(text);
@@ -272,16 +272,16 @@ svn_element_payload_create_file(apr_hash
new_payload->kind = svn_node_file;
new_payload->props = props ? svn_prop_hash_dup(props, result_pool) : NULL;
new_payload->text = svn_stringbuf_dup(text, result_pool);
- assert(svn_element_payload_invariants(new_payload));
+ assert(svn_element__payload_invariants(new_payload));
return new_payload;
}
-svn_element_payload_t *
-svn_element_payload_create_symlink(apr_hash_t *props,
- const char *target,
- apr_pool_t *result_pool)
+svn_element__payload_t *
+svn_element__payload_create_symlink(apr_hash_t *props,
+ const char *target,
+ apr_pool_t *result_pool)
{
- svn_element_payload_t *new_payload
+ svn_element__payload_t *new_payload
= apr_pcalloc(result_pool, sizeof(*new_payload));
SVN_ERR_ASSERT_NO_RETURN(target);
@@ -290,41 +290,41 @@ svn_element_payload_create_symlink(apr_h
new_payload->kind = svn_node_symlink;
new_payload->props = props ? svn_prop_hash_dup(props, result_pool) : NULL;
new_payload->target = apr_pstrdup(result_pool, target);
- assert(svn_element_payload_invariants(new_payload));
+ assert(svn_element__payload_invariants(new_payload));
return new_payload;
}
-svn_element_content_t *
-svn_element_content_create(int parent_eid,
- const char *name,
- const svn_element_payload_t *payload,
- apr_pool_t *result_pool)
+svn_element__content_t *
+svn_element__content_create(int parent_eid,
+ const char *name,
+ const svn_element__payload_t *payload,
+ apr_pool_t *result_pool)
{
- svn_element_content_t *content
+ svn_element__content_t *content
= apr_palloc(result_pool, sizeof(*content));
content->parent_eid = parent_eid;
content->name = apr_pstrdup(result_pool, name);
- content->payload = svn_element_payload_dup(payload, result_pool);
+ content->payload = svn_element__payload_dup(payload, result_pool);
return content;
}
-svn_element_content_t *
-svn_element_content_dup(const svn_element_content_t *old,
- apr_pool_t *result_pool)
+svn_element__content_t *
+svn_element__content_dup(const svn_element__content_t *old,
+ apr_pool_t *result_pool)
{
- svn_element_content_t *content
+ svn_element__content_t *content
= apr_pmemdup(result_pool, old, sizeof(*content));
content->name = apr_pstrdup(result_pool, old->name);
- content->payload = svn_element_payload_dup(old->payload, result_pool);
+ content->payload = svn_element__payload_dup(old->payload, result_pool);
return content;
}
svn_boolean_t
-svn_element_content_equal(const svn_element_content_t *content_left,
- const svn_element_content_t *content_right,
- apr_pool_t *scratch_pool)
+svn_element__content_equal(const svn_element__content_t *content_left,
+ const svn_element__content_t *content_right,
+ apr_pool_t *scratch_pool)
{
if (!content_left && !content_right)
{
@@ -343,8 +343,8 @@ svn_element_content_equal(const svn_elem
{
return FALSE;
}
- if (! svn_element_payload_equal(content_left->payload, content_right->payload,
- scratch_pool))
+ if (! svn_element__payload_equal(content_left->payload, content_right->payload,
+ scratch_pool))
{
return FALSE;
}
@@ -352,12 +352,12 @@ svn_element_content_equal(const svn_elem
return TRUE;
}
-svn_element_tree_t *
-svn_element_tree_create(apr_hash_t *e_map,
- int root_eid,
- apr_pool_t *result_pool)
+svn_element__tree_t *
+svn_element__tree_create(apr_hash_t *e_map,
+ int root_eid,
+ apr_pool_t *result_pool)
{
- svn_element_tree_t *element_tree
+ svn_element__tree_t *element_tree
= apr_pcalloc(result_pool, sizeof(*element_tree));
element_tree->e_map = e_map ? apr_hash_copy(result_pool, e_map)
@@ -366,32 +366,32 @@ svn_element_tree_create(apr_hash_t *e_ma
return element_tree;
}
-svn_element_content_t *
-svn_element_tree_get(const svn_element_tree_t *tree,
- int eid)
+svn_element__content_t *
+svn_element__tree_get(const svn_element__tree_t *tree,
+ int eid)
{
- return svn_eid_hash_get(tree->e_map, eid);
+ return svn_eid__hash_get(tree->e_map, eid);
}
svn_error_t *
-svn_element_tree_set(svn_element_tree_t *tree,
- int eid,
- svn_element_content_t *element)
+svn_element__tree_set(svn_element__tree_t *tree,
+ int eid,
+ svn_element__content_t *element)
{
- svn_eid_hash_set(tree->e_map, eid, element);
+ svn_eid__hash_set(tree->e_map, eid, element);
return SVN_NO_ERROR;
}
void
-svn_element_tree_purge_orphans(apr_hash_t *e_map,
- int root_eid,
- apr_pool_t *scratch_pool)
+svn_element__tree_purge_orphans(apr_hash_t *e_map,
+ int root_eid,
+ apr_pool_t *scratch_pool)
{
apr_hash_index_t *hi;
svn_boolean_t changed;
- SVN_ERR_ASSERT_NO_RETURN(svn_eid_hash_get(e_map, root_eid));
+ SVN_ERR_ASSERT_NO_RETURN(svn_eid__hash_get(e_map, root_eid));
do
{
@@ -400,18 +400,18 @@ svn_element_tree_purge_orphans(apr_hash_
for (hi = apr_hash_first(scratch_pool, e_map);
hi; hi = apr_hash_next(hi))
{
- int this_eid = svn_eid_hash_this_key(hi);
- svn_element_content_t *this_element = apr_hash_this_val(hi);
+ int this_eid = svn_eid__hash_this_key(hi);
+ svn_element__content_t *this_element = apr_hash_this_val(hi);
if (this_eid != root_eid)
{
- svn_element_content_t *parent_element
- = svn_eid_hash_get(e_map, this_element->parent_eid);
+ svn_element__content_t *parent_element
+ = svn_eid__hash_get(e_map, this_element->parent_eid);
/* Purge if parent is deleted */
if (! parent_element)
{
- svn_eid_hash_set(e_map, this_eid, NULL);
+ svn_eid__hash_set(e_map, this_eid, NULL);
changed = TRUE;
}
else
@@ -424,16 +424,16 @@ svn_element_tree_purge_orphans(apr_hash_
}
const char *
-svn_element_tree_get_path_by_eid(const svn_element_tree_t *tree,
- int eid,
- apr_pool_t *result_pool)
+svn_element__tree_get_path_by_eid(const svn_element__tree_t *tree,
+ int eid,
+ apr_pool_t *result_pool)
{
const char *path = "";
- svn_element_content_t *element;
+ svn_element__content_t *element;
for (; eid != tree->root_eid; eid = element->parent_eid)
{
- element = svn_element_tree_get(tree, eid);
+ element = svn_element__tree_get(tree, eid);
if (! element)
return NULL;
path = svn_relpath_join(element->name, path, result_pool);
@@ -442,27 +442,27 @@ svn_element_tree_get_path_by_eid(const s
return path;
}
-svn_element_tree_t *
-svn_element_tree_get_subtree_at_eid(svn_element_tree_t *element_tree,
- int eid,
- apr_pool_t *result_pool)
+svn_element__tree_t *
+svn_element__tree_get_subtree_at_eid(svn_element__tree_t *element_tree,
+ int eid,
+ apr_pool_t *result_pool)
{
- svn_element_tree_t *new_subtree;
- svn_element_content_t *subtree_root_element;
+ svn_element__tree_t *new_subtree;
+ svn_element__content_t *subtree_root_element;
- new_subtree = svn_element_tree_create(element_tree->e_map, eid,
- result_pool);
+ new_subtree = svn_element__tree_create(element_tree->e_map, eid,
+ result_pool);
/* Purge orphans */
- svn_element_tree_purge_orphans(new_subtree->e_map,
- new_subtree->root_eid, result_pool);
+ svn_element__tree_purge_orphans(new_subtree->e_map,
+ new_subtree->root_eid, result_pool);
/* Remove 'parent' and 'name' attributes from subtree root element */
subtree_root_element
- = svn_element_tree_get(new_subtree, new_subtree->root_eid);
- svn_element_tree_set(new_subtree, new_subtree->root_eid,
- svn_element_content_create(
- -1, "", subtree_root_element->payload, result_pool));
+ = svn_element__tree_get(new_subtree, new_subtree->root_eid);
+ svn_element__tree_set(new_subtree, new_subtree->root_eid,
+ svn_element__content_create(
+ -1, "", subtree_root_element->payload, result_pool));
return new_subtree;
}
Modified: subversion/branches/move-tracking-2/subversion/libsvn_delta/migrate.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_delta/migrate.c?rev=1713980&r1=1713979&r2=1713980&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_delta/migrate.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_delta/migrate.c Thu Nov 12 08:59:57 2015
@@ -34,7 +34,7 @@
struct edit_baton
{
- svn_branch_txn_t *edit_txn;
+ svn_branch__txn_t *edit_txn;
svn_ra_session_t *from_session;
svn_revnum_t revision;
};
@@ -326,12 +326,13 @@ abort_edit(void *edit_baton,
}
svn_error_t *
-svn_branch_get_migration_editor(const svn_delta_editor_t **old_editor,
- void **old_edit_baton,
- svn_branch_txn_t *edit_txn,
- svn_ra_session_t *from_session,
- svn_revnum_t revision,
- apr_pool_t *result_pool)
+svn_branch__compat_get_migration_editor(
+ const svn_delta_editor_t **old_editor,
+ void **old_edit_baton,
+ svn_branch__txn_t *edit_txn,
+ svn_ra_session_t *from_session,
+ svn_revnum_t revision,
+ apr_pool_t *result_pool)
{
static const svn_delta_editor_t editor = {
set_target_revision,
Modified: subversion/branches/move-tracking-2/subversion/libsvn_ra/ra_loader.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_ra/ra_loader.c?rev=1713980&r1=1713979&r2=1713980&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_ra/ra_loader.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_ra/ra_loader.c Thu Nov 12 08:59:57 2015
@@ -679,8 +679,8 @@ write_rev_prop(svn_ra_session_t *ra_sess
* branch-tracking metadata from the repository into it.
*/
static svn_error_t *
-svn_branch_revision_fetch_info(svn_branch_txn_t **txn_p,
- svn_branch_repos_t *repos,
+svn_branch_revision_fetch_info(svn_branch__txn_t **txn_p,
+ svn_branch__repos_t *repos,
svn_ra_session_t *ra_session,
const char *branch_info_dir,
svn_revnum_t revision,
@@ -689,7 +689,7 @@ svn_branch_revision_fetch_info(svn_branc
{
svn_string_t *value;
svn_stream_t *stream;
- svn_branch_txn_t *txn;
+ svn_branch__txn_t *txn;
SVN_ERR_ASSERT(SVN_IS_VALID_REVNUM(revision));
@@ -698,7 +698,7 @@ svn_branch_revision_fetch_info(svn_branc
scratch_pool));
if (! value && revision == 0)
{
- value = svn_branch_get_default_r0_metadata(scratch_pool);
+ value = svn_branch__get_default_r0_metadata(scratch_pool);
/*SVN_DBG(("fetch_per_revision_info(r%ld): LOADED DEFAULT INFO:\n%s",
revision, value->data));*/
SVN_ERR(write_rev_prop(ra_session, branch_info_dir, revision, value,
@@ -707,15 +707,15 @@ svn_branch_revision_fetch_info(svn_branc
SVN_ERR_ASSERT(value);
stream = svn_stream_from_string(value, scratch_pool);
- SVN_ERR(svn_branch_txn_parse(&txn, repos, stream,
- result_pool, scratch_pool));
+ SVN_ERR(svn_branch__txn_parse(&txn, repos, stream,
+ result_pool, scratch_pool));
/* Self-test: writing out the info should produce exactly the same string. */
{
svn_stringbuf_t *buf = svn_stringbuf_create_empty(scratch_pool);
stream = svn_stream_from_stringbuf(buf, scratch_pool);
- SVN_ERR(svn_branch_txn_serialize(txn, stream, scratch_pool));
+ SVN_ERR(svn_branch__txn_serialize(txn, stream, scratch_pool));
SVN_ERR(svn_stream_close(stream));
SVN_ERR_ASSERT(svn_string_compare(value,
@@ -729,39 +729,40 @@ svn_branch_revision_fetch_info(svn_branc
/* Fetch all element payloads in TXN.
*/
static svn_error_t *
-txn_fetch_payloads(svn_branch_txn_t *txn,
- svn_branch_compat__shim_fetch_func_t fetch_func,
+txn_fetch_payloads(svn_branch__txn_t *txn,
+ svn_branch__compat_fetch_func_t fetch_func,
void *fetch_baton,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
- apr_array_header_t *branches = svn_branch_txn_get_branches(txn, scratch_pool);
+ apr_array_header_t *branches = svn_branch__txn_get_branches(txn, scratch_pool);
int i;
/* Read payload of each element.
(In a real implementation, of course, we'd delay this until demanded.) */
for (i = 0; i < branches->nelts; i++)
{
- svn_branch_state_t *branch = APR_ARRAY_IDX(branches, i, void *);
- svn_element_tree_t *element_tree;
+ svn_branch__state_t *branch = APR_ARRAY_IDX(branches, i, void *);
+ svn_element__tree_t *element_tree;
apr_hash_index_t *hi;
- SVN_ERR(svn_branch_state_get_elements(branch, &element_tree,
- scratch_pool));
+ SVN_ERR(svn_branch__state_get_elements(branch, &element_tree,
+ scratch_pool));
for (hi = apr_hash_first(scratch_pool, element_tree->e_map);
hi; hi = apr_hash_next(hi))
{
- int eid = svn_eid_hash_this_key(hi);
- svn_element_content_t *element /*= apr_hash_this_val(hi)*/;
+ int eid = svn_eid__hash_this_key(hi);
+ svn_element__content_t *element /*= apr_hash_this_val(hi)*/;
- SVN_ERR(svn_branch_state_get_element(branch, &element,
- eid, scratch_pool));
+ SVN_ERR(svn_branch__state_get_element(branch, &element,
+ eid, scratch_pool));
if (! element->payload->is_subbranch_root)
{
- SVN_ERR(svn_payload_fetch(&element->payload,
- txn, element->payload->branch_ref,
- fetch_func, fetch_baton,
- result_pool, scratch_pool));
+ SVN_ERR(svn_branch__compat_fetch(&element->payload,
+ txn,
+ element->payload->branch_ref,
+ fetch_func, fetch_baton,
+ result_pool, scratch_pool));
}
}
}
@@ -773,16 +774,16 @@ txn_fetch_payloads(svn_branch_txn_t *txn
* branch-tracking metadata from the repository into it.
*/
static svn_error_t *
-svn_branch_repos_fetch_info(svn_branch_repos_t **repos_p,
+svn_branch_repos_fetch_info(svn_branch__repos_t **repos_p,
svn_ra_session_t *ra_session,
const char *branch_info_dir,
- svn_branch_compat__shim_fetch_func_t fetch_func,
+ svn_branch__compat_fetch_func_t fetch_func,
void *fetch_baton,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
- svn_branch_repos_t *repos
- = svn_branch_repos_create(result_pool);
+ svn_branch__repos_t *repos
+ = svn_branch__repos_create(result_pool);
svn_revnum_t base_revision;
svn_revnum_t r;
@@ -790,13 +791,13 @@ svn_branch_repos_fetch_info(svn_branch_r
for (r = 0; r <= base_revision; r++)
{
- svn_branch_txn_t *txn;
+ svn_branch__txn_t *txn;
SVN_ERR(svn_branch_revision_fetch_info(&txn,
repos, ra_session, branch_info_dir,
r,
result_pool, scratch_pool));
- SVN_ERR(svn_branch_repos_add_revision(repos, txn));
+ SVN_ERR(svn_branch__repos_add_revision(repos, txn));
SVN_ERR(txn_fetch_payloads(txn, fetch_func, fetch_baton,
result_pool, scratch_pool));
}
@@ -808,17 +809,17 @@ svn_branch_repos_fetch_info(svn_branch_r
/* Return a mutable state based on revision BASE_REVISION in REPOS.
*/
static svn_error_t *
-svn_branch_get_mutable_state(svn_branch_txn_t **txn_p,
- svn_branch_repos_t *repos,
+svn_branch_get_mutable_state(svn_branch__txn_t **txn_p,
+ svn_branch__repos_t *repos,
svn_ra_session_t *ra_session,
const char *branch_info_dir,
svn_revnum_t base_revision,
- svn_branch_compat__shim_fetch_func_t fetch_func,
+ svn_branch__compat_fetch_func_t fetch_func,
void *fetch_baton,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
- svn_branch_txn_t *txn;
+ svn_branch__txn_t *txn;
apr_array_header_t *branches;
int i;
@@ -837,15 +838,15 @@ svn_branch_get_mutable_state(svn_branch_
txn->base_rev = base_revision;
txn->rev = SVN_INVALID_REVNUM;
- branches = svn_branch_txn_get_branches(txn, scratch_pool);
+ branches = svn_branch__txn_get_branches(txn, scratch_pool);
for (i = 0; i < branches->nelts; i++)
{
- svn_branch_state_t *b = APR_ARRAY_IDX(branches, i, void *);
+ svn_branch__state_t *b = APR_ARRAY_IDX(branches, i, void *);
b->predecessor
- = svn_branch_rev_bid_create(base_revision,
- svn_branch_get_id(b, scratch_pool),
- result_pool);
+ = svn_branch__rev_bid_create(base_revision,
+ svn_branch__get_id(b, scratch_pool),
+ result_pool);
}
*txn_p = txn;
@@ -856,7 +857,7 @@ svn_branch_get_mutable_state(svn_branch_
* repository. TXN->rev is the newly committed revision number.
*/
static svn_error_t *
-store_repos_info(svn_branch_txn_t *txn,
+store_repos_info(svn_branch__txn_t *txn,
svn_ra_session_t *ra_session,
const char *branch_info_dir,
apr_pool_t *scratch_pool)
@@ -864,7 +865,7 @@ store_repos_info(svn_branch_txn_t *txn,
svn_stringbuf_t *buf = svn_stringbuf_create_empty(scratch_pool);
svn_stream_t *stream = svn_stream_from_stringbuf(buf, scratch_pool);
- SVN_ERR(svn_branch_txn_serialize(txn, stream, scratch_pool));
+ SVN_ERR(svn_branch__txn_serialize(txn, stream, scratch_pool));
SVN_ERR(svn_stream_close(stream));
/*SVN_DBG(("store_repos_info: %s", buf->data));*/
@@ -881,7 +882,7 @@ struct ccw_baton
svn_ra_session_t *session;
const char *branch_info_dir;
- svn_branch_txn_t *branching_txn;
+ svn_branch__txn_t *branching_txn;
};
/* Wrapper which stores the branching/move-tracking info.
@@ -896,10 +897,10 @@ commit_callback_wrapper(const svn_commit
/* if this commit used element-branching info, store the new info */
if (ccwb->branching_txn)
{
- svn_branch_repos_t *repos = ccwb->branching_txn->repos;
+ svn_branch__repos_t *repos = ccwb->branching_txn->repos;
ccwb->branching_txn->rev = commit_info->revision;
- SVN_ERR(svn_branch_repos_add_revision(repos, ccwb->branching_txn));
+ SVN_ERR(svn_branch__repos_add_revision(repos, ccwb->branching_txn));
SVN_ERR(store_repos_info(ccwb->branching_txn, ccwb->session,
ccwb->branch_info_dir, pool));
}
@@ -921,7 +922,7 @@ static void
remap_commit_callback(svn_commit_callback2_t *callback,
void **callback_baton,
svn_ra_session_t *session,
- svn_branch_txn_t *branching_txn,
+ svn_branch__txn_t *branching_txn,
const char *branch_info_dir,
svn_commit_callback2_t original_callback,
void *original_baton,
@@ -1018,8 +1019,8 @@ svn_ra_fetch(svn_node_kind_t *kind_p,
}
svn_error_t *
-svn_ra_load_branching_state(svn_branch_txn_t **branching_txn_p,
- svn_branch_compat__shim_fetch_func_t *fetch_func,
+svn_ra_load_branching_state(svn_branch__txn_t **branching_txn_p,
+ svn_branch__compat_fetch_func_t *fetch_func,
void **fetch_baton,
svn_ra_session_t *session,
const char *branch_info_dir,
@@ -1027,7 +1028,7 @@ svn_ra_load_branching_state(svn_branch_t
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
- svn_branch_repos_t *repos;
+ svn_branch__repos_t *repos;
const char *repos_root_url, *session_url, *base_relpath;
struct fb_baton *fbb = apr_palloc(result_pool, sizeof (*fbb));
@@ -1061,7 +1062,7 @@ svn_ra_load_branching_state(svn_branch_t
svn_error_t *
svn_ra_get_commit_txn(svn_ra_session_t *session,
- svn_branch_txn_t **edit_txn_p,
+ svn_branch__txn_t **edit_txn_p,
apr_hash_t *revprop_table,
svn_commit_callback2_t commit_callback,
void *commit_baton,
@@ -1070,12 +1071,12 @@ svn_ra_get_commit_txn(svn_ra_session_t *
const char *branch_info_dir,
apr_pool_t *pool)
{
- svn_branch_txn_t *branching_txn;
- svn_branch_compat__shim_fetch_func_t fetch_func;
+ svn_branch__txn_t *branching_txn;
+ svn_branch__compat_fetch_func_t fetch_func;
void *fetch_baton;
const svn_delta_editor_t *deditor;
void *dedit_baton;
- svn_branch_compat__shim_connector_t *shim_connector;
+ svn_branch__compat_shim_connector_t *shim_connector;
/* load branching info
* ### Currently we always start from a single base revision, never from
@@ -1104,7 +1105,7 @@ svn_ra_get_commit_txn(svn_ra_session_t *
/*if (! svn_dbg__quiet_mode())
SVN_ERR(svn_delta__get_debug_editor(&deditor, &dedit_baton,
deditor, dedit_baton, "", pool));*/
- SVN_ERR(svn_branch_compat_txn_from_delta_for_commit(
+ SVN_ERR(svn_branch__compat_txn_from_delta_for_commit(
edit_txn_p,
&shim_connector,
deditor, dedit_baton, branching_txn,
@@ -1143,7 +1144,7 @@ svn_error_t *svn_ra_get_commit_editor3(s
SVN_ERR(svn_ra__dup_session(&fbb->session, session, repos_root_url, pool, pool));
fbb->session_path = base_relpath;
fbb->repos_root_url = repos_root_url;
- SVN_ERR(svn_branch_compat__insert_shims(editor, edit_baton,
+ SVN_ERR(svn_branch__compat_insert_shims(editor, edit_baton,
*editor, *edit_baton,
repos_root_url, base_relpath,
svn_ra_fetch, fbb, pool, pool));
@@ -1219,7 +1220,7 @@ svn_ra_do_update4(svn_ra_session_t *sess
svn_depth_t depth,
svn_boolean_t send_copyfrom_args,
svn_boolean_t ignore_ancestry,
- svn_update_editor3_t *update_editor,
+ svn_branch__compat_update_editor3_t *update_editor,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
@@ -1269,7 +1270,7 @@ svn_ra_do_switch4(svn_ra_session_t *sess
const char *switch_url,
svn_boolean_t send_copyfrom_args,
svn_boolean_t ignore_ancestry,
- svn_update_editor3_t *switch_editor,
+ svn_branch__compat_update_editor3_t *switch_editor,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
Modified: subversion/branches/move-tracking-2/subversion/libsvn_ra/ra_loader.h
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_ra/ra_loader.h?rev=1713980&r1=1713979&r2=1713980&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_ra/ra_loader.h (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_ra/ra_loader.h Thu Nov 12 08:59:57 2015
@@ -152,7 +152,7 @@ typedef struct svn_ra__vtable_t {
svn_depth_t depth,
svn_boolean_t send_copyfrom_args,
svn_boolean_t ignore_ancestry,
- svn_update_editor3_t *update_editor,
+ svn_branch__compat_update_editor3_t *update_editor,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
/* See svn_ra_do_update3(). */
@@ -178,7 +178,7 @@ typedef struct svn_ra__vtable_t {
const char *switch_url,
svn_boolean_t send_copyfrom_args,
svn_boolean_t ignore_ancestry,
- svn_update_editor3_t *switch_editor,
+ svn_branch__compat_update_editor3_t *switch_editor,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
/* See svn_ra_do_switch3(). */
Modified: subversion/branches/move-tracking-2/subversion/libsvn_ra_local/ra_plugin.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_ra_local/ra_plugin.c?rev=1713980&r1=1713979&r2=1713980&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_ra_local/ra_plugin.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_ra_local/ra_plugin.c Thu Nov 12 08:59:57 2015
@@ -1064,7 +1064,7 @@ svn_ra_local__do_update_ev3(svn_ra_sessi
svn_depth_t depth,
svn_boolean_t send_copyfrom_args,
svn_boolean_t ignore_ancestry,
- svn_update_editor3_t *update_editor3,
+ svn_branch__compat_update_editor3_t *update_editor3,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
@@ -1074,7 +1074,7 @@ svn_ra_local__do_update_ev3(svn_ra_sessi
void *update_baton;
fb->session = session;
- SVN_ERR(svn_branch_compat_delta_from_txn_for_update(
+ SVN_ERR(svn_branch__compat_delta_from_txn_for_update(
&update_editor, &update_baton,
update_editor3,
sess->repos_url, sess->fs_path->data + 1,
@@ -1136,7 +1136,7 @@ svn_ra_local__do_switch_ev3(svn_ra_sessi
const char *switch_url,
svn_boolean_t send_copyfrom_args,
svn_boolean_t ignore_ancestry,
- svn_update_editor3_t *switch_editor,
+ svn_branch__compat_update_editor3_t *switch_editor,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
@@ -1146,7 +1146,7 @@ svn_ra_local__do_switch_ev3(svn_ra_sessi
void *update_baton;
fb->session = session;
- SVN_ERR(svn_branch_compat_delta_from_txn_for_update(
+ SVN_ERR(svn_branch__compat_delta_from_txn_for_update(
&update_editor, &update_baton,
switch_editor,
sess->repos_url, sess->fs_path->data + 1,
Modified: subversion/branches/move-tracking-2/subversion/libsvn_repos/commit.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_repos/commit.c?rev=1713980&r1=1713979&r2=1713980&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_repos/commit.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_repos/commit.c Thu Nov 12 08:59:57 2015
@@ -1050,7 +1050,7 @@ svn_repos_get_commit_editor5(const svn_d
*edit_baton = eb;
*editor = e;
- SVN_ERR(svn_branch_compat__insert_shims(editor, edit_baton, *editor, *edit_baton,
+ SVN_ERR(svn_branch__compat_insert_shims(editor, edit_baton, *editor, *edit_baton,
repos_url,
svn_relpath_canonicalize(eb->base_path, pool),
fetch_func, eb, pool, pool));
Modified: subversion/branches/move-tracking-2/subversion/libsvn_wc/deprecated.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_wc/deprecated.c?rev=1713980&r1=1713979&r2=1713980&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_wc/deprecated.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_wc/deprecated.c Thu Nov 12 08:59:57 2015
@@ -3557,7 +3557,7 @@ svn_wc_get_update_editor4(const svn_delt
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
- svn_update_editor3_t *editor3;
+ svn_branch__compat_update_editor3_t *editor3;
const char *repos_root_url;
const char *anchor_repos_relpath;
struct svn_wc__shim_fetch_baton_t *sfb;
@@ -3595,7 +3595,7 @@ svn_wc_get_update_editor4(const svn_delt
sfb->base_rrpath = anchor_repos_relpath;
sfb->fetch_base = TRUE;
- SVN_ERR(svn_branch_compat_delta_from_txn_for_update(
+ SVN_ERR(svn_branch__compat_delta_from_txn_for_update(
editor, edit_baton,
editor3,
repos_root_url, anchor_repos_relpath,
Modified: subversion/branches/move-tracking-2/subversion/libsvn_wc/update_editor.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_wc/update_editor.c?rev=1713980&r1=1713979&r2=1713980&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_wc/update_editor.c Thu Nov 12 08:59:57 2015
@@ -4861,7 +4861,7 @@ make_editor3(svn_revnum_t *target_revisi
void *external_baton,
const char *diff3_cmd,
const apr_array_header_t *preserved_exts,
- svn_update_editor3_t **editor,
+ svn_branch__compat_update_editor3_t **editor,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
@@ -5117,7 +5117,7 @@ make_editor3(svn_revnum_t *target_revisi
/*SVN_DBG(("wc make up/sw editor: base_rrpath='%s'; base_abspath=%s",
sfb->base_rrpath, sfb->base_abspath));*/
- SVN_ERR(svn_branch_compat_txn_from_delta_for_update(
+ SVN_ERR(svn_branch__compat_txn_from_delta_for_update(
editor,
inner_editor, inner_baton,
NULL /* ### branching_txn */,
@@ -5137,7 +5137,7 @@ make_editor3(svn_revnum_t *target_revisi
revision into @a *target_revision.
*/
svn_error_t *
-svn_wc__get_update_editor_ev3(svn_update_editor3_t **update_editor,
+svn_wc__get_update_editor_ev3(svn_branch__compat_update_editor3_t **update_editor,
svn_revnum_t *target_revision,
svn_wc_context_t *wc_ctx,
const char *anchor_abspath,
@@ -5182,7 +5182,7 @@ svn_wc__get_update_editor_ev3(svn_update
}
svn_error_t *
-svn_wc__get_switch_editor_ev3(svn_update_editor3_t **update_editor,
+svn_wc__get_switch_editor_ev3(svn_branch__compat_update_editor3_t **update_editor,
svn_revnum_t *target_revision,
svn_wc_context_t *wc_ctx,
const char *anchor_abspath,
@@ -5607,7 +5607,7 @@ svn_wc__get_switch_editor(const svn_delt
editor, edit_baton,
result_pool, scratch_pool);
#else
- svn_update_editor3_t *editor3;
+ svn_branch__compat_update_editor3_t *editor3;
const char *repos_root;
const char *anchor_repos_relpath;
struct svn_wc__shim_fetch_baton_t *sfb;
@@ -5648,7 +5648,7 @@ svn_wc__get_switch_editor(const svn_delt
sfb->base_rrpath = anchor_repos_relpath;
sfb->fetch_base = TRUE;
- SVN_ERR(svn_branch_compat_delta_from_txn_for_update(
+ SVN_ERR(svn_branch__compat_delta_from_txn_for_update(
editor, edit_baton,
editor3,
repos_root, anchor_repos_relpath,
Modified: subversion/branches/move-tracking-2/subversion/svnmover/merge3.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/svnmover/merge3.c?rev=1713980&r1=1713979&r2=1713980&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/svnmover/merge3.c (original)
+++ subversion/branches/move-tracking-2/subversion/svnmover/merge3.c Thu Nov 12 08:59:57 2015
@@ -52,42 +52,42 @@
/* Return (left, right) pairs of element content that differ between
* subtrees LEFT and RIGHT.
*
- * Set *DIFF_P to a hash of (eid -> (svn_branch_el_rev_content_t *)[2]).
+ * Set *DIFF_P to a hash of (eid -> (svn_element__content_t *)[2]).
*/
static svn_error_t *
element_differences(apr_hash_t **diff_p,
- const svn_element_tree_t *left,
- const svn_element_tree_t *right,
+ const svn_element__tree_t *left,
+ const svn_element__tree_t *right,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
apr_hash_t *diff = apr_hash_make(result_pool);
apr_hash_index_t *hi;
- /*SVN_DBG(("svn_branch_subtree_differences(b%s r%ld, b%s r%ld, e%d)",
- svn_branch_get_id(left->branch, scratch_pool), left->rev,
- svn_branch_get_id(right->branch, scratch_pool), right->rev,
+ /*SVN_DBG(("element_differences(b%s r%ld, b%s r%ld, e%d)",
+ svn_branch__get_id(left->branch, scratch_pool), left->rev,
+ svn_branch__get_id(right->branch, scratch_pool), right->rev,
right->eid));*/
for (hi = apr_hash_first(scratch_pool,
hash_overlay(left->e_map, right->e_map));
hi; hi = apr_hash_next(hi))
{
- int e = svn_eid_hash_this_key(hi);
- svn_element_content_t *element_left
- = svn_element_tree_get(left, e);
- svn_element_content_t *element_right
- = svn_element_tree_get(right, e);
+ int e = svn_eid__hash_this_key(hi);
+ svn_element__content_t *element_left
+ = svn_element__tree_get(left, e);
+ svn_element__content_t *element_right
+ = svn_element__tree_get(right, e);
- if (! svn_element_content_equal(element_left, element_right,
- scratch_pool))
+ if (! svn_element__content_equal(element_left, element_right,
+ scratch_pool))
{
- svn_element_content_t **contents
+ svn_element__content_t **contents
= apr_palloc(result_pool, 2 * sizeof(void *));
contents[0] = element_left;
contents[1] = element_right;
- svn_eid_hash_set(diff, e, contents);
+ svn_eid__hash_set(diff, e, contents);
}
}
@@ -100,13 +100,13 @@ element_differences(apr_hash_t **diff_p,
* Return "" if SUBBRANCH is null.
*/
static const char *
-branch_str(svn_branch_state_t *subbranch,
+branch_str(svn_branch__state_t *subbranch,
apr_pool_t *result_pool)
{
if (subbranch)
return apr_psprintf(result_pool,
" (branch %s)",
- svn_branch_get_id(subbranch, result_pool));
+ svn_branch__get_id(subbranch, result_pool));
return "";
}
@@ -115,20 +115,20 @@ branch_str(svn_branch_state_t *subbranch
* Return "" if the element is not a subbranch root element.
*/
static const char *
-subbranch_str(svn_branch_state_t *branch,
+subbranch_str(svn_branch__state_t *branch,
int eid,
apr_pool_t *result_pool)
{
- svn_branch_state_t *subbranch;
+ svn_branch__state_t *subbranch;
- svn_error_clear(svn_branch_get_subbranch_at_eid(branch, &subbranch, eid,
- result_pool));
+ svn_error_clear(svn_branch__get_subbranch_at_eid(branch, &subbranch, eid,
+ result_pool));
return branch_str(subbranch, result_pool);
}
/* */
static const char *
-brief_eid_and_name_or_nil(svn_element_content_t *e,
+brief_eid_and_name_or_nil(svn_element__content_t *e,
apr_pool_t *result_pool)
{
return e ? apr_psprintf(result_pool, "%d/%s", e->parent_eid, e->name)
@@ -166,22 +166,22 @@ typedef struct merge_conflict_policy_t
*/
typedef struct element_merge3_conflict_t
{
- svn_element_content_t *yca;
- svn_element_content_t *side1;
- svn_element_content_t *side2;
+ svn_element__content_t *yca;
+ svn_element__content_t *side1;
+ svn_element__content_t *side2;
} element_merge3_conflict_t;
static element_merge3_conflict_t *
-element_merge3_conflict_create(svn_element_content_t *yca,
- svn_element_content_t *side1,
- svn_element_content_t *side2,
+element_merge3_conflict_create(svn_element__content_t *yca,
+ svn_element__content_t *side1,
+ svn_element__content_t *side2,
apr_pool_t *result_pool)
{
element_merge3_conflict_t *c = apr_pcalloc(result_pool, sizeof(*c));
- c->yca = yca ? svn_element_content_dup(yca, result_pool) : NULL;
- c->side1 = side1 ? svn_element_content_dup(side1, result_pool) : NULL;
- c->side2 = side2 ? svn_element_content_dup(side2, result_pool) : NULL;
+ c->yca = yca ? svn_element__content_dup(yca, result_pool) : NULL;
+ c->side1 = side1 ? svn_element__content_dup(side1, result_pool) : NULL;
+ c->side2 = side2 ? svn_element__content_dup(side2, result_pool) : NULL;
return c;
}
@@ -244,7 +244,7 @@ name_clash_conflict_str(name_clash_confl
for (hi2 = apr_hash_first(result_pool, c->elements);
hi2; hi2 = apr_hash_next(hi2))
{
- int eid = svn_eid_hash_this_key(hi2);
+ int eid = svn_eid__hash_this_key(hi2);
apr_psprintf(result_pool, "%s\n element %d", s, eid);
}
@@ -279,7 +279,7 @@ cycle_conflict_str(cycle_conflict_t *c,
for (hi2 = apr_hash_first(result_pool, c->elements);
hi2; hi2 = apr_hash_next(hi2))
{
- int eid2 = svn_eid_hash_this_key(hi2);
+ int eid2 = svn_eid__hash_this_key(hi2);
s = apr_psprintf(result_pool, "%s e%d", s, eid2);
}
@@ -293,16 +293,16 @@ cycle_conflict_str(cycle_conflict_t *c,
*/
typedef struct orphan_conflict_t
{
- svn_element_content_t *element;
+ svn_element__content_t *element;
} orphan_conflict_t;
static orphan_conflict_t *
-orphan_conflict_create(svn_element_content_t *element,
+orphan_conflict_create(svn_element__content_t *element,
apr_pool_t *result_pool)
{
orphan_conflict_t *c = apr_pcalloc(result_pool, sizeof(*c));
- c->element = svn_element_content_dup(element, result_pool);
+ c->element = svn_element__content_dup(element, result_pool);
return c;
}
@@ -338,7 +338,7 @@ svnmover_display_conflicts(conflict_stor
conflict_storage->single_element_conflicts);
hi; hi = apr_hash_next(hi))
{
- int eid = svn_eid_hash_this_key(hi);
+ int eid = svn_eid__hash_this_key(hi);
element_merge3_conflict_t *c = apr_hash_this_val(hi);
svnmover_notify(" %s",
@@ -358,7 +358,7 @@ svnmover_display_conflicts(conflict_stor
conflict_storage->cycle_conflicts);
hi; hi = apr_hash_next(hi))
{
- int eid = svn_eid_hash_this_key(hi);
+ int eid = svn_eid__hash_this_key(hi);
cycle_conflict_t *c = apr_hash_this_val(hi);
svnmover_notify(" %s",
@@ -368,7 +368,7 @@ svnmover_display_conflicts(conflict_stor
conflict_storage->orphan_conflicts);
hi; hi = apr_hash_next(hi))
{
- int eid = svn_eid_hash_this_key(hi);
+ int eid = svn_eid__hash_this_key(hi);
orphan_conflict_t *c = apr_hash_this_val(hi);
svnmover_notify(" %s",
@@ -430,21 +430,21 @@ find_conflict(conflict_object_t **confli
{
int which_eid = atoi(id_string + 1);
- if (svn_eid_hash_get(conflicts->single_element_conflicts, which_eid))
+ if (svn_eid__hash_get(conflicts->single_element_conflicts, which_eid))
{
*conflict_p
= conflict_object_create(conflict_kind_single_element,
conflicts->single_element_conflicts,
&which_eid, result_pool);
}
- if (svn_eid_hash_get(conflicts->cycle_conflicts, which_eid))
+ if (svn_eid__hash_get(conflicts->cycle_conflicts, which_eid))
{
*conflict_p
= conflict_object_create(conflict_kind_cycle,
conflicts->cycle_conflicts,
&which_eid, result_pool);
}
- if (svn_eid_hash_get(conflicts->orphan_conflicts, which_eid))
+ if (svn_eid__hash_get(conflicts->orphan_conflicts, which_eid))
{
*conflict_p
= conflict_object_create(conflict_kind_orphan,
@@ -477,7 +477,7 @@ svnmover_conflict_resolved(conflict_stor
scratch_pool, scratch_pool));
if (! conflict)
{
- return svn_error_createf(SVN_ERR_BRANCHING, NULL,
+ return svn_error_createf(SVN_BRANCH__ERR, NULL,
_("Conflict '%s' not found"), id_string);
}
@@ -514,31 +514,31 @@ svnmover_any_conflicts(const conflict_st
* Allocate the result in RESULT_POOL and/or as pointers to the inputs.
*/
static void
-payload_merge(svn_element_payload_t **result_p,
+payload_merge(svn_element__payload_t **result_p,
svn_boolean_t *conflict_p,
int eid,
- svn_element_payload_t *side1,
- svn_element_payload_t *side2,
- svn_element_payload_t *yca,
+ svn_element__payload_t *side1,
+ svn_element__payload_t *side2,
+ svn_element__payload_t *yca,
const merge_conflict_policy_t *policy,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
svn_boolean_t conflict = FALSE;
- svn_element_payload_t *result = NULL;
+ svn_element__payload_t *result = NULL;
if (yca && side1 && side2)
{
- if (svn_element_payload_equal(side1, yca, scratch_pool))
+ if (svn_element__payload_equal(side1, yca, scratch_pool))
{
result = side2;
}
- else if (svn_element_payload_equal(side2, yca, scratch_pool))
+ else if (svn_element__payload_equal(side2, yca, scratch_pool))
{
result = side1;
}
else if (policy->merge_double_modify
- && svn_element_payload_equal(side1, side2, scratch_pool))
+ && svn_element__payload_equal(side1, side2, scratch_pool))
{
/*SVN_DBG(("e%d double modify: ... -> { ... | ... }",
eid));*/
@@ -569,20 +569,20 @@ payload_merge(svn_element_payload_t **re
* Allocate the result in RESULT_POOL and/or as pointers to the inputs.
*/
static void
-element_merge(svn_element_content_t **result_p,
+element_merge(svn_element__content_t **result_p,
element_merge3_conflict_t **conflict_p,
int eid,
- svn_element_content_t *side1,
- svn_element_content_t *side2,
- svn_element_content_t *yca,
+ svn_element__content_t *side1,
+ svn_element__content_t *side2,
+ svn_element__content_t *yca,
const merge_conflict_policy_t *policy,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
- svn_boolean_t same1 = svn_element_content_equal(yca, side1, scratch_pool);
- svn_boolean_t same2 = svn_element_content_equal(yca, side2, scratch_pool);
+ svn_boolean_t same1 = svn_element__content_equal(yca, side1, scratch_pool);
+ svn_boolean_t same2 = svn_element__content_equal(yca, side2, scratch_pool);
svn_boolean_t conflict = FALSE;
- svn_element_content_t *result = NULL;
+ svn_element__content_t *result = NULL;
if (same1)
{
@@ -677,7 +677,7 @@ element_merge(svn_element_content_t **re
if (policy->merge_double_add
&& !side1->payload->is_subbranch_root
&& !side2->payload->is_subbranch_root
- && svn_element_content_equal(side1, side2, scratch_pool))
+ && svn_element__content_equal(side1, side2, scratch_pool))
{
/*SVN_DBG(("e%d double add",
eid));*/
@@ -707,48 +707,48 @@ element_merge(svn_element_content_t **re
}
static svn_error_t *
-branch_merge_subtree_r(svn_branch_txn_t *edit_txn,
+branch_merge_subtree_r(svn_branch__txn_t *edit_txn,
conflict_storage_t **conflict_storage_p,
- const svn_branch_el_rev_id_t *src,
- const svn_branch_el_rev_id_t *tgt,
- const svn_branch_el_rev_id_t *yca,
+ const svn_branch__el_rev_id_t *src,
+ const svn_branch__el_rev_id_t *tgt,
+ const svn_branch__el_rev_id_t *yca,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
/* Merge the subbranch of {SRC, TGT, YCA} found at EID.
*/
static svn_error_t *
-merge_subbranch(svn_branch_txn_t *edit_txn,
- const svn_branch_el_rev_id_t *src,
- const svn_branch_el_rev_id_t *tgt,
- const svn_branch_el_rev_id_t *yca,
+merge_subbranch(svn_branch__txn_t *edit_txn,
+ const svn_branch__el_rev_id_t *src,
+ const svn_branch__el_rev_id_t *tgt,
+ const svn_branch__el_rev_id_t *yca,
int eid,
apr_pool_t *scratch_pool)
{
- svn_branch_state_t *src_subbranch;
- svn_branch_state_t *tgt_subbranch;
- svn_branch_state_t *yca_subbranch;
- svn_branch_el_rev_id_t *subbr_src = NULL;
- svn_branch_el_rev_id_t *subbr_tgt = NULL;
- svn_branch_el_rev_id_t *subbr_yca = NULL;
-
- SVN_ERR(svn_branch_get_subbranch_at_eid(src->branch, &src_subbranch,
- eid, scratch_pool));
- SVN_ERR(svn_branch_get_subbranch_at_eid(tgt->branch, &tgt_subbranch,
- eid, scratch_pool));
- SVN_ERR(svn_branch_get_subbranch_at_eid(yca->branch, &yca_subbranch,
- eid, scratch_pool));
+ svn_branch__state_t *src_subbranch;
+ svn_branch__state_t *tgt_subbranch;
+ svn_branch__state_t *yca_subbranch;
+ svn_branch__el_rev_id_t *subbr_src = NULL;
+ svn_branch__el_rev_id_t *subbr_tgt = NULL;
+ svn_branch__el_rev_id_t *subbr_yca = NULL;
+
+ SVN_ERR(svn_branch__get_subbranch_at_eid(src->branch, &src_subbranch,
+ eid, scratch_pool));
+ SVN_ERR(svn_branch__get_subbranch_at_eid(tgt->branch, &tgt_subbranch,
+ eid, scratch_pool));
+ SVN_ERR(svn_branch__get_subbranch_at_eid(yca->branch, &yca_subbranch,
+ eid, scratch_pool));
if (src_subbranch)
- subbr_src = svn_branch_el_rev_id_create(
- src_subbranch, svn_branch_root_eid(src_subbranch),
+ subbr_src = svn_branch__el_rev_id_create(
+ src_subbranch, svn_branch__root_eid(src_subbranch),
src->rev, scratch_pool);
if (tgt_subbranch)
- subbr_tgt = svn_branch_el_rev_id_create(
- tgt_subbranch, svn_branch_root_eid(tgt_subbranch),
+ subbr_tgt = svn_branch__el_rev_id_create(
+ tgt_subbranch, svn_branch__root_eid(tgt_subbranch),
tgt->rev, scratch_pool);
if (yca_subbranch)
- subbr_yca = svn_branch_el_rev_id_create(
- yca_subbranch, svn_branch_root_eid(yca_subbranch),
+ subbr_yca = svn_branch__el_rev_id_create(
+ yca_subbranch, svn_branch__root_eid(yca_subbranch),
yca->rev, scratch_pool);
if (subbr_src && subbr_tgt && subbr_yca) /* ?edit vs. ?edit */
@@ -777,17 +777,17 @@ merge_subbranch(svn_branch_txn_t *edit_t
else if (subbr_src) /* added on source branch */
{
const char *new_branch_id
- = svn_branch_id_nest(svn_branch_get_id(tgt->branch, scratch_pool),
- eid, scratch_pool);
- svn_branch_rev_bid_eid_t *from
- = svn_branch_rev_bid_eid_create(src_subbranch->txn->rev,
- svn_branch_get_id(src_subbranch,
- scratch_pool),
- svn_branch_root_eid(src_subbranch),
- scratch_pool);
+ = svn_branch__id_nest(svn_branch__get_id(tgt->branch, scratch_pool),
+ eid, scratch_pool);
+ svn_branch__rev_bid_eid_t *from
+ = svn_branch__rev_bid_eid_create(src_subbranch->txn->rev,
+ svn_branch__get_id(src_subbranch,
+ scratch_pool),
+ svn_branch__root_eid(src_subbranch),
+ scratch_pool);
- SVN_ERR(svn_branch_txn_branch(edit_txn, NULL /*new_branch_id_p*/, from,
- new_branch_id, scratch_pool, scratch_pool));
+ SVN_ERR(svn_branch__txn_branch(edit_txn, NULL /*new_branch_id_p*/, from,
+ new_branch_id, scratch_pool, scratch_pool));
}
else if (subbr_tgt) /* added on target branch */
{
@@ -806,8 +806,8 @@ static int
sort_compare_items_by_peid_and_name(const svn_sort__item_t *a,
const svn_sort__item_t *b)
{
- svn_element_content_t *element_a = a->value;
- svn_element_content_t *element_b = b->value;
+ svn_element__content_t *element_a = a->value;
+ svn_element__content_t *element_b = b->value;
if (element_a->parent_eid != element_b->parent_eid)
return element_a->parent_eid - element_b->parent_eid;
@@ -818,23 +818,23 @@ sort_compare_items_by_peid_and_name(cons
*/
static svn_error_t *
detect_clashes(apr_hash_t **clashes_p,
- svn_branch_state_t *branch,
+ svn_branch__state_t *branch,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
apr_hash_t *clashes = apr_hash_make(result_pool);
- svn_element_tree_t *elements;
+ svn_element__tree_t *elements;
svn_eid__hash_iter_t *ei;
int prev_eid = -1;
- svn_element_content_t *prev_element = NULL;
+ svn_element__content_t *prev_element = NULL;
- SVN_ERR(svn_branch_state_get_elements(branch, &elements, scratch_pool));
+ SVN_ERR(svn_branch__state_get_elements(branch, &elements, scratch_pool));
for (SVN_EID__HASH_ITER_SORTED(ei, elements->e_map,
sort_compare_items_by_peid_and_name,
scratch_pool))
{
int eid = ei->eid;
- svn_element_content_t *element = ei->val;
+ svn_element__content_t *element = ei->val;
if (prev_element
&& element->parent_eid == prev_element->parent_eid
@@ -852,8 +852,8 @@ detect_clashes(apr_hash_t **clashes_p,
result_pool);
svn_hash_sets(clashes, key, c);
}
- svn_eid_hash_set(c->elements, eid, &c);
- svn_eid_hash_set(c->elements, prev_eid, &c);
+ svn_eid__hash_set(c->elements, eid, &c);
+ svn_eid__hash_set(c->elements, prev_eid, &c);
}
prev_eid = eid;
prev_element = element;
@@ -871,37 +871,37 @@ detect_clashes(apr_hash_t **clashes_p,
*/
static svn_error_t *
detect_cycles(apr_hash_t **cycles_p,
- svn_branch_state_t *branch,
+ svn_branch__state_t *branch,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
apr_hash_t *cycles = apr_hash_make(result_pool);
apr_hash_index_t *hi;
- svn_element_tree_t *elements;
+ svn_element__tree_t *elements;
- SVN_ERR(svn_branch_state_get_elements(branch, &elements, scratch_pool));
+ SVN_ERR(svn_branch__state_get_elements(branch, &elements, scratch_pool));
for (hi = apr_hash_first(scratch_pool, elements->e_map);
hi; hi = apr_hash_next(hi))
{
- int eid = svn_eid_hash_this_key(hi);
- svn_element_content_t *element = apr_hash_this_val(hi);
+ int eid = svn_eid__hash_this_key(hi);
+ svn_element__content_t *element = apr_hash_this_val(hi);
cycle_conflict_t *c = cycle_conflict_create(result_pool);
- svn_eid_hash_set(c->elements, eid, c);
+ svn_eid__hash_set(c->elements, eid, c);
/* See if we can trace the parentage of EID back to the branch root
without finding a cycle. If we find a cycle, store a conflict. */
for (; element && (element->parent_eid != -1);
- element = svn_eid_hash_get(elements->e_map, element->parent_eid))
+ element = svn_eid__hash_get(elements->e_map, element->parent_eid))
{
/* If this parent-eid is already in the path from EID to the root,
then we have found a cycle. */
- if (svn_eid_hash_get(c->elements, element->parent_eid))
+ if (svn_eid__hash_get(c->elements, element->parent_eid))
{
- svn_eid_hash_set(cycles, eid, c);
+ svn_eid__hash_set(cycles, eid, c);
break;
}
- svn_eid_hash_set(c->elements, element->parent_eid, c);
+ svn_eid__hash_set(c->elements, element->parent_eid, c);
}
}
@@ -913,28 +913,28 @@ detect_cycles(apr_hash_t **cycles_p,
*/
static svn_error_t *
detect_orphans(apr_hash_t **orphans_p,
- svn_branch_state_t *branch,
+ svn_branch__state_t *branch,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
apr_hash_t *orphans = apr_hash_make(result_pool);
apr_hash_index_t *hi;
- svn_element_tree_t *elements;
+ svn_element__tree_t *elements;
- SVN_ERR(svn_branch_state_get_elements(branch, &elements, scratch_pool));
+ SVN_ERR(svn_branch__state_get_elements(branch, &elements, scratch_pool));
for (hi = apr_hash_first(scratch_pool, elements->e_map);
hi; hi = apr_hash_next(hi))
{
- int eid = svn_eid_hash_this_key(hi);
- svn_element_content_t *element = apr_hash_this_val(hi);
+ int eid = svn_eid__hash_this_key(hi);
+ svn_element__content_t *element = apr_hash_this_val(hi);
if (eid != elements->root_eid
- && ! svn_element_tree_get(elements, element->parent_eid))
+ && ! svn_element__tree_get(elements, element->parent_eid))
{
orphan_conflict_t *c;
c = orphan_conflict_create(element, result_pool);
- svn_eid_hash_set(orphans, eid, c);
+ svn_eid__hash_set(orphans, eid, c);
}
}
@@ -947,19 +947,19 @@ detect_orphans(apr_hash_t **orphans_p,
* Merge any sub-branches in the same way, recursively.
*/
static svn_error_t *
-branch_merge_subtree_r(svn_branch_txn_t *edit_txn,
+branch_merge_subtree_r(svn_branch__txn_t *edit_txn,
conflict_storage_t **conflict_storage_p,
- const svn_branch_el_rev_id_t *src,
- const svn_branch_el_rev_id_t *tgt,
- const svn_branch_el_rev_id_t *yca,
+ const svn_branch__el_rev_id_t *src,
+ const svn_branch__el_rev_id_t *tgt,
+ const svn_branch__el_rev_id_t *yca,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
- svn_branch_subtree_t *s_src, *s_tgt, *s_yca;
+ svn_branch__subtree_t *s_src, *s_tgt, *s_yca;
apr_hash_t *diff_yca_src, *diff_yca_tgt;
apr_hash_t *e_conflicts = apr_hash_make(result_pool);
conflict_storage_t *conflict_storage = conflict_storage_create(result_pool);
- svn_element_tree_t *src_elements, *tgt_elements, *yca_elements;
+ svn_element__tree_t *src_elements, *tgt_elements, *yca_elements;
apr_hash_t *all_elements;
svn_eid__hash_iter_t *ei;
const merge_conflict_policy_t policy = { TRUE, TRUE, TRUE, TRUE, TRUE };
@@ -967,16 +967,16 @@ branch_merge_subtree_r(svn_branch_txn_t
/*SVN_DBG(("merge src: r%2ld %s e%3d",
src->rev,
- svn_branch_get_id(src->branch, scratch_pool), src->eid));*/
+ svn_branch__get_id(src->branch, scratch_pool), src->eid));*/
/*SVN_DBG(("merge tgt: r%2ld %s e%3d",
tgt->rev,
- svn_branch_get_id(tgt->branch, scratch_pool), tgt->eid));*/
+ svn_branch__get_id(tgt->branch, scratch_pool), tgt->eid));*/
/*SVN_DBG(("merge yca: r%2ld %s e%3d",
yca->rev,
- svn_branch_get_id(yca->branch, scratch_pool), yca->eid));*/
+ svn_branch__get_id(yca->branch, scratch_pool), yca->eid));*/
svnmover_notify_v("merging into branch %s",
- svn_branch_get_id(tgt->branch, scratch_pool));
+ svn_branch__get_id(tgt->branch, scratch_pool));
/*
for (eid, diff1) in element_differences(YCA, FROM):
diff2 = element_diff(eid, YCA, TO)
@@ -986,9 +986,9 @@ branch_merge_subtree_r(svn_branch_txn_t
result := diff1.right
# else no change
*/
- SVN_ERR(svn_branch_get_subtree(src->branch, &s_src, src->eid, scratch_pool));
- SVN_ERR(svn_branch_get_subtree(tgt->branch, &s_tgt, tgt->eid, scratch_pool));
- SVN_ERR(svn_branch_get_subtree(yca->branch, &s_yca, yca->eid, scratch_pool));
+ SVN_ERR(svn_branch__get_subtree(src->branch, &s_src, src->eid, scratch_pool));
+ SVN_ERR(svn_branch__get_subtree(tgt->branch, &s_tgt, tgt->eid, scratch_pool));
+ SVN_ERR(svn_branch__get_subtree(yca->branch, &s_yca, yca->eid, scratch_pool));
SVN_ERR(element_differences(&diff_yca_src,
s_yca->tree, s_src->tree,
scratch_pool, scratch_pool));
@@ -998,12 +998,12 @@ branch_merge_subtree_r(svn_branch_txn_t
s_yca->tree, s_tgt->tree,
scratch_pool, scratch_pool));
- SVN_ERR(svn_branch_state_get_elements(src->branch, &src_elements,
- scratch_pool));
- SVN_ERR(svn_branch_state_get_elements(tgt->branch, &tgt_elements,
- scratch_pool));
- SVN_ERR(svn_branch_state_get_elements(yca->branch, &yca_elements,
- scratch_pool));
+ SVN_ERR(svn_branch__state_get_elements(src->branch, &src_elements,
+ scratch_pool));
+ SVN_ERR(svn_branch__state_get_elements(tgt->branch, &tgt_elements,
+ scratch_pool));
+ SVN_ERR(svn_branch__state_get_elements(yca->branch, &yca_elements,
+ scratch_pool));
all_elements = hash_overlay(src_elements->e_map,
tgt_elements->e_map);
all_elements = hash_overlay(yca_elements->e_map,
@@ -1011,14 +1011,14 @@ branch_merge_subtree_r(svn_branch_txn_t
for (SVN_EID__HASH_ITER_SORTED_BY_EID(ei, all_elements, scratch_pool))
{
int eid = ei->eid;
- svn_element_content_t **e_yca_src
- = svn_eid_hash_get(diff_yca_src, eid);
- svn_element_content_t **e_yca_tgt
- = svn_eid_hash_get(diff_yca_tgt, eid);
- svn_element_content_t *e_yca;
- svn_element_content_t *e_src;
- svn_element_content_t *e_tgt;
- svn_element_content_t *result;
+ svn_element__content_t **e_yca_src
+ = svn_eid__hash_get(diff_yca_src, eid);
+ svn_element__content_t **e_yca_tgt
+ = svn_eid__hash_get(diff_yca_tgt, eid);
+ svn_element__content_t *e_yca;
+ svn_element__content_t *e_src;
+ svn_element__content_t *e_tgt;
+ svn_element__content_t *result;
element_merge3_conflict_t *conflict;
svn_pool_clear(iterpool);
@@ -1049,8 +1049,8 @@ branch_merge_subtree_r(svn_branch_txn_t
if (conflict)
{
svnmover_notify_v("! e%d <conflict>", eid);
- svn_eid_hash_set(e_conflicts, eid,
- element_merge3_conflict_dup(conflict, result_pool));
+ svn_eid__hash_set(e_conflicts, eid,
+ element_merge3_conflict_dup(conflict, result_pool));
}
else if (e_tgt && result)
{
@@ -1058,9 +1058,9 @@ branch_merge_subtree_r(svn_branch_txn_t
eid, result->name,
subbranch_str(tgt->branch, eid, iterpool));
- SVN_ERR(svn_branch_state_alter_one(tgt->branch, eid,
- result->parent_eid, result->name,
- result->payload, iterpool));
+ SVN_ERR(svn_branch__state_alter_one(tgt->branch, eid,
+ result->parent_eid, result->name,
+ result->payload, iterpool));
SVN_ERR(merge_subbranch(edit_txn, src, tgt, yca, eid, iterpool));
}
@@ -1069,7 +1069,7 @@ branch_merge_subtree_r(svn_branch_txn_t
svnmover_notify_v("D e%d %s%s",
eid, e_yca->name,
subbranch_str(yca->branch, eid, iterpool));
- SVN_ERR(svn_branch_state_delete_one(tgt->branch, eid, iterpool));
+ SVN_ERR(svn_branch__state_delete_one(tgt->branch, eid, iterpool));
/* ### If this is a subbranch-root element being deleted, shouldn't
we see if there were any changes to be merged in the subbranch,
@@ -1088,9 +1088,9 @@ branch_merge_subtree_r(svn_branch_txn_t
* (which is not specified here, but will need to be),
* which may be in this branch or in another branch.
*/
- SVN_ERR(svn_branch_state_alter_one(tgt->branch, eid,
- result->parent_eid, result->name,
- result->payload, iterpool));
+ SVN_ERR(svn_branch__state_alter_one(tgt->branch, eid,
+ result->parent_eid, result->name,
+ result->payload, iterpool));
SVN_ERR(merge_subbranch(edit_txn, src, tgt, yca, eid, iterpool));
}
@@ -1114,18 +1114,18 @@ branch_merge_subtree_r(svn_branch_txn_t
result_pool, scratch_pool));
svnmover_notify_v("merging into branch %s -- finished",
- svn_branch_get_id(tgt->branch, scratch_pool));
+ svn_branch__get_id(tgt->branch, scratch_pool));
*conflict_storage_p = conflict_storage;
return SVN_NO_ERROR;
}
svn_error_t *
-svnmover_branch_merge(svn_branch_txn_t *edit_txn,
+svnmover_branch_merge(svn_branch__txn_t *edit_txn,
conflict_storage_t **conflict_storage_p,
- svn_branch_el_rev_id_t *src,
- svn_branch_el_rev_id_t *tgt,
- svn_branch_el_rev_id_t *yca,
+ svn_branch__el_rev_id_t *src,
+ svn_branch__el_rev_id_t *tgt,
+ svn_branch__el_rev_id_t *yca,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
Re: svn commit: r1713980 [4/6] - in /subversion/branches/move-tracking-2/subversion:
include/private/ libsvn_client/ libsvn_delta/ libsvn_ra/ libsvn_ra_local/
libsvn_repos/ libsvn_wc/ svnmover/
Posted by Julian Foad <ju...@gmail.com>.
I (Julian Foad) wrote:
> Well spotted, thanks. I didn't find this as it's a local name (static
> func), although I did catch a couple of other such cases. Will fix.
r1714159.
- Julian
> On 12 November 2015 at 16:54, Greg Stein <gs...@gmail.com> wrote:
>> On Thu, Nov 12, 2015 at 2:59 AM, <ju...@apache.org> wrote:
>>> static svn_error_t *
>>> -svn_branch_revision_fetch_info(svn_branch_txn_t **txn_p,
>>> - svn_branch_repos_t *repos,
>>> +svn_branch_revision_fetch_info(svn_branch__txn_t **txn_p,
>>
>> Seems you've missed a class of renames. Shouldn't this function name be
>> renamed, too?
Re: svn commit: r1713980 [4/6] - in /subversion/branches/move-tracking-2/subversion:
include/private/ libsvn_client/ libsvn_delta/ libsvn_ra/ libsvn_ra_local/
libsvn_repos/ libsvn_wc/ svnmover/
Posted by Greg Stein <gs...@gmail.com>.
Oh! I missed the static. ... then I guess dropping the prefix altogether
would be the correct "fix". ??
On Thu, Nov 12, 2015 at 4:38 PM, Julian Foad <ju...@gmail.com> wrote:
> Well spotted, thanks. I didn't find this as it's a local name (static
> func), although I did catch a couple of other such cases. Will fix.
>
> - Julian
>
> On 12 November 2015 at 16:54, Greg Stein <gs...@gmail.com> wrote:
> > On Thu, Nov 12, 2015 at 2:59 AM, <ju...@apache.org> wrote:
> >>...
> >>
> >> +++ subversion/branches/move-tracking-2/subversion/libsvn_ra/ra_loader.c
> >> Thu Nov 12 08:59:57 2015
> >> @@ -679,8 +679,8 @@ write_rev_prop(svn_ra_session_t *ra_sess
> >> * branch-tracking metadata from the repository into it.
> >> */
> >> static svn_error_t *
> >> -svn_branch_revision_fetch_info(svn_branch_txn_t **txn_p,
> >> - svn_branch_repos_t *repos,
> >> +svn_branch_revision_fetch_info(svn_branch__txn_t **txn_p,
> >
> >
> > Seems you've missed a class of renames. Shouldn't this function name be
> > renamed, too?
> >
> >>...
> >
> > Cheers,
> > -g
> >
>
Re: svn commit: r1713980 [4/6] - in /subversion/branches/move-tracking-2/subversion:
include/private/ libsvn_client/ libsvn_delta/ libsvn_ra/ libsvn_ra_local/
libsvn_repos/ libsvn_wc/ svnmover/
Posted by Julian Foad <ju...@gmail.com>.
Well spotted, thanks. I didn't find this as it's a local name (static
func), although I did catch a couple of other such cases. Will fix.
- Julian
On 12 November 2015 at 16:54, Greg Stein <gs...@gmail.com> wrote:
> On Thu, Nov 12, 2015 at 2:59 AM, <ju...@apache.org> wrote:
>>...
>>
>> +++ subversion/branches/move-tracking-2/subversion/libsvn_ra/ra_loader.c
>> Thu Nov 12 08:59:57 2015
>> @@ -679,8 +679,8 @@ write_rev_prop(svn_ra_session_t *ra_sess
>> * branch-tracking metadata from the repository into it.
>> */
>> static svn_error_t *
>> -svn_branch_revision_fetch_info(svn_branch_txn_t **txn_p,
>> - svn_branch_repos_t *repos,
>> +svn_branch_revision_fetch_info(svn_branch__txn_t **txn_p,
>
>
> Seems you've missed a class of renames. Shouldn't this function name be
> renamed, too?
>
>>...
>
> Cheers,
> -g
>
Re: svn commit: r1713980 [4/6] - in /subversion/branches/move-tracking-2/subversion:
include/private/ libsvn_client/ libsvn_delta/ libsvn_ra/ libsvn_ra_local/
libsvn_repos/ libsvn_wc/ svnmover/
Posted by Greg Stein <gs...@gmail.com>.
On Thu, Nov 12, 2015 at 2:59 AM, <ju...@apache.org> wrote:
>...
> +++ subversion/branches/move-tracking-2/subversion/libsvn_ra/ra_loader.c
> Thu Nov 12 08:59:57 2015
> @@ -679,8 +679,8 @@ write_rev_prop(svn_ra_session_t *ra_sess
> * branch-tracking metadata from the repository into it.
> */
> static svn_error_t *
> -svn_branch_revision_fetch_info(svn_branch_txn_t **txn_p,
> - svn_branch_repos_t *repos,
> +svn_branch_revision_fetch_info(svn_branch__txn_t **txn_p,
>
Seems you've missed a class of renames. Shouldn't this function name be
renamed, too?
>...
Cheers,
-g