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/02 18:33:03 UTC
svn commit: r1098653 - in /subversion/trunk/subversion:
include/private/svn_wc_private.h libsvn_wc/info.c libsvn_wc/node.c
Author: hwright
Date: Mon May 2 16:33:02 2011
New Revision: 1098653
URL: http://svn.apache.org/viewvc?rev=1098653&view=rev
Log:
Remove a function from node.c, along with its single callsite.
* subversion/include/private/svn_wc_private.h
(svn_wc__node_depth_is_exclude): Remove.
* subversion/libsvn_wc/info.c
(build_info_for_entry): Duplicate functionality here.
* subversion/libsvn_wc/node.c
(svn_wc__node_depth_is_exclude): Remove.
Modified:
subversion/trunk/subversion/include/private/svn_wc_private.h
subversion/trunk/subversion/libsvn_wc/info.c
subversion/trunk/subversion/libsvn_wc/node.c
Modified: subversion/trunk/subversion/include/private/svn_wc_private.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_wc_private.h?rev=1098653&r1=1098652&r2=1098653&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_wc_private.h (original)
+++ subversion/trunk/subversion/include/private/svn_wc_private.h Mon May 2 16:33:02 2011
@@ -759,15 +759,6 @@ svn_wc__read_entries_old(apr_hash_t **en
apr_pool_t *scratch_pool);
/**
- * Find whether @a local_abspath is set with depth exclude using @a wc_ctx.
- */
-svn_error_t *
-svn_wc__node_depth_is_exclude(svn_boolean_t *exclude,
- svn_wc_context_t *wc_ctx,
- const char *local_abspath,
- apr_pool_t *scratch_pool);
-
-/**
* Recursively clear the dav cache (wcprops) in @a wc_ctx for the tree
* rooted at @a local_abspath.
*/
Modified: subversion/trunk/subversion/libsvn_wc/info.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/info.c?rev=1098653&r1=1098652&r2=1098653&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/info.c (original)
+++ subversion/trunk/subversion/libsvn_wc/info.c Mon May 2 16:33:02 2011
@@ -53,9 +53,20 @@ build_info_for_entry(svn_info2_t **info,
if (kind == svn_node_none)
{
- svn_error_clear(svn_wc__node_depth_is_exclude(&exclude, wc_ctx,
- local_abspath,
- scratch_pool));
+ svn_wc__db_status_t status;
+ svn_error_t *err = svn_wc__db_read_info(&status, NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL, NULL,
+ NULL, NULL,
+ wc_ctx->db, local_abspath,
+ scratch_pool, scratch_pool);
+
+ if ((! err) && (status == svn_wc__db_status_excluded))
+ exclude = TRUE;
+
+ svn_error_clear(err);
if (! exclude)
return svn_error_createf(SVN_ERR_WC_PATH_NOT_FOUND, NULL,
_("The node '%s' was not found."),
Modified: subversion/trunk/subversion/libsvn_wc/node.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/node.c?rev=1098653&r1=1098652&r2=1098653&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/node.c (original)
+++ subversion/trunk/subversion/libsvn_wc/node.c Mon May 2 16:33:02 2011
@@ -1326,30 +1326,6 @@ svn_wc__get_mergeinfo_walk_info(svn_bool
}
svn_error_t *
-svn_wc__node_depth_is_exclude(svn_boolean_t *exclude,
- svn_wc_context_t *wc_ctx,
- const char *local_abspath,
- apr_pool_t *scratch_pool)
-{
- svn_wc__db_status_t status;
- svn_error_t *err;
-
- *exclude = FALSE;
-
- err = svn_wc__db_read_info(&status, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL,
- wc_ctx->db, local_abspath, scratch_pool,
- scratch_pool);
-
- if ((! err) && (status == svn_wc__db_status_excluded))
- *exclude = TRUE;
-
- return svn_error_return(err);
-}
-
-svn_error_t *
svn_wc__node_clear_dav_cache_recursive(svn_wc_context_t *wc_ctx,
const char *local_abspath,
apr_pool_t *scratch_pool)