Author: julianfoad
Date: Thu Jun 4 14:28:19 2015
New Revision: 1683557
URL: http://svn.apache.org/r1683557
Log:
On the 'move-tracking-2' branch: Rename an API for clarity.
* subversion/include/private/svn_branch.h,
subversion/libsvn_delta/branch.c
(svn_branch_get_immediate_subbranches): Rename from
'svn_branch_get_all_subbranches'.
* subversion/libsvn_delta/compat3e.c
(convert_branch_to_paths_r): 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
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=1683557&r1=1683556&r2=1683557&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
Thu Jun 4 14:28:19 2015
@@ -277,9 +277,9 @@ svn_branch_delete_branch_r(svn_branch_st
* sub-branches of BRANCH.
*/
apr_array_header_t *
-svn_branch_get_all_subbranches(const svn_branch_state_t *branch,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool);
+svn_branch_get_immediate_subbranches(const svn_branch_state_t *branch,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool);
/* Return the subbranch rooted at BRANCH:EID, or NULL if that is
* not a subbranch root.
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=1683557&r1=1683556&r2=1683557&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c
(original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c Thu
Jun 4 14:28:19 2015
@@ -432,7 +432,7 @@ svn_branch_get_subtree(const svn_branch_
-1, "", subtree_root_element->payload, result_pool));
/* Add subbranches */
- for (SVN_ARRAY_ITER(bi, svn_branch_get_all_subbranches(
+ for (SVN_ARRAY_ITER(bi, svn_branch_get_immediate_subbranches(
branch, result_pool, result_pool), result_pool))
{
svn_branch_state_t *subbranch = bi->val;
@@ -512,7 +512,7 @@ svn_branch_purge_r(svn_branch_state_t *b
map_purge_orphans(branch->e_map, branch->root_eid, scratch_pool);
/* second, remove subbranches that have no subbranch-root element */
- for (SVN_ARRAY_ITER(bi, svn_branch_get_all_subbranches(
+ for (SVN_ARRAY_ITER(bi, svn_branch_get_immediate_subbranches(
branch, scratch_pool, scratch_pool), scratch_pool))
{
svn_branch_state_t *b = bi->val;
@@ -775,9 +775,9 @@ svn_branch_instantiate_subtree(svn_branc
}
apr_array_header_t *
-svn_branch_get_all_subbranches(const svn_branch_state_t *branch,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool)
+svn_branch_get_immediate_subbranches(const svn_branch_state_t *branch,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool)
{
svn_array_t *subbranches = svn_array_make(result_pool);
SVN_ITER_T(svn_branch_state_t) *bi;
@@ -799,7 +799,7 @@ svn_branch_get_subbranch_at_eid(svn_bran
SVN_ITER_T(svn_branch_state_t) *bi;
/* TODO: more efficient to search in branch->rev_root->branches */
- for (SVN_ARRAY_ITER(bi, svn_branch_get_all_subbranches(
+ for (SVN_ARRAY_ITER(bi, svn_branch_get_immediate_subbranches(
branch, scratch_pool, scratch_pool), scratch_pool))
{
if (bi->val->outer_eid == eid)
@@ -863,7 +863,7 @@ svn_branch_delete_branch_r(svn_branch_st
{
SVN_ITER_T(svn_branch_state_t) *bi;
- for (SVN_ARRAY_ITER(bi, svn_branch_get_all_subbranches(
+ for (SVN_ARRAY_ITER(bi, svn_branch_get_immediate_subbranches(
branch, scratch_pool, scratch_pool), scratch_pool))
{
svn_branch_delete_branch_r(bi->val, bi->iterpool);
@@ -1216,7 +1216,7 @@ svn_branch_find_nested_branch_element_by
/* The path we're looking for is (path-wise) in this branch. See if it
is also in a sub-branch (recursively). */
- for (SVN_ARRAY_ITER(bi, svn_branch_get_all_subbranches(
+ for (SVN_ARRAY_ITER(bi, svn_branch_get_immediate_subbranches(
root_branch, scratch_pool, scratch_pool),
scratch_pool))
{
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=1683557&r1=1683556&r2=1683557&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3e.c
(original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3e.c Thu
Jun 4 14:28:19 2015
@@ -1209,7 +1209,7 @@ convert_branch_to_paths_r(apr_hash_t *pa
result_pool, scratch_pool);
/* Rercurse into sub-branches */
- for (SVN_ARRAY_ITER(bi, svn_branch_get_all_subbranches(
+ for (SVN_ARRAY_ITER(bi, svn_branch_get_immediate_subbranches(
branch, scratch_pool, scratch_pool), scratch_pool))
{
convert_branch_to_paths_r(paths_union, bi->val, result_pool,
bi->iterpool);
