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/05/03 22:08:00 UTC
svn commit: r1099220 - /subversion/trunk/subversion/libsvn_wc/info.c
Author: hwright
Date: Tue May 3 20:08:00 2011
New Revision: 1099220
URL: http://svn.apache.org/viewvc?rev=1099220&view=rev
Log:
* subversion/libsvn_wc/info.c
(build_info_for_entry): Grab lock information directly from the wc-db.
Modified:
subversion/trunk/subversion/libsvn_wc/info.c
Modified: subversion/trunk/subversion/libsvn_wc/info.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/info.c?rev=1099220&r1=1099219&r2=1099220&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/info.c (original)
+++ subversion/trunk/subversion/libsvn_wc/info.c Tue May 3 20:08:00 2011
@@ -45,7 +45,6 @@ build_info_for_entry(svn_info2_t **info,
{
svn_info2_t *tmpinfo;
svn_boolean_t is_copy_target;
- apr_time_t lock_date;
svn_boolean_t exclude = FALSE;
svn_boolean_t is_copy;
svn_revnum_t rev;
@@ -189,22 +188,21 @@ build_info_for_entry(svn_info2_t **info,
/* lock stuff */
if (kind == svn_node_file)
{
- const char *lock_token;
- const char *lock_owner;
- const char *lock_comment;
-
- SVN_ERR(svn_wc__node_get_lock_info(&lock_token, &lock_owner,
- &lock_comment, &lock_date,
- wc_ctx, local_abspath,
- result_pool, scratch_pool));
+ svn_wc__db_lock_t *lock;
- if (lock_token) /* the token is the critical bit. */
+ SVN_ERR(svn_wc__db_base_get_info(NULL, NULL, NULL, NULL, NULL, NULL,
+ NULL, NULL, NULL, NULL, NULL, NULL,
+ &lock, NULL, NULL, NULL, NULL, NULL,
+ wc_ctx->db, local_abspath,
+ result_pool, scratch_pool));
+
+ if (lock)
{
tmpinfo->lock = apr_pcalloc(result_pool, sizeof(*(tmpinfo->lock)));
- tmpinfo->lock->token = lock_token;
- tmpinfo->lock->owner = lock_owner;
- tmpinfo->lock->comment = lock_comment;
- tmpinfo->lock->creation_date = lock_date;
+ tmpinfo->lock->token = lock->token;
+ tmpinfo->lock->owner = lock->owner;
+ tmpinfo->lock->comment = lock->comment;
+ tmpinfo->lock->creation_date = lock->date;
}
}