You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2011/05/17 18:24:42 UTC
svn commit: r1104383 - in /subversion/trunk/subversion/libsvn_wc: props.c
wc_db.c
Author: hwright
Date: Tue May 17 16:24:41 2011
New Revision: 1104383
URL: http://svn.apache.org/viewvc?rev=1104383&view=rev
Log:
The wc_db function now handles fetching properties of all depths. Don't bother
special casing one level up.
* subversion/libsvn_wc/props.c
(svn_wc__prop_list_recursive): Just call db_read_props_streamily().
* subversion/libsvn_wc/wc_db.c
(svn_wc__db_read_props_streamily): Don't assert our depth (if we can't
handle a depth, populate_targets_tree() will catch that for us).
Modified:
subversion/trunk/subversion/libsvn_wc/props.c
subversion/trunk/subversion/libsvn_wc/wc_db.c
Modified: subversion/trunk/subversion/libsvn_wc/props.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/props.c?rev=1104383&r1=1104382&r2=1104383&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/props.c (original)
+++ subversion/trunk/subversion/libsvn_wc/props.c Tue May 17 16:24:41 2011
@@ -1678,40 +1678,12 @@ svn_wc__prop_list_recursive(svn_wc_conte
void *cancel_baton,
apr_pool_t *scratch_pool)
{
- switch (depth)
- {
- case svn_depth_empty:
- {
- apr_hash_t *props;
-
- if (pristine)
- SVN_ERR(svn_wc__db_read_pristine_props(&props, wc_ctx->db,
- local_abspath,
- scratch_pool, scratch_pool));
- else
- SVN_ERR(svn_wc__db_read_props(&props, wc_ctx->db, local_abspath,
- scratch_pool, scratch_pool));
-
- if (receiver_func && props && apr_hash_count(props) > 0)
- SVN_ERR((*receiver_func)(receiver_baton, local_abspath, props,
- scratch_pool));
- }
- break;
- case svn_depth_files:
- case svn_depth_immediates:
- case svn_depth_infinity:
- SVN_ERR(svn_wc__db_read_props_streamily(wc_ctx->db, local_abspath,
- propname, depth,
- base_props, pristine,
- receiver_func, receiver_baton,
- cancel_func, cancel_baton,
- scratch_pool));
- break;
- default:
- SVN_ERR_MALFUNCTION();
- }
-
- return SVN_NO_ERROR;
+ return svn_wc__db_read_props_streamily(wc_ctx->db, local_abspath,
+ propname, depth,
+ base_props, pristine,
+ receiver_func, receiver_baton,
+ cancel_func, cancel_baton,
+ scratch_pool);
}
svn_error_t *
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1104383&r1=1104382&r2=1104383&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Tue May 17 16:24:41 2011
@@ -7654,9 +7654,6 @@ svn_wc__db_read_props_streamily(svn_wc__
SVN_ERR_ASSERT(svn_dirent_is_absolute(local_abspath));
SVN_ERR_ASSERT(receiver_func);
- SVN_ERR_ASSERT((depth == svn_depth_files) ||
- (depth == svn_depth_immediates) ||
- (depth == svn_depth_infinity));
SVN_ERR(svn_wc__db_wcroot_parse_local_abspath(&wcroot, &local_relpath,
db, local_abspath,