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 19:42:04 UTC
svn commit: r1097560 - in /subversion/trunk/subversion:
include/private/svn_wc_private.h libsvn_wc/info.c libsvn_wc/node.c
Author: hwright
Date: Thu Apr 28 17:42:03 2011
New Revision: 1097560
URL: http://svn.apache.org/viewvc?rev=1097560&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_checksum): Remove.
* subversion/libsvn_wc/info.c
(build_info_for_entry): Use db_read_info() to get the checksum value.
* subversion/libsvn_wc/node.c
(svn_wc__node_get_checksum): 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=1097560&r1=1097559&r2=1097560&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_wc_private.h (original)
+++ subversion/trunk/subversion/include/private/svn_wc_private.h Thu Apr 28 17:42:03 2011
@@ -284,19 +284,6 @@ svn_wc__node_get_changelist(const char *
/**
- * Set @a *checksum to the checksum of the pristine text associated
- * with @a local_abspath if the working copy has recorded such
- * information, or to @c NULL otherwise. Allocate the result in @a
- * result_pool and use @a scratch_pool for temporary allocations.
- */
-svn_error_t *
-svn_wc__node_get_checksum(const svn_checksum_t **checksum,
- 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
* pristine text -- after translation -- associated with @a
* local_abspath and @a *recorded_mod_time to the recorded last
Modified: subversion/trunk/subversion/libsvn_wc/info.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/info.c?rev=1097560&r1=1097559&r2=1097560&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/info.c (original)
+++ subversion/trunk/subversion/libsvn_wc/info.c Thu Apr 28 17:42:03 2011
@@ -149,13 +149,18 @@ build_info_for_entry(svn_info2_t **info,
{
const svn_checksum_t *checksum;
+ 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,
+ 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));
- SVN_ERR(svn_wc__node_get_checksum(&checksum, wc_ctx, local_abspath,
- scratch_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=1097560&r1=1097559&r2=1097560&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/node.c (original)
+++ subversion/trunk/subversion/libsvn_wc/node.c Thu Apr 28 17:42:03 2011
@@ -346,23 +346,6 @@ svn_wc__node_get_changelist(const char *
return svn_error_return(err);
}
-svn_error_t *
-svn_wc__node_get_checksum(const svn_checksum_t **checksum,
- 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__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,
- wc_ctx->db, local_abspath,
- result_pool, scratch_pool));
-}
svn_error_t *
svn_wc__node_get_recorded_info(svn_filesize_t *recorded_size,