You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2011/05/18 22:06:22 UTC
svn commit: r1124402 - in /subversion/trunk/subversion:
include/private/svn_wc_private.h libsvn_client/prop_commands.c
libsvn_wc/externals.c
Author: rhuijben
Date: Wed May 18 20:06:21 2011
New Revision: 1124402
URL: http://svn.apache.org/viewvc?rev=1124402&view=rev
Log:
Revert most changes from r1102912: The propread code specialized for file
externals.
* subversion/libsvn_client/prop_commands.c
(svn_client_propget3,
svn_client_proplist3): Remove external property handling.
* subversion/include/private/svn_wc_private.h
(svn_wc__external_read_props): Remove function.
* subversion/libsvn_wc/externals.c
(svn_wc__external_read_props): Remove function.
Modified:
subversion/trunk/subversion/include/private/svn_wc_private.h
subversion/trunk/subversion/libsvn_client/prop_commands.c
subversion/trunk/subversion/libsvn_wc/externals.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=1124402&r1=1124401&r2=1124402&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_wc_private.h (original)
+++ subversion/trunk/subversion/include/private/svn_wc_private.h Wed May 18 20:06:21 2011
@@ -123,21 +123,6 @@ svn_wc__read_external_info(svn_node_kind
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
-/* Reads the properties of the file external at LOCAL_ABSPATH, as defined in
- the working copy identified by WRI_ABSPATH.
-
- If PRISTINE is TRUE, retrieve the pristine version of the properties,
- otherwise the ACTUAL properties.
- */
-svn_error_t *
-svn_wc__external_read_props(apr_hash_t **props,
- svn_wc_context_t *wc_ctx,
- const char *wri_abspath,
- const char *local_abspath,
- svn_boolean_t pristine_props,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool);
-
/* Fill a svn_wc_status3_t * structure with information about the external,
like how it would be shown if file externals were still part of the parent
working copy. */
Modified: subversion/trunk/subversion/libsvn_client/prop_commands.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/prop_commands.c?rev=1124402&r1=1124401&r2=1124402&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/prop_commands.c (original)
+++ subversion/trunk/subversion/libsvn_client/prop_commands.c Wed May 18 20:06:21 2011
@@ -905,31 +905,6 @@ svn_client_propget3(apr_hash_t **props,
if (kind == svn_node_unknown || kind == svn_node_none)
{
- {
- apr_hash_t *node_props;
- svn_error_t *err;
-
- err = svn_wc__external_read_props(&node_props, ctx->wc_ctx, NULL,
- local_abspath, pristine,
- pool, pool);
-
- if (!err)
- {
- if (node_props)
- apr_hash_set(*props, path_or_url, APR_HASH_KEY_STRING,
- apr_hash_get(node_props, propname,
- APR_HASH_KEY_STRING));
-
- if (actual_revnum)
- *actual_revnum = SVN_INVALID_REVNUM; /* Unrelated */
-
- return SVN_NO_ERROR;
- }
- else if (err->apr_err == SVN_ERR_WC_PATH_NOT_FOUND)
- svn_error_clear(err);
- else
- return svn_error_return(err);
- }
/* svn uses SVN_ERR_UNVERSIONED_RESOURCE as warning only
for this function. */
return svn_error_createf(SVN_ERR_UNVERSIONED_RESOURCE, NULL,
@@ -1230,28 +1205,6 @@ svn_client_proplist3(const char *path_or
if (kind == svn_node_unknown || kind == svn_node_none)
{
- /* Be friendly: Check if the explicit target is a file external
- before returning an error */
- {
- apr_hash_t *props;
- svn_error_t *err;
-
- err = svn_wc__external_read_props(&props, ctx->wc_ctx, NULL,
- local_abspath, pristine,
- pool, pool);
-
- if (!err)
- {
- if (props)
- SVN_ERR(receiver(receiver_baton, path_or_url, props, pool));
-
- return SVN_NO_ERROR;
- }
- else if (err->apr_err == SVN_ERR_WC_PATH_NOT_FOUND)
- svn_error_clear(err);
- else
- return svn_error_return(err);
- }
/* svn uses SVN_ERR_UNVERSIONED_RESOURCE as warning only
for this function. */
return svn_error_createf(SVN_ERR_UNVERSIONED_RESOURCE, NULL,
Modified: subversion/trunk/subversion/libsvn_wc/externals.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/externals.c?rev=1124402&r1=1124401&r2=1124402&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/externals.c (original)
+++ subversion/trunk/subversion/libsvn_wc/externals.c Wed May 18 20:06:21 2011
@@ -1169,32 +1169,6 @@ svn_wc__read_external_info(svn_node_kind
}
svn_error_t *
-svn_wc__external_read_props(apr_hash_t **props,
- svn_wc_context_t *wc_ctx,
- const char *wri_abspath,
- const char *local_abspath,
- svn_boolean_t pristine_props,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool)
-{
- if (pristine_props)
- SVN_ERR(svn_wc__db_external_read_pristine_props(props, wc_ctx->db,
- local_abspath,
- wri_abspath,
- result_pool,
- scratch_pool));
- else
- SVN_ERR(svn_wc__db_external_read_props(props, wc_ctx->db,
- local_abspath,
- wri_abspath,
- result_pool,
- scratch_pool));
-
- return SVN_NO_ERROR;
-}
-
-
-svn_error_t *
svn_wc__external_status(const svn_wc_status3_t **stat,
svn_node_kind_t *external_kind,
svn_wc_context_t *wc_ctx,