Author: julianfoad
Date: Wed Aug 26 10:53:55 2015
New Revision: 1697880
URL: http://svn.apache.org/r1697880
Log:
On the 'move-tracking-2' branch: Rename a function for consistency.
* subversion/include/private/svn_branch.h
subversion/libsvn_delta/branch.c
(svn_branch_revision_root_new_eid): Renamed from
'svn_branch_allocate_new_eid'.
(svn_branch_map_add_subtree,
svn_branch_add_new_branch): Track the rename.
* subversion/libsvn_delta/compat3e.c
(editor3_new_eid): Track the rename.
* subversion/svnmover/svnmover.c
(subtree_replay,
do_branch): Track the rename.
Modified:
subversion/branches/move-tracking-2/subversion/include/private/svn_branch.h
subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c
subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3e.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=1697880&r1=1697879&r2=1697880&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 Aug 26 10:53:55 2015
@@ -191,7 +191,7 @@ svn_branch_revision_root_get_branch_by_i
/* Assign a new element id in REV_ROOT.
*/
int
-svn_branch_allocate_new_eid(svn_branch_revision_root_t *rev_root);
+svn_branch_revision_root_new_eid(svn_branch_revision_root_t *rev_root);
/* Often, branches have the same root element. For example,
* branching /trunk to /branches/br1 results in:
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=1697880&r1=1697879&r2=1697880&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c Wed Aug 26 10:53:55 2015
@@ -72,7 +72,7 @@ svn_branch_revision_root_create(svn_bran
}
int
-svn_branch_allocate_new_eid(svn_branch_revision_root_t *rev_root)
+svn_branch_revision_root_new_eid(svn_branch_revision_root_t *rev_root)
{
int eid = rev_root->next_eid++;
@@ -688,7 +688,7 @@ svn_branch_map_add_subtree(svn_branch_st
/* Get a new EID for the root element, if not given. */
if (to_eid == -1)
{
- to_eid = svn_branch_allocate_new_eid(to_branch->rev_root);
+ to_eid = svn_branch_revision_root_new_eid(to_branch->rev_root);
}
/* Create the new subtree root element */
@@ -864,7 +864,7 @@ svn_branch_add_new_branch(svn_branch_rev
if (! outer_branch)
outer_eid = rev_root->root_branches->nelts;
if (root_eid == -1)
- root_eid = svn_branch_allocate_new_eid(rev_root);
+ root_eid = svn_branch_revision_root_new_eid(rev_root);
new_branch = svn_branch_state_create(root_eid, rev_root,
outer_branch, outer_eid,
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=1697880&r1=1697879&r2=1697880&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3e.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3e.c Wed Aug 26 10:53:55 2015
@@ -1143,7 +1143,7 @@ editor3_new_eid(void *baton,
apr_pool_t *scratch_pool)
{
ev3_from_delta_baton_t *eb = baton;
- int eid = svn_branch_allocate_new_eid(eb->edited_rev_root);
+ int eid = svn_branch_revision_root_new_eid(eb->edited_rev_root);
*eid_p = eid;
return SVN_NO_ERROR;
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=1697880&r1=1697879&r2=1697880&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c (original)
+++ subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c Wed Aug 26 10:53:55 2015
@@ -311,7 +311,7 @@ subtree_replay(svn_editor3_t *editor,
created' EIDs to new EIDs? See BRANCH-README. */
while (eid >= edit_branch->rev_root->next_eid
|| (e1 && e1->parent_eid >= edit_branch->rev_root->next_eid))
- svn_branch_allocate_new_eid(edit_branch->rev_root);
+ svn_branch_revision_root_new_eid(edit_branch->rev_root);
if (e0 && e1)
{
@@ -2316,7 +2316,7 @@ do_branch(svn_branch_state_t **new_branc
/* assign new eid to root element (outer branch) */
to_outer_eid
- = svn_branch_allocate_new_eid(to_outer_branch->rev_root);
+ = svn_branch_revision_root_new_eid(to_outer_branch->rev_root);
svn_branch_update_subbranch_root_element(to_outer_branch, to_outer_eid,
to_outer_parent_eid, new_name);