You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2014/02/04 16:56:48 UTC
svn commit: r1564357 - in /subversion/branches/1.8.x: ./
subversion/libsvn_repos/reporter.c
Author: stefan2
Date: Tue Feb 4 15:56:48 2014
New Revision: 1564357
URL: http://svn.apache.org/r1564357
Log:
Revert r1564286 (commit to wrong branch).
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/subversion/libsvn_repos/reporter.c
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Reverse-merged /subversion/trunk:r1564215
Modified: subversion/branches/1.8.x/subversion/libsvn_repos/reporter.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/subversion/libsvn_repos/reporter.c?rev=1564357&r1=1564356&r2=1564357&view=diff
==============================================================================
--- subversion/branches/1.8.x/subversion/libsvn_repos/reporter.c (original)
+++ subversion/branches/1.8.x/subversion/libsvn_repos/reporter.c Tue Feb 4 15:56:48 2014
@@ -1143,8 +1143,7 @@ delta_dirs(report_baton_t *b, svn_revnum
svn_fs_root_t *s_root;
apr_hash_t *s_entries = NULL, *t_entries;
apr_hash_index_t *hi;
- apr_pool_t *subpool = svn_pool_create(pool);
- apr_pool_t *iterpool;
+ apr_pool_t *subpool;
const char *name, *s_fullpath, *t_fullpath, *e_fullpath;
path_info_t *info;
@@ -1153,8 +1152,7 @@ delta_dirs(report_baton_t *b, svn_revnum
When we support directory locks, we must pass the lock token here. */
SVN_ERR(delta_proplists(b, s_rev, start_empty ? NULL : s_path, t_path,
- NULL, change_dir_prop, dir_baton, subpool));
- svn_pool_clear(subpool);
+ NULL, change_dir_prop, dir_baton, pool));
if (requested_depth > svn_depth_empty
|| requested_depth == svn_depth_unknown)
@@ -1163,19 +1161,19 @@ delta_dirs(report_baton_t *b, svn_revnum
if (s_path && !start_empty)
{
SVN_ERR(get_source_root(b, &s_root, s_rev));
- SVN_ERR(svn_fs_dir_entries(&s_entries, s_root, s_path, subpool));
+ SVN_ERR(svn_fs_dir_entries(&s_entries, s_root, s_path, pool));
}
- SVN_ERR(svn_fs_dir_entries(&t_entries, b->t_root, t_path, subpool));
+ SVN_ERR(svn_fs_dir_entries(&t_entries, b->t_root, t_path, pool));
/* Iterate over the report information for this directory. */
- iterpool = svn_pool_create(pool);
+ subpool = svn_pool_create(pool);
while (1)
{
const svn_fs_dirent_t *s_entry, *t_entry;
- svn_pool_clear(iterpool);
- SVN_ERR(fetch_path_info(b, &name, &info, e_path, iterpool));
+ svn_pool_clear(subpool);
+ SVN_ERR(fetch_path_info(b, &name, &info, e_path, subpool));
if (!name)
break;
@@ -1195,10 +1193,10 @@ delta_dirs(report_baton_t *b, svn_revnum
continue;
}
- e_fullpath = svn_relpath_join(e_path, name, iterpool);
- t_fullpath = svn_fspath__join(t_path, name, iterpool);
+ e_fullpath = svn_relpath_join(e_path, name, subpool);
+ t_fullpath = svn_fspath__join(t_path, name, subpool);
t_entry = svn_hash_gets(t_entries, name);
- s_fullpath = s_path ? svn_fspath__join(s_path, name, iterpool) : NULL;
+ s_fullpath = s_path ? svn_fspath__join(s_path, name, subpool) : NULL;
s_entry = s_entries ?
svn_hash_gets(s_entries, name) : NULL;
@@ -1218,7 +1216,7 @@ delta_dirs(report_baton_t *b, svn_revnum
t_entry, dir_baton, e_fullpath, info,
info ? info->depth
: DEPTH_BELOW_HERE(wc_depth),
- DEPTH_BELOW_HERE(requested_depth), iterpool));
+ DEPTH_BELOW_HERE(requested_depth), subpool));
/* Don't revisit this name in the target or source entries. */
svn_hash_sets(t_entries, name, NULL);
@@ -1238,13 +1236,13 @@ delta_dirs(report_baton_t *b, svn_revnum
target, for graceful handling of case-only renames. */
if (s_entries)
{
- for (hi = apr_hash_first(subpool, s_entries);
+ for (hi = apr_hash_first(pool, s_entries);
hi;
hi = apr_hash_next(hi))
{
const svn_fs_dirent_t *s_entry;
- svn_pool_clear(iterpool);
+ svn_pool_clear(subpool);
s_entry = svn__apr_hash_index_val(hi);
if (svn_hash_gets(t_entries, s_entry->name) == NULL)
@@ -1261,29 +1259,27 @@ delta_dirs(report_baton_t *b, svn_revnum
continue;
/* There is no corresponding target entry, so delete. */
- e_fullpath = svn_relpath_join(e_path, s_entry->name, iterpool);
+ e_fullpath = svn_relpath_join(e_path, s_entry->name, subpool);
SVN_ERR(svn_repos_deleted_rev(svn_fs_root_fs(b->t_root),
svn_fspath__join(t_path,
s_entry->name,
- iterpool),
+ subpool),
s_rev, b->t_rev,
- &deleted_rev, iterpool));
+ &deleted_rev, subpool));
SVN_ERR(b->editor->delete_entry(e_fullpath,
deleted_rev,
- dir_baton, iterpool));
+ dir_baton, subpool));
}
}
}
/* Loop over the dirents in the target. */
- for (hi = apr_hash_first(subpool, t_entries);
- hi;
- hi = apr_hash_next(hi))
+ for (hi = apr_hash_first(pool, t_entries); hi; hi = apr_hash_next(hi))
{
const svn_fs_dirent_t *s_entry, *t_entry;
- svn_pool_clear(iterpool);
+ svn_pool_clear(subpool);
t_entry = svn__apr_hash_index_val(hi);
if (is_depth_upgrade(wc_depth, requested_depth, t_entry->kind))
@@ -1311,27 +1307,24 @@ delta_dirs(report_baton_t *b, svn_revnum
svn_hash_gets(s_entries, t_entry->name)
: NULL;
s_fullpath = s_entry ?
- svn_fspath__join(s_path, t_entry->name, iterpool) : NULL;
+ svn_fspath__join(s_path, t_entry->name, subpool) : NULL;
}
/* Compose the report, editor, and target paths for this entry. */
- e_fullpath = svn_relpath_join(e_path, t_entry->name, iterpool);
- t_fullpath = svn_fspath__join(t_path, t_entry->name, iterpool);
+ e_fullpath = svn_relpath_join(e_path, t_entry->name, subpool);
+ t_fullpath = svn_fspath__join(t_path, t_entry->name, subpool);
SVN_ERR(update_entry(b, s_rev, s_fullpath, s_entry, t_fullpath,
t_entry, dir_baton, e_fullpath, NULL,
DEPTH_BELOW_HERE(wc_depth),
DEPTH_BELOW_HERE(requested_depth),
- iterpool));
+ subpool));
}
/* Destroy iteration subpool. */
- svn_pool_destroy(iterpool);
+ svn_pool_destroy(subpool);
}
-
- svn_pool_destroy(subpool);
-
return SVN_NO_ERROR;
}