Author: julianfoad
Date: Thu Mar 5 09:14:53 2015
New Revision: 1664290
URL: http://svn.apache.org/r1664290
Log:
On the 'move-tracking-2' branch: Use the iterpool provided by the array and
hash iteration and accessors added in r1664127.
* subversion/libsvn_delta/branch.c
(svn_branch_purge_r,
svn_branch_get_subbranches,
svn_branch_delete_branch_instance_r,
svn_branch_family_serialize,
svn_branch_branch_subtree_r2): Use the iterpool.
* subversion/libsvn_delta/compat3e.c
(convert_branch_to_paths_r): Use the iterpool.
* subversion/svnmover/svnmover.c
(family_list_branch_instances): Use the iterpool.
Modified:
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/libsvn_delta/branch.c
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c?rev=1664290&r1=1664289&r2=1664290&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c
(original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c Thu
Mar 5 09:14:53 2015
@@ -597,11 +597,11 @@ svn_branch_purge_r(svn_branch_instance_t
if (svn_branch_map_get(branch, b->outer_eid))
{
- svn_branch_purge_r(b, scratch_pool);
+ svn_branch_purge_r(b, bi->iterpool);
}
else
{
- svn_branch_delete_branch_instance_r(b, scratch_pool);
+ svn_branch_delete_branch_instance_r(b, bi->iterpool);
}
}
}
@@ -852,7 +852,7 @@ svn_branch_get_subbranches(const svn_bra
{
svn_branch_family_t *sub_branch_family = bi->val->sibling_defn->family;
const char *sub_branch_root_rrpath
- = svn_branch_get_root_rrpath(bi->val, scratch_pool);
+ = svn_branch_get_root_rrpath(bi->val, bi->iterpool);
/* Is it an immediate child at or below EID? */
if (family_is_child(family, sub_branch_family)
@@ -946,7 +946,7 @@ svn_branch_delete_branch_instance_r(svn_
for (SVN_ARRAY_ITER(bi, svn_branch_get_all_sub_branches(
branch, scratch_pool, scratch_pool), scratch_pool))
{
- svn_branch_delete_branch_instance_r(bi->val, scratch_pool);
+ svn_branch_delete_branch_instance_r(bi->val, bi->iterpool);
}
svn_branch_revision_root_delete_branch_instance(branch->outer_branch->rev_root,
@@ -1256,11 +1256,11 @@ svn_branch_family_serialize(svn_stream_t
branch_instances->nelts));
for (SVN_ARRAY_ITER(bi, branch_instances, scratch_pool))
- SVN_ERR(svn_branch_instance_serialize(stream, bi->val, scratch_pool));
+ SVN_ERR(svn_branch_instance_serialize(stream, bi->val, bi->iterpool));
for (SVN_ARRAY_ITER(fi, family->sub_families, scratch_pool))
SVN_ERR(svn_branch_family_serialize(stream, rev_root, fi->val, family->fid,
- scratch_pool));
+ fi->iterpool));
return SVN_NO_ERROR;
}
@@ -1321,7 +1321,7 @@ svn_branch_find_nested_branch_element_by
svn_branch_find_nested_branch_element_by_rrpath(&sub_branch,
&sub_branch_eid,
bi->val, rrpath,
- scratch_pool);
+ bi->iterpool);
if (sub_branch)
{
*branch_p = sub_branch;
@@ -1493,7 +1493,7 @@ svn_branch_branch_subtree_r2(svn_branch_
subbranch->sibling_defn->root_eid,
new_branch, subbranch->outer_eid,
subbranch->sibling_defn,
- scratch_pool));
+ bi->iterpool));
}
}
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=1664290&r1=1664289&r2=1664290&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3e.c
(original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3e.c Thu
Mar 5 09:14:53 2015
@@ -1062,7 +1062,7 @@ convert_branch_to_paths_r(apr_hash_t *pa
for (SVN_ARRAY_ITER(bi, svn_branch_get_all_sub_branches(
branch, scratch_pool, scratch_pool), scratch_pool))
{
- convert_branch_to_paths_r(paths_union, bi->val, result_pool,
scratch_pool);
+ convert_branch_to_paths_r(paths_union, bi->val, result_pool,
bi->iterpool);
}
}
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=1664290&r1=1664289&r2=1664290&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c
(original)
+++ subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c Thu Mar
5 09:14:53 2015
@@ -401,31 +401,31 @@ family_list_branch_instances(svn_branch_
if (verbose)
{
printf(" branch %s bid=%d root=e%d /%s\n",
- svn_branch_instance_get_id(branch, scratch_pool),
+ svn_branch_instance_get_id(branch, bi->iterpool),
branch->sibling_defn->bid, branch->sibling_defn->root_eid,
- svn_branch_get_root_rrpath(branch, scratch_pool));
+ svn_branch_get_root_rrpath(branch, bi->iterpool));
for (eid = family->first_eid; eid < family->next_eid; eid++)
{
const char *rrpath = svn_branch_get_rrpath_by_eid(branch, eid,
- scratch_pool);
+ bi->iterpool);
if (rrpath)
{
const char *relpath
= svn_relpath_skip_ancestor(svn_branch_get_root_rrpath(
- branch, scratch_pool),
rrpath);
+ branch, bi->iterpool),
rrpath);
printf(" e%d %s%s\n",
eid, relpath[0] ? relpath : ".",
- subbranch_str(branch, eid, scratch_pool));
+ subbranch_str(branch, eid, bi->iterpool));
}
}
}
else
{
printf(" %s /%s\n",
- svn_branch_instance_get_id(branch, scratch_pool),
- svn_branch_get_root_rrpath(branch, scratch_pool));
+ svn_branch_instance_get_id(branch, bi->iterpool),
+ svn_branch_get_root_rrpath(branch, bi->iterpool));
}
}
@@ -437,7 +437,7 @@ family_list_branch_instances(svn_branch_
family, scratch_pool), scratch_pool))
{
SVN_ERR(family_list_branch_instances(rev_root, fi->val, recursive,
- verbose, scratch_pool));
+ verbose, fi->iterpool));
}
}
