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/10/14 18:15:46 UTC
svn commit: r1708644 - in /subversion/branches/move-tracking-2/subversion:
include/private/ libsvn_delta/ svnmover/
Author: julianfoad
Date: Wed Oct 14 16:15:45 2015
New Revision: 1708644
URL: http://svn.apache.org/viewvc?rev=1708644&view=rev
Log:
On the 'move-tracking-2' branch: Rename a struct and its functions,
following r1708631.
* subversion/include/private/svn_element.h,
subversion/libsvn_delta/element.c
(svn_element_content_t,
svn_element_content_create,
svn_element_content_dup,
svn_element_content_equal): Renamed from 'svn_branch_el_rev_content_*'.
* subversion/include/private/svn_branch.h,
subversion/include/private/svn_editor3e.h,
subversion/libsvn_delta/branch.c,
subversion/libsvn_delta/branch_nested.c,
subversion/libsvn_delta/compat3e.c,
subversion/libsvn_delta/editor3e.c,
subversion/svnmover/svnmover.c
Update all callers/users.
Modified:
subversion/branches/move-tracking-2/subversion/include/private/svn_branch.h
subversion/branches/move-tracking-2/subversion/include/private/svn_editor3e.h
subversion/branches/move-tracking-2/subversion/include/private/svn_element.h
subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c
subversion/branches/move-tracking-2/subversion/libsvn_delta/branch_nested.c
subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3e.c
subversion/branches/move-tracking-2/subversion/libsvn_delta/editor3e.c
subversion/branches/move-tracking-2/subversion/libsvn_delta/element.c
subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c
Modified: subversion/branches/move-tracking-2/subversion/include/private/svn_branch.h
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/include/private/svn_branch.h?rev=1708644&r1=1708643&r2=1708644&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/include/private/svn_branch.h (original)
+++ subversion/branches/move-tracking-2/subversion/include/private/svn_branch.h Wed Oct 14 16:15:45 2015
@@ -434,7 +434,7 @@ svn_branch_get_elements(svn_branch_state
*
* If element EID is not present, return null.
*/
-svn_branch_el_rev_content_t *
+svn_element_content_t *
svn_branch_get_element(const svn_branch_state_t *branch,
int eid);
Modified: subversion/branches/move-tracking-2/subversion/include/private/svn_editor3e.h
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/include/private/svn_editor3e.h?rev=1708644&r1=1708643&r2=1708644&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/include/private/svn_editor3e.h (original)
+++ subversion/branches/move-tracking-2/subversion/include/private/svn_editor3e.h Wed Oct 14 16:15:45 2015
@@ -789,7 +789,7 @@ svn_editor3_delete(svn_editor3_t *editor
*/
svn_error_t *
svn_editor3_payload_resolve(svn_editor3_t *editor,
- svn_branch_el_rev_content_t *element);
+ svn_element_content_t *element);
/** Register a sequence point.
*
@@ -928,7 +928,7 @@ typedef svn_error_t *(*svn_editor3_cb_de
*/
typedef svn_error_t *(*svn_editor3_cb_payload_resolve_t)(
void *baton,
- svn_branch_el_rev_content_t *element,
+ svn_element_content_t *element,
apr_pool_t *scratch_pool);
/** @see svn_editor3_sequence_point(), #svn_editor3_t
Modified: subversion/branches/move-tracking-2/subversion/include/private/svn_element.h
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/include/private/svn_element.h?rev=1708644&r1=1708643&r2=1708644&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/include/private/svn_element.h (original)
+++ subversion/branches/move-tracking-2/subversion/include/private/svn_element.h Wed Oct 14 16:15:45 2015
@@ -218,7 +218,7 @@ svn_element_payload_create_symlink(apr_h
/* The content (parent, name and payload) of an element-revision.
* In other words, an el-rev node in a (mixed-rev) directory-tree.
*/
-typedef struct svn_branch_el_rev_content_t
+typedef struct svn_element_content_t
{
/* eid of the parent element, or -1 if this is the root element */
int parent_eid;
@@ -227,28 +227,28 @@ typedef struct svn_branch_el_rev_content
/* payload (kind, props, text, ...) */
svn_element_payload_t *payload;
-} svn_branch_el_rev_content_t;
+} svn_element_content_t;
/* Return a new content object constructed with deep copies of PARENT_EID,
* NAME and PAYLOAD, allocated in RESULT_POOL.
*/
-svn_branch_el_rev_content_t *
-svn_branch_el_rev_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);
/* Return a deep copy of OLD, allocated in RESULT_POOL.
*/
-svn_branch_el_rev_content_t *
-svn_branch_el_rev_content_dup(const svn_branch_el_rev_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);
/* Return TRUE iff CONTENT_LEFT is the same as CONTENT_RIGHT. */
svn_boolean_t
-svn_branch_el_rev_content_equal(const svn_branch_el_rev_content_t *content_left,
- const svn_branch_el_rev_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);
/** @} */
@@ -299,14 +299,14 @@ svn_element_tree_create(apr_hash_t *e_ma
int root_eid,
apr_pool_t *result_pool);
-svn_branch_el_rev_content_t *
+svn_element_content_t *
svn_element_tree_get(const svn_element_tree_t *tree,
int eid);
svn_error_t *
svn_element_tree_set(svn_element_tree_t *tree,
int eid,
- svn_branch_el_rev_content_t *element);
+ svn_element_content_t *element);
/* Purge entries from E_MAP that don't connect, via parent directory hierarchy,
* to ROOT_EID. In other words, remove elements that have been implicitly
Modified: subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c?rev=1708644&r1=1708643&r2=1708644&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c Wed Oct 14 16:15:45 2015
@@ -118,7 +118,7 @@ branch_finalize_eids(svn_branch_state_t
hi; hi = apr_hash_next(hi))
{
int old_eid = svn_int_hash_this_key(hi);
- svn_branch_el_rev_content_t *element = apr_hash_this_val(hi);
+ svn_element_content_t *element = apr_hash_this_val(hi);
if (old_eid < -1)
{
@@ -194,7 +194,7 @@ svn_branch_revision_root_get_branch_by_i
static void
branch_validate_element(const svn_branch_state_t *branch,
int eid,
- const svn_branch_el_rev_content_t *element);
+ const svn_element_content_t *element);
/* Assert BRANCH satisfies all its invariants.
*/
@@ -335,7 +335,7 @@ svn_branch_get_element_tree(svn_branch_s
static void
branch_validate_element(const svn_branch_state_t *branch,
int eid,
- const svn_branch_el_rev_content_t *element)
+ const svn_element_content_t *element)
{
SVN_ERR_ASSERT_NO_RETURN(element);
@@ -366,11 +366,11 @@ svn_branch_get_elements(svn_branch_state
return branch->element_tree->e_map;
}
-svn_branch_el_rev_content_t *
+svn_element_content_t *
svn_branch_get_element(const svn_branch_state_t *branch,
int eid)
{
- svn_branch_el_rev_content_t *element;
+ svn_element_content_t *element;
element = svn_element_tree_get(branch->element_tree, eid);
@@ -388,7 +388,7 @@ svn_branch_get_element(const svn_branch_
static void
branch_map_set(svn_branch_state_t *branch,
int eid,
- svn_branch_el_rev_content_t *element)
+ svn_element_content_t *element)
{
apr_pool_t *map_pool = apr_hash_pool_get(branch->element_tree->e_map);
@@ -417,9 +417,9 @@ svn_branch_update_element(svn_branch_sta
const svn_element_payload_t *new_payload)
{
apr_pool_t *map_pool = apr_hash_pool_get(branch->element_tree->e_map);
- svn_branch_el_rev_content_t *element
- = svn_branch_el_rev_content_create(new_parent_eid, new_name, new_payload,
- map_pool);
+ svn_element_content_t *element
+ = svn_element_content_create(new_parent_eid, new_name, new_payload,
+ map_pool);
/* EID must be a valid element id */
SVN_ERR_ASSERT_NO_RETURN(EID_IS_ALLOCATED(branch, eid));
@@ -436,7 +436,7 @@ svn_branch_get_element_tree_at_eid(svn_b
apr_pool_t *result_pool)
{
svn_element_tree_t *new_subtree;
- svn_branch_el_rev_content_t *subtree_root_element;
+ svn_element_content_t *subtree_root_element;
SVN_BRANCH_SEQUENCE_POINT(branch);
@@ -451,7 +451,7 @@ svn_branch_get_element_tree_at_eid(svn_b
subtree_root_element
= svn_element_tree_get(new_subtree, new_subtree->root_eid);
svn_element_tree_set(new_subtree, new_subtree->root_eid,
- svn_branch_el_rev_content_create(
+ svn_element_content_create(
-1, "", subtree_root_element->payload, result_pool));
return new_subtree;
@@ -471,7 +471,7 @@ svn_branch_get_path_by_eid(const svn_bra
apr_pool_t *result_pool)
{
const char *path = "";
- svn_branch_el_rev_content_t *element;
+ svn_element_content_t *element;
SVN_ERR_ASSERT_NO_RETURN(EID_IS_ALLOCATED(branch, eid));
@@ -524,7 +524,7 @@ svn_branch_map_add_subtree(svn_branch_st
apr_pool_t *scratch_pool)
{
apr_hash_index_t *hi;
- svn_branch_el_rev_content_t *new_root_content;
+ svn_element_content_t *new_root_content;
/* Get a new EID for the root element, if not given. */
if (to_eid == -1)
@@ -543,7 +543,7 @@ svn_branch_map_add_subtree(svn_branch_st
hi; hi = apr_hash_next(hi))
{
int this_from_eid = svn_int_hash_this_key(hi);
- svn_branch_el_rev_content_t *from_element = apr_hash_this_val(hi);
+ svn_element_content_t *from_element = apr_hash_this_val(hi);
if (from_element->parent_eid == new_subtree->root_eid)
{
@@ -575,10 +575,10 @@ svn_branch_instantiate_elements(svn_bran
hi; hi = apr_hash_next(hi))
{
int this_eid = svn_int_hash_this_key(hi);
- svn_branch_el_rev_content_t *this_element = apr_hash_this_val(hi);
+ svn_element_content_t *this_element = apr_hash_this_val(hi);
branch_map_set(to_branch, this_eid,
- svn_branch_el_rev_content_dup(
+ svn_element_content_dup(
this_element,
apr_hash_pool_get(to_branch->element_tree->e_map)));
}
@@ -866,7 +866,7 @@ svn_branch_state_serialize(svn_stream_t
svn_branch_state_t *branch,
apr_pool_t *scratch_pool)
{
- SVN_ITER_T(svn_branch_el_rev_content_t) *hi;
+ SVN_ITER_T(svn_element_content_t) *hi;
const char *predecessor_str = "";
if (branch->predecessor)
@@ -891,7 +891,7 @@ svn_branch_state_serialize(svn_stream_t
sort_compare_items_by_eid, scratch_pool))
{
int eid = *(const int *)hi->key;
- svn_branch_el_rev_content_t *element = svn_branch_get_element(branch, eid);
+ svn_element_content_t *element = svn_branch_get_element(branch, eid);
int parent_eid;
const char *name;
Modified: subversion/branches/move-tracking-2/subversion/libsvn_delta/branch_nested.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_delta/branch_nested.c?rev=1708644&r1=1708643&r2=1708644&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_delta/branch_nested.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_delta/branch_nested.c Wed Oct 14 16:15:45 2015
@@ -97,7 +97,7 @@ svn_branch_get_subbranch_at_eid(svn_bran
int eid,
apr_pool_t *scratch_pool)
{
- svn_branch_el_rev_content_t *element = svn_branch_get_element(branch, eid);
+ svn_element_content_t *element = svn_branch_get_element(branch, eid);
if (element && element->payload->is_subbranch_root)
{
@@ -125,7 +125,7 @@ svn_branch_get_immediate_subbranches(svn
hi; hi = apr_hash_next(hi))
{
int eid = svn_int_hash_this_key(hi);
- svn_branch_el_rev_content_t *element = apr_hash_this_val(hi);
+ svn_element_content_t *element = apr_hash_this_val(hi);
if (element->payload->is_subbranch_root)
{
Modified: subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3e.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3e.c?rev=1708644&r1=1708643&r2=1708644&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3e.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3e.c Wed Oct 14 16:15:45 2015
@@ -1133,7 +1133,7 @@ payload_resolve(svn_element_payload_t *p
static svn_error_t *
editor3_payload_resolve(void *baton,
- svn_branch_el_rev_content_t *element,
+ svn_element_content_t *element,
apr_pool_t *scratch_pool)
{
ev3_from_delta_baton_t *eb = baton;
Modified: subversion/branches/move-tracking-2/subversion/libsvn_delta/editor3e.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_delta/editor3e.c?rev=1708644&r1=1708643&r2=1708644&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_delta/editor3e.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_delta/editor3e.c Wed Oct 14 16:15:45 2015
@@ -339,7 +339,7 @@ svn_editor3_delete(svn_editor3_t *editor
svn_error_t *
svn_editor3_payload_resolve(svn_editor3_t *editor,
- svn_branch_el_rev_content_t *element)
+ svn_element_content_t *element)
{
SVN_ERR_ASSERT(svn_element_payload_invariants(element->payload));
@@ -580,7 +580,7 @@ wrap_delete(void *baton,
static svn_error_t *
wrap_payload_resolve(void *baton,
- svn_branch_el_rev_content_t *element,
+ svn_element_content_t *element,
apr_pool_t *scratch_pool)
{
wrapper_baton_t *eb = baton;
@@ -799,7 +799,7 @@ change_detection_delete(void *baton,
static svn_error_t *
change_detection_payload_resolve(void *baton,
- svn_branch_el_rev_content_t *element,
+ svn_element_content_t *element,
apr_pool_t *scratch_pool)
{
change_detection_baton_t *eb = baton;
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=1708644&r1=1708643&r2=1708644&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_delta/element.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_delta/element.c Wed Oct 14 16:15:45 2015
@@ -256,13 +256,13 @@ svn_element_payload_create_symlink(apr_h
return new_payload;
}
-svn_branch_el_rev_content_t *
-svn_branch_el_rev_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_branch_el_rev_content_t *content
+ svn_element_content_t *content
= apr_palloc(result_pool, sizeof(*content));
content->parent_eid = parent_eid;
@@ -271,11 +271,11 @@ svn_branch_el_rev_content_create(int par
return content;
}
-svn_branch_el_rev_content_t *
-svn_branch_el_rev_content_dup(const svn_branch_el_rev_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_branch_el_rev_content_t *content
+ svn_element_content_t *content
= apr_pmemdup(result_pool, old, sizeof(*content));
content->name = apr_pstrdup(result_pool, old->name);
@@ -284,9 +284,9 @@ svn_branch_el_rev_content_dup(const svn_
}
svn_boolean_t
-svn_branch_el_rev_content_equal(const svn_branch_el_rev_content_t *content_left,
- const svn_branch_el_rev_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)
{
@@ -328,7 +328,7 @@ svn_element_tree_create(apr_hash_t *e_ma
return element_tree;
}
-svn_branch_el_rev_content_t *
+svn_element_content_t *
svn_element_tree_get(const svn_element_tree_t *tree,
int eid)
{
@@ -338,7 +338,7 @@ svn_element_tree_get(const svn_element_t
svn_error_t *
svn_element_tree_set(svn_element_tree_t *tree,
int eid,
- svn_branch_el_rev_content_t *element)
+ svn_element_content_t *element)
{
svn_int_hash_set(tree->e_map, eid, element);
@@ -363,11 +363,11 @@ svn_element_tree_purge_orphans(apr_hash_
hi; hi = apr_hash_next(hi))
{
int this_eid = svn_int_hash_this_key(hi);
- svn_branch_el_rev_content_t *this_element = apr_hash_this_val(hi);
+ svn_element_content_t *this_element = apr_hash_this_val(hi);
if (this_eid != root_eid)
{
- svn_branch_el_rev_content_t *parent_element
+ svn_element_content_t *parent_element
= svn_int_hash_get(e_map, this_element->parent_eid);
/* Purge if parent is deleted */
@@ -392,7 +392,7 @@ svn_element_tree_get_path_by_eid(const s
apr_pool_t *result_pool)
{
const char *path = "";
- svn_branch_el_rev_content_t *element;
+ svn_element_content_t *element;
for (; eid != tree->root_eid; eid = element->parent_eid)
{
Modified: subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c?rev=1708644&r1=1708643&r2=1708644&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c (original)
+++ subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c Wed Oct 14 16:15:45 2015
@@ -291,9 +291,9 @@ element_differences(apr_hash_t **diff_p,
left->tree->e_map, right->tree->e_map)))
{
int e = svn_int_hash_this_key(hi->apr_hi);
- svn_branch_el_rev_content_t *element_left
+ svn_element_content_t *element_left
= svn_element_tree_get(left->tree, e);
- svn_branch_el_rev_content_t *element_right
+ svn_element_content_t *element_right
= svn_element_tree_get(right->tree, e);
/* If node payload is given by reference, resolve it to full payload */
@@ -306,10 +306,10 @@ element_differences(apr_hash_t **diff_p,
SVN_ERR(svn_editor3_payload_resolve(editor, element_right));
}
- if (! svn_branch_el_rev_content_equal(element_left, element_right,
- scratch_pool))
+ if (! svn_element_content_equal(element_left, element_right,
+ scratch_pool))
{
- svn_branch_el_rev_content_t **contents
+ svn_element_content_t **contents
= apr_palloc(result_pool, 2 * sizeof(void *));
contents[0] = element_left;
@@ -352,8 +352,8 @@ subtree_replay(svn_editor3_t *editor,
hi; hi = apr_hash_next(hi))
{
int eid = svn_int_hash_this_key(hi);
- svn_branch_el_rev_content_t **e_pair = apr_hash_this_val(hi);
- svn_branch_el_rev_content_t *e0 = e_pair[0], *e1 = e_pair[1];
+ svn_element_content_t **e_pair = apr_hash_this_val(hi);
+ svn_element_content_t *e0 = e_pair[0], *e1 = e_pair[1];
SVN_ERR_ASSERT(!e0
|| svn_element_payload_invariants(e0->payload));
@@ -935,7 +935,7 @@ sort_compare_items_by_eid(const svn_sort
}
static const char *
-peid_name(const svn_branch_el_rev_content_t *element,
+peid_name(const svn_element_content_t *element,
apr_pool_t *scratch_pool)
{
if (element->parent_eid == -1)
@@ -955,14 +955,14 @@ static svn_error_t *
list_branch_elements_by_eid(svn_branch_state_t *branch,
apr_pool_t *scratch_pool)
{
- SVN_ITER_T(svn_branch_el_rev_content_t) *pi;
+ SVN_ITER_T(svn_element_content_t) *pi;
notify_v("%s", elements_by_eid_header);
for (SVN_HASH_ITER_SORTED(pi, svn_branch_get_elements(branch),
sort_compare_items_by_eid, scratch_pool))
{
int eid = *(const int *)(pi->key);
- svn_branch_el_rev_content_t *element = pi->val;
+ svn_element_content_t *element = pi->val;
if (element)
{
@@ -1013,7 +1013,7 @@ branch_id_str(svn_branch_state_t *branch
}
else
{
- svn_branch_el_rev_content_t *outer_el = NULL;
+ svn_element_content_t *outer_el = NULL;
svn_branch_state_t *outer_branch;
int outer_eid;
@@ -1227,22 +1227,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_branch_el_rev_content_t **result_p,
+element_merge(svn_element_content_t **result_p,
svn_boolean_t *conflict_p,
int eid,
- svn_branch_el_rev_content_t *side1,
- svn_branch_el_rev_content_t *side2,
- svn_branch_el_rev_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_branch_el_rev_content_equal(yca, side1,
- scratch_pool);
- svn_boolean_t same2 = svn_branch_el_rev_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_branch_el_rev_content_t *result = NULL;
+ svn_element_content_t *result = NULL;
if (same1)
{
@@ -1337,7 +1335,7 @@ element_merge(svn_branch_el_rev_content_
if (policy->merge_double_add
&& !side1->payload->is_subbranch_root
&& !side2->payload->is_subbranch_root
- && svn_branch_el_rev_content_equal(side1, side2, scratch_pool))
+ && svn_element_content_equal(side1, side2, scratch_pool))
{
SVN_DBG(("e%d double add",
eid));
@@ -1347,8 +1345,7 @@ element_merge(svn_branch_el_rev_content_
{
SVN_DBG(("e%d conflict: add vs. add (%s)",
eid,
- svn_branch_el_rev_content_equal(side1, side2,
- scratch_pool)
+ svn_element_content_equal(side1, side2, scratch_pool)
? "same content" : "different content"));
conflict = TRUE;
}
@@ -1453,8 +1450,8 @@ static int
sort_compare_items_by_peid_and_name(const svn_sort__item_t *a,
const svn_sort__item_t *b)
{
- svn_branch_el_rev_content_t *element_a = a->value;
- svn_branch_el_rev_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;
@@ -1470,15 +1467,15 @@ detect_clashes(apr_array_header_t **clas
apr_pool_t *scratch_pool)
{
apr_array_header_t *clashes = apr_array_make(result_pool, 0, sizeof(void *));
- SVN_ITER_T(svn_branch_el_rev_content_t) *pi;
+ SVN_ITER_T(svn_element_content_t) *pi;
int prev_eid = -1;
- svn_branch_el_rev_content_t *prev_element = NULL;
+ svn_element_content_t *prev_element = NULL;
for (SVN_HASH_ITER_SORTED(pi, svn_branch_get_elements(branch),
sort_compare_items_by_peid_and_name, scratch_pool))
{
int eid = *(const int *)(pi->key);
- svn_branch_el_rev_content_t *element = pi->val;
+ svn_element_content_t *element = pi->val;
if (prev_element
&& element->parent_eid == prev_element->parent_eid
@@ -1511,7 +1508,7 @@ branch_merge_subtree_r(svn_editor3_t *ed
apr_hash_t *diff_yca_src, *diff_yca_tgt;
int single_element_conflicts = 0;
apr_array_header_t *clashes;
- SVN_ITER_T(svn_branch_el_rev_content_t *) *pi;
+ SVN_ITER_T(svn_element_content_t *) *pi;
apr_hash_t *all_elements;
const merge_conflict_policy_t policy = { TRUE, TRUE, TRUE, TRUE, TRUE };
apr_pool_t *iterpool = svn_pool_create(scratch_pool);
@@ -1562,14 +1559,14 @@ branch_merge_subtree_r(svn_editor3_t *ed
sort_compare_items_by_eid, scratch_pool))
{
int eid = *(const int *)(pi->key);
- svn_branch_el_rev_content_t **e_yca_src
+ svn_element_content_t **e_yca_src
= svn_int_hash_get(diff_yca_src, eid);
- svn_branch_el_rev_content_t **e_yca_tgt
+ svn_element_content_t **e_yca_tgt
= svn_int_hash_get(diff_yca_tgt, eid);
- svn_branch_el_rev_content_t *e_yca;
- svn_branch_el_rev_content_t *e_src;
- svn_branch_el_rev_content_t *e_tgt;
- svn_branch_el_rev_content_t *result;
+ svn_element_content_t *e_yca;
+ svn_element_content_t *e_src;
+ svn_element_content_t *e_tgt;
+ svn_element_content_t *result;
svn_boolean_t conflict;
const char *tgt_branch_id
= svn_branch_get_id(tgt->branch, scratch_pool);
@@ -1780,7 +1777,7 @@ do_switch(svnmover_wc_t *wc,
typedef struct diff_item_t
{
int eid;
- svn_branch_el_rev_content_t *e0, *e1;
+ svn_element_content_t *e0, *e1;
const char *relpath0, *relpath1;
svn_boolean_t modified, reparented, renamed;
} diff_item_t;
@@ -1814,8 +1811,8 @@ subtree_diff(apr_hash_t **diff_changes,
hi; hi = apr_hash_next(hi))
{
int eid = svn_int_hash_this_key(hi);
- svn_branch_el_rev_content_t **e_pair = apr_hash_this_val(hi);
- svn_branch_el_rev_content_t *e0 = e_pair[0], *e1 = e_pair[1];
+ svn_element_content_t **e_pair = apr_hash_this_val(hi);
+ svn_element_content_t *e0 = e_pair[0], *e1 = e_pair[1];
if (e0 || e1)
{
@@ -1902,7 +1899,7 @@ show_subtree_diff(svn_editor3_t *editor,
scratch_pool))
{
diff_item_t *item = ai->val;
- svn_branch_el_rev_content_t *e0 = item->e0, *e1 = item->e1;
+ svn_element_content_t *e0 = item->e0, *e1 = item->e1;
char status_mod = (e0 && e1) ? 'M' : e0 ? 'D' : 'A';
/* For a deleted element whose parent was also deleted, mark it is
@@ -2209,7 +2206,7 @@ do_put_file(svn_editor3_t *editor,
if (file_el_rev->eid >= 0)
{
/* get existing props */
- svn_branch_el_rev_content_t *existing_element
+ svn_element_content_t *existing_element
= svn_branch_get_element(file_el_rev->branch, file_el_rev->eid);
SVN_ERR(svn_editor3_payload_resolve(editor, existing_element));
@@ -2285,7 +2282,7 @@ do_cat(svn_editor3_t *editor,
apr_hash_index_t *hi;
/* get existing props */
- svn_branch_el_rev_content_t *existing_element
+ svn_element_content_t *existing_element
= svn_branch_get_element(file_el_rev->branch, file_el_rev->eid);
SVN_ERR(svn_editor3_payload_resolve(editor, existing_element));
@@ -2500,7 +2497,7 @@ do_branch_into(svn_branch_state_t *from_
apr_pool_t *scratch_pool)
{
svn_branch_subtree_t *from_subtree;
- svn_branch_el_rev_content_t *new_root_content;
+ svn_element_content_t *new_root_content;
/* Source element must exist */
if (! svn_branch_get_path_by_eid(from_branch, from_eid, scratch_pool))
@@ -2518,8 +2515,8 @@ do_branch_into(svn_branch_state_t *from_
new_root_content
= svn_element_tree_get(from_subtree->tree, from_subtree->tree->root_eid);
new_root_content
- = svn_branch_el_rev_content_create(to_parent_eid, new_name,
- new_root_content->payload, scratch_pool);
+ = svn_element_content_create(to_parent_eid, new_name,
+ new_root_content->payload, scratch_pool);
svn_element_tree_set(from_subtree->tree, from_subtree->tree->root_eid,
new_root_content);
@@ -2717,7 +2714,7 @@ do_move(svn_editor3_t *editor,
scratch_pool);
const char *from_path = el_rev_id_to_path(el_rev, scratch_pool);
/* New payload shall be the same as before */
- svn_branch_el_rev_content_t *existing_element
+ svn_element_content_t *existing_element
= svn_branch_get_element(el_rev->branch, el_rev->eid);
SVN_ERR(svn_editor3_alter(editor,