Author: rhuijben
Date: Wed Sep 1 21:58:57 2010
New Revision: 991723
URL: http://svn.apache.org/viewvc?rev=991723&view=rev
Log:
* subversion/libsvn_wc/status.c
(assemble_status): Simplify the has properties check to avoid some
expensive checks. We don't have to check actual properties as these
must have the same value or we would have seen property changes.
Modified:
subversion/trunk/subversion/libsvn_wc/status.c
Modified: subversion/trunk/subversion/libsvn_wc/status.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/status.c?rev=991723&r1=991722&r2=991723&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/status.c (original)
+++ subversion/trunk/subversion/libsvn_wc/status.c Wed Sep 1 21:58:57 2010
@@ -444,18 +444,11 @@ assemble_status(svn_wc_status3_t **statu
{
apr_hash_t *props;
- SVN_ERR(svn_wc__get_pristine_props(&props, db, local_abspath,
- scratch_pool, scratch_pool));
-
+ SVN_ERR(svn_wc__db_read_pristine_props(&props, db, local_abspath,
+ scratch_pool, scratch_pool));
+
if (props != NULL && apr_hash_count(props) > 0)
has_props = TRUE;
- else
- {
- SVN_ERR(svn_wc__get_actual_props(&props, db, local_abspath,
- scratch_pool, scratch_pool));
-
- has_props = (props != NULL && apr_hash_count(props) > 0);
- }
}
if (has_props)
prop_status = svn_wc_status_normal;
