Author: hwright
Date: Thu Apr 28 14:50:00 2011
New Revision: 1097488
URL: http://svn.apache.org/viewvc?rev=1097488&view=rev
Log:
Remove the library-public, Subversion-private node walker. If callers want
to walk nodes, they should let libsvn_wc do it for them.
* subversion/tests/cmdline/entries-dump.c
(directory_dump): This caller wants to walk nodes, so he's gonna need to
call the internal function.
* subversion/include/private/svn_wc_private.h
(svn_wc__node_found_func_t): Remove.
(svn_wc__node_walk_children): Remove.
* subversion/libsvn_wc/wc.h
(svn_wc__node_found_func_t): Copied from svn_wc_private.h.
* subversion/libsvn_wc/node.c
(svn_wc__node_walk_children): Remove.
Modified:
subversion/trunk/subversion/include/private/svn_wc_private.h
subversion/trunk/subversion/libsvn_wc/node.c
subversion/trunk/subversion/libsvn_wc/wc.h
subversion/trunk/subversion/tests/cmdline/entries-dump.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=1097488&r1=1097487&r2=1097488&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_wc_private.h (original)
+++ subversion/trunk/subversion/include/private/svn_wc_private.h Thu Apr 28
14:50:00 2011
@@ -142,12 +142,6 @@ svn_wc__strictly_is_wc_root(svn_boolean_
* before the 1.7 release.
*/
-/** A callback invoked by the generic node-walker function. */
-typedef svn_error_t *(*svn_wc__node_found_func_t)(const char *local_abspath,
- svn_node_kind_t kind,
- void *walk_baton,
- apr_pool_t *scratch_pool);
-
/*
* Convert from svn_wc_conflict_description2_t to
svn_wc_conflict_description_t.
@@ -406,25 +400,6 @@ svn_wc__node_get_copyfrom_info(const cha
apr_pool_t *scratch_pool);
/**
- * Call @a walk_callback with @a walk_baton for @a local_abspath and all
- * nodes underneath it, restricted by @a walk_depth, and possibly
- * @a changelists.
- *
- * If @a show_hidden is true, include hidden nodes, else ignore them.
- */
-svn_error_t *
-svn_wc__node_walk_children(svn_wc_context_t *wc_ctx,
- const char *local_abspath,
- svn_boolean_t show_hidden,
- const apr_array_header_t *changelists,
- svn_wc__node_found_func_t walk_callback,
- void *walk_baton,
- svn_depth_t walk_depth,
- svn_cancel_func_t cancel_func,
- void *cancel_baton,
- apr_pool_t *scratch_pool);
-
-/**
* Set @a *is_deleted to TRUE if @a local_abspath is deleted, using
* @a wc_ctx. If @a local_abspath is not in the working copy, return
* @c SVN_ERR_WC_PATH_NOT_FOUND. Use @a scratch_pool for all temporary
Modified: subversion/trunk/subversion/libsvn_wc/node.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/node.c?rev=1097488&r1=1097487&r2=1097488&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/node.c (original)
+++ subversion/trunk/subversion/libsvn_wc/node.c Thu Apr 28 14:50:00 2011
@@ -788,25 +788,6 @@ svn_wc__internal_walk_children(svn_wc__d
}
svn_error_t *
-svn_wc__node_walk_children(svn_wc_context_t *wc_ctx,
- const char *local_abspath,
- svn_boolean_t show_hidden,
- const apr_array_header_t *changelists,
- svn_wc__node_found_func_t walk_callback,
- void *walk_baton,
- svn_depth_t walk_depth,
- svn_cancel_func_t cancel_func,
- void *cancel_baton,
- apr_pool_t *scratch_pool)
-{
- return svn_error_return(
- svn_wc__internal_walk_children(wc_ctx->db, local_abspath, show_hidden,
- changelists, walk_callback, walk_baton,
- walk_depth,
- cancel_func, cancel_baton, scratch_pool));
-}
-
-svn_error_t *
svn_wc__node_is_status_deleted(svn_boolean_t *is_deleted,
svn_wc_context_t *wc_ctx,
const char *local_abspath,
Modified: subversion/trunk/subversion/libsvn_wc/wc.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc.h?rev=1097488&r1=1097487&r2=1097488&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc.h (original)
+++ subversion/trunk/subversion/libsvn_wc/wc.h Thu Apr 28 14:50:00 2011
@@ -580,6 +580,12 @@ svn_wc__internal_walk_status(svn_wc__db_
void *cancel_baton,
apr_pool_t *scratch_pool);
+/** A callback invoked by the generic node-walker function. */
+typedef svn_error_t *(*svn_wc__node_found_func_t)(const char *local_abspath,
+ svn_node_kind_t kind,
+ void *walk_baton,
+ apr_pool_t *scratch_pool);
+
/* Library-internal version of svn_wc__node_walk_children(), which see.
If CHANGELISTS is non-NULL and non-empty, filter thereon. */
svn_error_t *
Modified: subversion/trunk/subversion/tests/cmdline/entries-dump.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/entries-dump.c?rev=1097488&r1=1097487&r2=1097488&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/entries-dump.c (original)
+++ subversion/trunk/subversion/tests/cmdline/entries-dump.c Thu Apr 28
14:50:00 2011
@@ -36,6 +36,8 @@
#include "private/svn_wc_private.h"
+#include "libsvn_wc/wc.h"
+
static void
str_value(const char *name, const char *value)
{
@@ -230,9 +232,9 @@ directory_dump(const char *path,
bt.prefix_path = path;
- err = svn_wc__node_walk_children(bt.wc_ctx, bt.root_abspath, FALSE, NULL,
- print_dir, &bt, svn_depth_infinity,
- NULL, NULL, scratch_pool);
+ err = svn_wc__internal_walk_children(bt.wc_ctx->db, bt.root_abspath, FALSE,
+ NULL, print_dir, &bt,
svn_depth_infinity,
+ NULL, NULL, scratch_pool);
if (err)
{
const char *dir_abspath;
