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/04/28 21:06:49 UTC
svn commit: r1097577 - in /subversion/trunk/subversion:
include/private/svn_wc_private.h libsvn_wc/info.c libsvn_wc/node.c
Author: hwright
Date: Thu Apr 28 19:06:49 2011
New Revision: 1097577
URL: http://svn.apache.org/viewvc?rev=1097577&view=rev
Log:
Switch info to directly fetch the changelist value from the DB, and remove
the abandoned semi-public function for the same.
* subversion/include/private/svn_wc_private.h
(svn_wc__node_get_changelist): Remove.
* subversion/libsvn_wc/info.c
(build_info_for_entry): Use db_read_info() to get the changelist value.
* subversion/libsvn_wc/node.c
(svn_wc__node_get_changelist): 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=1097577&r1=1097576&r2=1097577&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_wc_private.h (original)
+++ subversion/trunk/subversion/include/private/svn_wc_private.h Thu Apr 28 19:06:49 2011
@@ -270,18 +270,6 @@ svn_wc__node_get_changed_info(svn_revnum
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
-/**
- * Set @a *changelist to the changelist to which @a local_abspath belongs.
- * Allocate the result in @a result_pool and use @a scratch_pool for temporary
- * allocations.
- */
-svn_error_t *
-svn_wc__node_get_changelist(const char **changelist,
- svn_wc_context_t *wc_ctx,
- const char *local_abspath,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool);
-
/**
* Set @a *recorded_size to the recorded size (in bytes) of the
Modified: subversion/trunk/subversion/libsvn_wc/info.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/info.c?rev=1097577&r1=1097576&r2=1097577&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/info.c (original)
+++ subversion/trunk/subversion/libsvn_wc/info.c Thu Apr 28 19:06:49 2011
@@ -151,16 +151,12 @@ build_info_for_entry(svn_info2_t **info,
SVN_ERR(svn_wc__db_read_info(NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, &checksum, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL, NULL, NULL, NULL,
+ &tmpinfo->wc_info->changelist,
+ NULL, NULL, NULL, NULL, NULL, NULL, NULL,
wc_ctx->db, local_abspath, result_pool,
scratch_pool));
- SVN_ERR(svn_wc__node_get_changelist(&tmpinfo->wc_info->changelist, wc_ctx,
- local_abspath,
- result_pool, scratch_pool));
-
tmpinfo->wc_info->checksum = svn_checksum_to_cstring(checksum,
result_pool);
}
Modified: subversion/trunk/subversion/libsvn_wc/node.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/node.c?rev=1097577&r1=1097576&r2=1097577&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/node.c (original)
+++ subversion/trunk/subversion/libsvn_wc/node.c Thu Apr 28 19:06:49 2011
@@ -321,33 +321,6 @@ svn_wc__node_get_changed_info(svn_revnum
}
svn_error_t *
-svn_wc__node_get_changelist(const char **changelist,
- svn_wc_context_t *wc_ctx,
- const char *local_abspath,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool)
-{
- svn_error_t *err;
-
- err = svn_wc__db_read_info(NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, changelist,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- wc_ctx->db, local_abspath, result_pool,
- scratch_pool);
-
- if (err && err->apr_err == SVN_ERR_WC_PATH_NOT_FOUND)
- {
- svn_error_clear(err);
- err = SVN_NO_ERROR;
- *changelist = NULL;
- }
-
- return svn_error_return(err);
-}
-
-
-svn_error_t *
svn_wc__node_get_recorded_info(svn_filesize_t *recorded_size,
apr_time_t *recorded_mod_time,
svn_wc_context_t *wc_ctx,