Author: hwright
Date: Fri May 6 18:36:49 2011
New Revision: 1100318
URL: http://svn.apache.org/viewvc?rev=1100318&view=rev
Log:
Revert r1099233, which was itself a partial reversion of r1099217.
The then-remaining use of this node API is now gone.
Modified:
subversion/trunk/subversion/include/private/svn_wc_private.h
subversion/trunk/subversion/libsvn_wc/node.c
subversion/trunk/subversion/libsvn_wc/wc.h
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=1100318&r1=1100317&r2=1100318&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_wc_private.h (original)
+++ subversion/trunk/subversion/include/private/svn_wc_private.h Fri May 6
18:36:49 2011
@@ -333,35 +333,6 @@ svn_wc__node_get_repos_relpath(const cha
apr_pool_t *scratch_pool);
/**
- * Set @a *copyfrom_url to the corresponding copy-from URL (allocated
- * from @a result_pool), and @a copyfrom_rev to the corresponding
- * copy-from revision, of @a local_abspath, using @a wc_ctx. Set @a
- * is_copy_target to TRUE iff @a local_abspath was the target of a
- * copy information (versus being a member of the subtree beneath such
- * a copy target).
- *
- * @a copyfrom_root_url and @a copyfrom_repos_relpath return the exact same
- * information as @a copyfrom_url, just still separated as root and relpath.
- *
- * If @a local_abspath is not copied, set @a *copyfrom_root_url,
- * @a *copyfrom_repos_relpath and @a copyfrom_url to NULL and
- * @a *copyfrom_rev to @c SVN_INVALID_REVNUM.
- *
- * Any out parameters may be NULL if the caller doesn't care about those
- * values.
- */
-svn_error_t *
-svn_wc__node_get_copyfrom_info(const char **copyfrom_root_url,
- const char **copyfrom_repos_relpath,
- const char **copyfrom_url,
- svn_revnum_t *copyfrom_rev,
- svn_boolean_t *is_copy_target,
- svn_wc_context_t *wc_ctx,
- const char *local_abspath,
- apr_pool_t *result_pool,
- 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=1100318&r1=1100317&r2=1100318&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/node.c (original)
+++ subversion/trunk/subversion/libsvn_wc/node.c Fri May 6 18:36:49 2011
@@ -552,28 +552,6 @@ svn_wc__internal_get_copyfrom_info(const
return SVN_NO_ERROR;
}
-svn_error_t *
-svn_wc__node_get_copyfrom_info(const char **copyfrom_root_url,
- const char **copyfrom_repos_relpath,
- const char **copyfrom_url,
- svn_revnum_t *copyfrom_rev,
- svn_boolean_t *is_copy_target,
- svn_wc_context_t *wc_ctx,
- const char *local_abspath,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool)
-{
- return
- svn_error_return(svn_wc__internal_get_copyfrom_info(copyfrom_root_url,
- copyfrom_repos_relpath,
- copyfrom_url,
- copyfrom_rev,
- is_copy_target,
- wc_ctx->db,
- local_abspath,
- result_pool,
- scratch_pool));
-}
/* A recursive node-walker, helper for svn_wc__internal_walk_children().
*
Modified: subversion/trunk/subversion/libsvn_wc/wc.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc.h?rev=1100318&r1=1100317&r2=1100318&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc.h (original)
+++ subversion/trunk/subversion/libsvn_wc/wc.h Fri May 6 18:36:49 2011
@@ -631,7 +631,24 @@ svn_wc__internal_node_get_schedule(svn_w
const char *local_abspath,
apr_pool_t *scratch_pool);
-/* Internal version of svn_wc__node_get_copyfrom_info */
+/**
+ * Set @a *copyfrom_url to the corresponding copy-from URL (allocated
+ * from @a result_pool), and @a copyfrom_rev to the corresponding
+ * copy-from revision, of @a local_abspath, using @a db. Set @a
+ * is_copy_target to TRUE iff @a local_abspath was the target of a
+ * copy information (versus being a member of the subtree beneath such
+ * a copy target).
+ *
+ * @a copyfrom_root_url and @a copyfrom_repos_relpath return the exact same
+ * information as @a copyfrom_url, just still separated as root and relpath.
+ *
+ * If @a local_abspath is not copied, set @a *copyfrom_root_url,
+ * @a *copyfrom_repos_relpath and @a copyfrom_url to NULL and
+ * @a *copyfrom_rev to @c SVN_INVALID_REVNUM.
+ *
+ * Any out parameters may be NULL if the caller doesn't care about those
+ * values.
+ */
svn_error_t *
svn_wc__internal_get_copyfrom_info(const char **copyfrom_root_url,
const char **copyfrom_repos_relpath,
