You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by gs...@apache.org on 2010/05/11 00:21:00 UTC
svn commit: r942932 - in /subversion/trunk/subversion/libsvn_wc: props.c
props.h
Author: gstein
Date: Mon May 10 22:21:00 2010
New Revision: 942932
URL: http://svn.apache.org/viewvc?rev=942932&view=rev
Log:
Make svn_wc__install_props() private.
* subversion/libsvn_wc/props.h:
(svn_wc__install_props): removed declaration
* subversion/libsvn_wc/props.c:
(svn_wc__install_props): renamed to ...
(queue_install_props): ... this. noting that it queues, unlike the
immediate_install_props function.
(svn_wc_merge_props3): track rename
Modified:
subversion/trunk/subversion/libsvn_wc/props.c
subversion/trunk/subversion/libsvn_wc/props.h
Modified: subversion/trunk/subversion/libsvn_wc/props.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/props.c?rev=942932&r1=942931&r2=942932&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/props.c (original)
+++ subversion/trunk/subversion/libsvn_wc/props.c Mon May 10 22:21:00 2010
@@ -332,14 +332,20 @@ svn_wc__load_revert_props(apr_hash_t **r
}
-svn_error_t *
-svn_wc__install_props(svn_wc__db_t *db,
- const char *local_abspath,
- svn_wc__db_kind_t kind,
- apr_hash_t *pristine_props,
- apr_hash_t *props,
- svn_boolean_t install_pristine_props,
- apr_pool_t *scratch_pool)
+/* Add a working queue item to install PROPS and, if INSTALL_PRISTINE_PROPS is
+ TRUE, BASE_PROPS for the LOCAL_ABSPATH in DB, updating the node to reflect
+ the changes. PRISTINE_PROPS must be supplied even if INSTALL_PRISTINE_PROPS
+ is FALSE.
+
+ Use SCRATCH_POOL for temporary allocations. */
+static svn_error_t *
+queue_install_props(svn_wc__db_t *db,
+ const char *local_abspath,
+ svn_wc__db_kind_t kind,
+ apr_hash_t *pristine_props,
+ apr_hash_t *props,
+ svn_boolean_t install_pristine_props,
+ apr_pool_t *scratch_pool)
{
apr_array_header_t *prop_diffs;
const char *prop_abspath;
@@ -657,9 +663,9 @@ svn_wc_merge_props3(svn_wc_notify_state_
/* After a (not-dry-run) merge, we ALWAYS have props to save. */
SVN_ERR_ASSERT(new_base_props != NULL && new_actual_props != NULL);
- SVN_ERR(svn_wc__install_props(wc_ctx->db, local_abspath, kind,
- new_base_props, new_actual_props,
- base_merge, pool));
+ SVN_ERR(queue_install_props(wc_ctx->db, local_abspath, kind,
+ new_base_props, new_actual_props,
+ base_merge, pool));
SVN_ERR(svn_wc__wq_run(wc_ctx->db, local_abspath,
cancel_func, cancel_baton,
Modified: subversion/trunk/subversion/libsvn_wc/props.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/props.h?rev=942932&r1=942931&r2=942932&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/props.h (original)
+++ subversion/trunk/subversion/libsvn_wc/props.h Mon May 10 22:21:00 2010
@@ -135,21 +135,6 @@ svn_wc__merge_props(svn_wc_notify_state_
changing the working file. */
svn_boolean_t svn_wc__has_magic_property(const apr_array_header_t *properties);
-/* Add a working queue item to install PROPS and, if INSTALL_PRISTINE_PROPS is
- true, BASE_PROPS for the LOCAL_ABSPATH in DB, updating the node to reflect
- the changes. PRISTINE_PROPS must be supplied even if INSTALL_PRISTINE_PROPS
- is false. If FORCE_BASE_INSTALL properties are always installed in BASE_NODE,
- even though WORKING is used as pristine for the current node.
- Use SCRATCH_POOL for temporary allocations. */
-svn_error_t *
-svn_wc__install_props(svn_wc__db_t *db,
- const char *local_abspath,
- svn_wc__db_kind_t kind,
- apr_hash_t *pristine_props,
- apr_hash_t *props,
- svn_boolean_t install_pristine_props,
- apr_pool_t *scratch_pool);
-
/* Delete PROPS_KIND props for LOCAL_ABSPATH */
svn_error_t *