svn commit: r1413787 - /subversion/trunk/subversion/libsvn_client/iprops.c

[rh...@apache.org]

Author: rhuijben
Date: Mon Nov 26 19:15:33 2012
New Revision: 1413787

URL: http://svn.apache.org/viewvc?rev=1413787&view=rev
Log:
Following up on r1413597, and building on top of r1413774, don't obtain
inherited properties for local working copy nodes that represent the
repository root.

* subversion/libsvn_client/iprops.c
  (svn_client__get_inheritable_props): Use the new hash-values returned by
    svn_wc__get_cached_iprop_children() to avoid ra calls for the repository
    root.

Modified:
    subversion/trunk/subversion/libsvn_client/iprops.c

Modified: subversion/trunk/subversion/libsvn_client/iprops.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/iprops.c?rev=1413787&r1=1413786&r2=1413787&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/iprops.c (original)
+++ subversion/trunk/subversion/libsvn_client/iprops.c Mon Nov 26 19:15:33 2012
@@ -86,12 +86,8 @@ svn_client__get_inheritable_props(apr_ha
                                   apr_pool_t *result_pool,
                                   apr_pool_t *scratch_pool)
 {
-  const char *repos_root_url = NULL;
   *wcroot_iprops = apr_hash_make(result_pool);
 
-  if (ra_session)
-    SVN_ERR(svn_ra_get_repos_root2(ra_session, &repos_root_url, scratch_pool));
-
   /* If we don't have a base revision for LOCAL_ABSPATH then it can't
      possibly be a working copy root, nor can it contain any WC roots
      in the form of switched subtrees.  So there is nothing to cache. */
@@ -120,7 +116,10 @@ svn_client__get_inheritable_props(apr_ha
             {
               const char *target_abspath = apr_pstrdup(scratch_pool,
                                                        local_abspath);
-              apr_hash_set(iprop_paths, target_abspath, 
+
+              /* As value we set TARGET_ABSPATH, but any string besides ""
+                 would do */
+              apr_hash_set(iprop_paths, target_abspath,
                            APR_HASH_KEY_STRING, target_abspath);
             }
         }
@@ -130,10 +129,18 @@ svn_client__get_inheritable_props(apr_ha
            hi = apr_hash_next(hi))
         {
           const char *child_abspath = svn__apr_hash_index_key(hi);
+          const char *child_repos_relpath = svn__apr_hash_index_val(hi);
           const char *url;
           apr_array_header_t *inherited_props;
 
           svn_pool_clear(iterpool);
+
+          if (*child_repos_relpath == '\0')
+            {
+              /* A repository root doesn't have inherited properties */
+              continue;
+            }
+
           SVN_ERR(svn_wc__node_get_url(&url, ctx->wc_ctx, child_abspath,
                                        iterpool, iterpool));
           if (ra_session)
@@ -153,16 +160,11 @@ svn_client__get_inheritable_props(apr_ha
                                                            FALSE, TRUE,
                                                            ctx,
                                                            scratch_pool));
-              SVN_ERR(svn_ra_get_repos_root2(ra_session, &repos_root_url,
-                                             scratch_pool));
             }
 
-          if (strcmp(repos_root_url, url) == 0)
-            continue;
-
           SVN_ERR(svn_ra_get_inherited_props(ra_session, &inherited_props,
                                              "", revision, result_pool,
-                                             scratch_pool));
+                                             iterpool));
           apr_hash_set(*wcroot_iprops,
                        apr_pstrdup(result_pool, child_abspath),
                        APR_HASH_KEY_STRING,