svn commit: r1063797 - in /subversion/branches/uris-as-urls/subversion: libsvn_ra_serf/merge.c libsvn_ra_svn/client.c

[cm...@apache.org]

Author: cmpilato
Date: Wed Jan 26 16:59:17 2011
New Revision: 1063797

URL: http://svn.apache.org/viewvc?rev=1063797&view=rev
Log:
On the 'uris-as-urls' branch:  Make some tests pass by correcting the
use of the path APIs.

* subversion/libsvn_ra_serf/merge.c
  (svn_ra_serf__merge_lock_token_list): The lock token are keyed on
    relpaths, not urlpaths.  Use the correct canonicalization function.

* subversion/libsvn_ra_svn/client.c
  (ra_svn_get_location_segments): Returned location segment paths are
    relpaths, not fspaths.  Use the correct canonicalization function.

Modified:
    subversion/branches/uris-as-urls/subversion/libsvn_ra_serf/merge.c
    subversion/branches/uris-as-urls/subversion/libsvn_ra_svn/client.c

Modified: subversion/branches/uris-as-urls/subversion/libsvn_ra_serf/merge.c
URL: http://svn.apache.org/viewvc/subversion/branches/uris-as-urls/subversion/libsvn_ra_serf/merge.c?rev=1063797&r1=1063796&r2=1063797&view=diff
==============================================================================
--- subversion/branches/uris-as-urls/subversion/libsvn_ra_serf/merge.c (original)
+++ subversion/branches/uris-as-urls/subversion/libsvn_ra_serf/merge.c Wed Jan 26 16:59:17 2011
@@ -454,7 +454,7 @@ svn_ra_serf__merge_lock_token_list(apr_h
       path.data = key;
       path.len = klen;
 
-      if (parent && !svn_urlpath__is_ancestor(parent, key))
+      if (parent && !svn_relpath_is_ancestor(parent, key))
         continue;
 
       svn_ra_serf__add_open_tag_buckets(body, alloc, "S:lock", NULL);

Modified: subversion/branches/uris-as-urls/subversion/libsvn_ra_svn/client.c
URL: http://svn.apache.org/viewvc/subversion/branches/uris-as-urls/subversion/libsvn_ra_svn/client.c?rev=1063797&r1=1063796&r2=1063797&view=diff
==============================================================================
--- subversion/branches/uris-as-urls/subversion/libsvn_ra_svn/client.c (original)
+++ subversion/branches/uris-as-urls/subversion/libsvn_ra_svn/client.c Wed Jan 26 16:59:17 2011
@@ -1727,7 +1727,7 @@ ra_svn_get_location_segments(svn_ra_sess
             return svn_error_create(SVN_ERR_RA_SVN_MALFORMED_DATA, NULL,
                                     _("Expected valid revision range"));
           if (ret_path)
-            ret_path = svn_fspath__canonicalize(ret_path, iterpool);
+            ret_path = svn_relpath_canonicalize(ret_path, iterpool);
           segment->path = ret_path;
           segment->range_start = range_start;
           segment->range_end = range_end;