subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cmpil...@apache.org
Subject svn commit: r1067237 - in /subversion/trunk/subversion: libsvn_client/ libsvn_ra_neon/
Date Fri, 04 Feb 2011 17:44:18 GMT
Author: cmpilato
Date: Fri Feb  4 17:44:17 2011
New Revision: 1067237

URL: http://svn.apache.org/viewvc?rev=1067237&view=rev
Log:
Continue purging uses of deprecated svn_path_* functions.

* subversion/libsvn_ra_neon/commit.c (add_child, checkout_resource,
  get_child_tokens),
* subversion/libsvn_ra_neon/props.c (svn_ra_neon__search_for_starting_props,
  svn_ra_neon__get_baseline_props), 
* subversion/libsvn_ra_neon/get_location_segments.c
  (svn_ra_neon__get_location_segments),
* subversion/libsvn_ra_neon/fetch.c (cdata_handler),
* subversion/libsvn_ra_neon/get_deleted_rev.c (svn_ra_neon__get_deleted_rev),
* subversion/libsvn_ra_neon/merge.c (handle_resource),
* subversion/libsvn_ra_neon/util.c (svn_ra_neon__copy_href),
* subversion/libsvn_client/mergeinfo.c (find_nearest_ancestor):
  Replace uses of deprecated path APIs with non-deprecated ones.

Modified:
    subversion/trunk/subversion/libsvn_client/mergeinfo.c
    subversion/trunk/subversion/libsvn_ra_neon/commit.c
    subversion/trunk/subversion/libsvn_ra_neon/fetch.c
    subversion/trunk/subversion/libsvn_ra_neon/get_deleted_rev.c
    subversion/trunk/subversion/libsvn_ra_neon/get_location_segments.c
    subversion/trunk/subversion/libsvn_ra_neon/merge.c
    subversion/trunk/subversion/libsvn_ra_neon/props.c
    subversion/trunk/subversion/libsvn_ra_neon/util.c

Modified: subversion/trunk/subversion/libsvn_client/mergeinfo.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/mergeinfo.c?rev=1067237&r1=1067236&r2=1067237&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/mergeinfo.c (original)
+++ subversion/trunk/subversion/libsvn_client/mergeinfo.c Fri Feb  4 17:44:17 2011
@@ -1271,7 +1271,7 @@ find_nearest_ancestor(const apr_array_he
         {
           svn_sort__item_t item = APR_ARRAY_IDX(depth_first_catalog_index, i,
                                                 svn_sort__item_t);
-          if (svn_path_is_ancestor(item.key, abs_repos_path)
+          if (svn_fspath__is_ancestor(item.key, abs_repos_path)
               || svn_path_compare_paths(item.key, abs_repos_path) == 0)
             ancestor_index = i;
         }

Modified: subversion/trunk/subversion/libsvn_ra_neon/commit.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_neon/commit.c?rev=1067237&r1=1067236&r2=1067237&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_neon/commit.c (original)
+++ subversion/trunk/subversion/libsvn_ra_neon/commit.c Fri Feb  4 17:44:17 2011
@@ -371,7 +371,7 @@ static svn_error_t * add_child(version_r
   rsrc->revision = revision;
   rsrc->name = name;
   rsrc->url = svn_path_url_add_component2(parent->url, name, pool);
-  rsrc->local_path = svn_path_join(parent->local_path, name, pool);
+  rsrc->local_path = svn_relpath_join(parent->local_path, name, pool);
 
   /* Case 1:  the resource is truly "new".  Either it was added as a
      completely new object, or implicitly created via a COPY.  Either
@@ -501,7 +501,7 @@ static svn_error_t * checkout_resource(c
         return svn_error_createf
           (err->apr_err, err,
            _("File or directory '%s' is out of date; try updating"),
-           svn_path_local_style(rsrc->local_path, pool));
+           svn_relpath_local_style(rsrc->local_path, pool));
       return err;
     }
 
@@ -682,7 +682,7 @@ static apr_hash_t *get_child_tokens(apr_
       svn_pool_clear(subpool);
       apr_hash_this(hi, &key, &klen, &val);
 
-      if (svn_path_is_child(dir, key, subpool))
+      if (svn_relpath_is_child(dir, key, subpool))
         apr_hash_set(tokens, key, klen, val);
     }
 

Modified: subversion/trunk/subversion/libsvn_ra_neon/fetch.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_neon/fetch.c?rev=1067237&r1=1067236&r2=1067237&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_neon/fetch.c (original)
+++ subversion/trunk/subversion/libsvn_ra_neon/fetch.c Fri Feb  4 17:44:17 2011
@@ -1997,8 +1997,8 @@ cdata_handler(void *userdata, int state,
             /* Short write without associated error?  "Can't happen." */
             return svn_error_createf(SVN_ERR_STREAM_UNEXPECTED_EOF, NULL,
                                      _("Error writing to '%s': unexpected EOF"),
-                                     svn_path_local_style(rb->namestr->data,
-                                                          rb->pool));
+                                     svn_relpath_local_style(rb->namestr->data,
+                                                             rb->pool));
           }
       }
       break;

