svn commit: r1717875 - in /subversion/trunk/subversion: libsvn_ra_serf/inherited_props.c libsvn_ra_svn/client.c

[rh...@apache.org]

Author: rhuijben
Date: Thu Dec  3 23:34:57 2015
New Revision: 1717875

URL: http://svn.apache.org/viewvc?rev=1717875&view=rev
Log:
Following up on r1717874, make all ra layers consistently report inherited
properties in the documented way.

This makes ra_svn and ra_serf against new servers report the properties in
the documented way and the way ra_local already reported these.

Which form ra_serf reported before this patch depended on the server
capabilities... If it could use the optimized request it reported like
ra_svn, if not like ra_local.

* subversion/libsvn_ra_serf/inherited_props.c
  (iprops_closed): Stop adding the repository url in output arguments in
    unexpected ways.

* subversion/libsvn_ra_svn/client.c
  (parse_iproplist): Stop adding the repository url in output arguments
    when it is documented that we shouldn't do this.

Modified:
    subversion/trunk/subversion/libsvn_ra_serf/inherited_props.c
    subversion/trunk/subversion/libsvn_ra_svn/client.c

Modified: subversion/trunk/subversion/libsvn_ra_serf/inherited_props.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/inherited_props.c?rev=1717875&r1=1717874&r2=1717875&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/inherited_props.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/inherited_props.c Thu Dec  3 23:34:57 2015
@@ -143,9 +143,7 @@ iprops_closed(svn_ra_serf__xml_estate_t
         return svn_error_create(SVN_ERR_XML_MALFORMED, NULL, NULL);
 
       iprops_ctx->curr_iprop->path_or_url =
-        svn_path_url_add_component2(iprops_ctx->repos_root_url,
-                                    cdata->data,
-                                    iprops_ctx->pool);
+                                apr_pstrdup(iprops_ctx->pool, cdata->data);
     }
   else if (leaving_state == IPROPS_PROPNAME)
     {

Modified: subversion/trunk/subversion/libsvn_ra_svn/client.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_svn/client.c?rev=1717875&r1=1717874&r2=1717875&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_svn/client.c (original)
+++ subversion/trunk/subversion/libsvn_ra_svn/client.c Thu Dec  3 23:34:57 2015
@@ -1232,9 +1232,7 @@ parse_iproplist(apr_array_header_t **inh
       SVN_ERR(svn_ra_svn__parse_tuple(&elt->u.list, "cl",
                                       &parent_rel_path, &iprop_list));
       SVN_ERR(svn_ra_svn__parse_proplist(iprop_list, iterpool, &iprops));
-      new_iprop->path_or_url = svn_path_url_add_component2(repos_root_url,
-                                                           parent_rel_path,
-                                                           result_pool);
+      new_iprop->path_or_url = parent_rel_path;
       new_iprop->prop_hash = svn_hash__make(result_pool);
       for (hi = apr_hash_first(iterpool, iprops);
            hi;