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 17:01:58 UTC
svn commit: r1097495 - /subversion/trunk/subversion/libsvn_wc/info.c
Author: hwright
Date: Thu Apr 28 15:01:58 2011
New Revision: 1097495
URL: http://svn.apache.org/viewvc?rev=1097495&view=rev
Log:
When fetching info, use the kind provided by the node rather than reading it
again.
* subversion/libsvn_wc/info.c
(build_info_for_entry): Add kind param, and don't read it locally.
(info_found_node_callback): Provide the kind to build_info_for_entry().
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=1097495&r1=1097494&r2=1097495&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/info.c (original)
+++ subversion/trunk/subversion/libsvn_wc/info.c Thu Apr 28 15:01:58 2011
@@ -39,20 +39,18 @@ static svn_error_t *
build_info_for_entry(svn_info2_t **info,
svn_wc_context_t *wc_ctx,
const char *local_abspath,
+ svn_node_kind_t kind,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
svn_info2_t *tmpinfo;
svn_boolean_t is_copy_target;
apr_time_t lock_date;
- svn_node_kind_t kind;
svn_boolean_t exclude = FALSE;
svn_boolean_t is_copy;
svn_revnum_t rev;
const char *repos_relpath;
- SVN_ERR(svn_wc_read_kind(&kind, wc_ctx, local_abspath, FALSE, scratch_pool));
-
if (kind == svn_node_none)
{
svn_error_clear(svn_wc__node_depth_is_exclude(&exclude, wc_ctx,
@@ -263,7 +261,7 @@ info_found_node_callback(const char *loc
local_abspath, pool, pool));
err = build_info_for_entry(&info, fe_baton->wc_ctx, local_abspath,
- pool, pool);
+ kind, pool, pool);
if (err && (err->apr_err == SVN_ERR_WC_PATH_NOT_FOUND)
&& tree_conflict)
{