Modified: subversion/trunk/subversion/libsvn_ra_neon/get_deleted_rev.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_neon/get_deleted_rev.c?rev=1067237&r1=1067236&r2=1067237&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_neon/get_deleted_rev.c (original)
+++ subversion/trunk/subversion/libsvn_ra_neon/get_deleted_rev.c Fri Feb  4 17:44:17 2011
@@ -137,8 +137,8 @@ svn_ra_neon__get_deleted_rev(svn_ra_sess
                                          ras, ras->url->data,
                                          peg_revision,
                                          pool));
-  final_bc_url = svn_path_url_add_component(bc_url.data, bc_relative.data,
-                                            pool);
+  final_bc_url = svn_path_url_add_component2(bc_url.data, bc_relative.data,
+                                             pool);
 
   body = apr_psprintf(pool,
                       "<?xml version=\"1.0\" encoding=\"utf-8\"?>"

Modified: subversion/trunk/subversion/libsvn_ra_neon/get_location_segments.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_neon/get_location_segments.c?rev=1067237&r1=1067236&r2=1067237&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_neon/get_location_segments.c (original)
+++ subversion/trunk/subversion/libsvn_ra_neon/get_location_segments.c Fri Feb  4 17:44:17
2011
@@ -194,7 +194,7 @@ svn_ra_neon__get_location_segments(svn_r
   SVN_ERR(svn_ra_neon__get_baseline_info(NULL, &bc_url, &bc_relative, NULL,
                                          ras, ras->url->data,
                                          peg_revision, subpool));
-  bc = svn_path_url_add_component(bc_url.data, bc_relative.data, subpool);
+  bc = svn_path_url_add_component2(bc_url.data, bc_relative.data, subpool);
 
   err = svn_ra_neon__parsed_request(ras, "REPORT", bc,
                                     request_body->data, NULL, NULL,

Modified: subversion/trunk/subversion/libsvn_ra_neon/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_neon/merge.c?rev=1067237&r1=1067236&r2=1067237&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_neon/merge.c (original)
+++ subversion/trunk/subversion/libsvn_ra_neon/merge.c Fri Feb  4 17:44:17 2011
@@ -37,6 +37,8 @@
 #include "svn_xml.h"
 
 #include "private/svn_dav_protocol.h"
+#include "private/svn_fspath.h"
+
 #include "svn_private_config.h"
 
 #include "ra_neon.h"
@@ -257,7 +259,7 @@ static svn_error_t * handle_resource(mer
     }
 
   /* a collection or regular resource */
-  if (! svn_path_is_ancestor(mc->base_href, mc->href->data))
+  if (! svn_urlpath__is_ancestor(mc->base_href, mc->href->data))
     {
       /* ### need something better than APR_EGENERAL */
       return svn_error_createf(APR_EGENERAL, NULL,
@@ -267,7 +269,7 @@ static svn_error_t * handle_resource(mer
     }
 
   /* given HREF of the form: BASE "/" RELATIVE, extract the relative portion */
-  relative = svn_path_is_child(mc->base_href, mc->href->data, NULL);
+  relative = svn_urlpath__is_child(mc->base_href, mc->href->data, NULL);
   if (! relative) /* the paths are equal */
     relative = "";
 

Modified: subversion/trunk/subversion/libsvn_ra_neon/props.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_neon/props.c?rev=1067237&r1=1067236&r2=1067237&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_neon/props.c (original)
+++ subversion/trunk/subversion/libsvn_ra_neon/props.c Fri Feb  4 17:44:17 2011
@@ -729,8 +729,9 @@ svn_ra_neon__search_for_starting_props(s
       /* ### TODO: path_s is an absolute, schema-less URI, but
          ### technically not an FS_PATH. */
       svn_stringbuf_set(lopped_path,
-                        svn_path_join(svn_path_basename(path_s->data, iterpool),
-                                      lopped_path->data, iterpool));
+                        svn_relpath_join(svn_urlpath__basename(path_s->data,
+                                                               iterpool),
+                                         lopped_path->data, iterpool));
 
       len = path_s->len;
       svn_path_remove_component(path_s);
@@ -879,9 +880,9 @@ svn_error_t *svn_ra_neon__get_baseline_p
   /* don't forget to tack on the parts we lopped off in order to find
      the VCC...  We are expected to return a URI decoded relative
      path, so decode the lopped path first. */
-  my_bc_relative = svn_path_join(relative_path->data,
-                                 svn_path_uri_decode(lopped_path, pool),
-                                 pool);
+  my_bc_relative = svn_relpath_join(relative_path->data,
+                                    svn_path_uri_decode(lopped_path, pool),
+                                    pool);
 
   /* if they want the relative path (could be, they're just trying to find
      the baseline collection), then return it */

Modified: subversion/trunk/subversion/libsvn_ra_neon/util.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_neon/util.c?rev=1067237&r1=1067236&r2=1067237&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_neon/util.c (original)
+++ subversion/trunk/subversion/libsvn_ra_neon/util.c Fri Feb  4 17:44:17 2011
@@ -558,8 +558,12 @@ svn_ra_neon__copy_href(svn_stringbuf_t *
 
   apr_uri_t uri;
   apr_status_t apr_status;
+
   /* SRC can have trailing '/' */
-  src = svn_path_canonicalize(src, pool);
+  if (svn_path_is_url(src))
+    src = svn_uri_canonicalize(src, pool);
+  else
+    src = svn_urlpath__canonicalize(src, pool);
   apr_status = apr_uri_parse(pool, src, &uri);
 
   if (apr_status != APR_SUCCESS)



Mime
View raw message