subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1136512 - in /subversion/trunk/subversion: include/ libsvn_client/ libsvn_ra/ libsvn_ra_local/ libsvn_ra_serf/ libsvn_subr/ libsvn_wc/ tests/libsvn_subr/
Date Thu, 16 Jun 2011 16:09:54 GMT
Author: julianfoad
Date: Thu Jun 16 16:09:53 2011
New Revision: 1136512

URL: http://svn.apache.org/viewvc?rev=1136512&view=rev
Log:
Make these new APIs private: svn_uri_is_ancestor(), svn_relpath_is_ancestor().

* subversion/include/svn_dirent_uri.h,
  subversion/libsvn_subr/dirent_uri.c
  (svn_uri_is_ancestor): Rename to svn_uri__is_ancestor().
  (svn_relpath_is_ancestor): Rename to svn_relpath__is_ancestor().

* Everywhere else: Adjust calls.

Modified:
    subversion/trunk/subversion/include/svn_dirent_uri.h
    subversion/trunk/subversion/libsvn_client/commit.c
    subversion/trunk/subversion/libsvn_client/copy.c
    subversion/trunk/subversion/libsvn_client/externals.c
    subversion/trunk/subversion/libsvn_client/merge.c
    subversion/trunk/subversion/libsvn_client/relocate.c
    subversion/trunk/subversion/libsvn_client/status.c
    subversion/trunk/subversion/libsvn_client/switch.c
    subversion/trunk/subversion/libsvn_client/update.c
    subversion/trunk/subversion/libsvn_client/util.c
    subversion/trunk/subversion/libsvn_ra/ra_loader.c
    subversion/trunk/subversion/libsvn_ra_local/ra_plugin.c
    subversion/trunk/subversion/libsvn_ra_serf/merge.c
    subversion/trunk/subversion/libsvn_ra_serf/serf.c
    subversion/trunk/subversion/libsvn_subr/dirent_uri.c
    subversion/trunk/subversion/libsvn_wc/adm_files.c
    subversion/trunk/subversion/libsvn_wc/adm_ops.c
    subversion/trunk/subversion/libsvn_wc/old-and-busted.c
    subversion/trunk/subversion/libsvn_wc/update_editor.c
    subversion/trunk/subversion/libsvn_wc/wc_db.c
    subversion/trunk/subversion/tests/libsvn_subr/dirent_uri-test.c

Modified: subversion/trunk/subversion/include/svn_dirent_uri.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_dirent_uri.h?rev=1136512&r1=1136511&r2=1136512&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_dirent_uri.h (original)
+++ subversion/trunk/subversion/include/svn_dirent_uri.h Thu Jun 16 16:09:53 2011
@@ -614,8 +614,8 @@ svn_dirent_is_ancestor(const char *paren
  * @since New in 1.7.
  */
 svn_boolean_t
-svn_relpath_is_ancestor(const char *parent_relpath,
-                        const char *child_relpath);
+svn_relpath__is_ancestor(const char *parent_relpath,
+                         const char *child_relpath);
 
 /** Return TRUE if @a parent_uri is an ancestor of @a child_uri or
  * the uris are equal, and FALSE otherwise.
@@ -623,8 +623,8 @@ svn_relpath_is_ancestor(const char *pare
  * @since New in 1.7.
  */
 svn_boolean_t
-svn_uri_is_ancestor(const char *parent_uri,
-                    const char *child_uri);
+svn_uri__is_ancestor(const char *parent_uri,
+                     const char *child_uri);
 
 
 /** Return the relative path part of @a child_dirent that is below

Modified: subversion/trunk/subversion/libsvn_client/commit.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/commit.c?rev=1136512&r1=1136511&r2=1136512&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/commit.c (original)
+++ subversion/trunk/subversion/libsvn_client/commit.c Thu Jun 16 16:09:53 2011
@@ -904,7 +904,7 @@ collect_lock_tokens(apr_hash_t **result,
       const char *url = svn__apr_hash_index_key(hi);
       const char *token = svn__apr_hash_index_val(hi);
 
-      if (svn_uri_is_ancestor(base_url, url))
+      if (svn_uri__is_ancestor(base_url, url))
         {
           url = svn_uri_skip_ancestor(base_url, url, pool);
 
@@ -1153,7 +1153,7 @@ check_url_kind(void *baton,
   struct check_url_kind_baton *cukb = baton;
 
   /* If we don't have a session or can't use the session, get one */
-  if (!cukb->session || !svn_uri_is_ancestor(cukb->repos_root_url, url))
+  if (!cukb->session || !svn_uri__is_ancestor(cukb->repos_root_url, url))
     {
       SVN_ERR(svn_client_open_ra_session(&cukb->session, url, cukb->ctx,
                                          cukb->pool));

Modified: subversion/trunk/subversion/libsvn_client/copy.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/copy.c?rev=1136512&r1=1136511&r2=1136512&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/copy.c (original)
+++ subversion/trunk/subversion/libsvn_client/copy.c Thu Jun 16 16:09:53 2011
@@ -802,8 +802,8 @@ repos_to_repos_copy(const apr_array_head
       dead_end_rev.kind = svn_opt_revision_unspecified;
 
       /* Are the source and destination URLs at or under REPOS_ROOT? */
-      if (! (svn_uri_is_ancestor(repos_root, pair->src_abspath_or_url)
-             && svn_uri_is_ancestor(repos_root, pair->dst_abspath_or_url)))
+      if (! (svn_uri__is_ancestor(repos_root, pair->src_abspath_or_url)
+             && svn_uri__is_ancestor(repos_root, pair->dst_abspath_or_url)))
         return svn_error_create
           (SVN_ERR_UNSUPPORTED_FEATURE, NULL,
            _("Source and destination URLs appear not to point to the "
@@ -1182,7 +1182,7 @@ check_url_kind(void *baton,
   struct check_url_kind_baton *cukb = baton;
 
   /* If we don't have a session or can't use the session, get one */
-  if (!svn_uri_is_ancestor(cukb->repos_root_url, url))
+  if (!svn_uri__is_ancestor(cukb->repos_root_url, url))
     *kind = svn_node_none;
   else
     {

Modified: subversion/trunk/subversion/libsvn_client/externals.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/externals.c?rev=1136512&r1=1136511&r2=1136512&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/externals.c (original)
+++ subversion/trunk/subversion/libsvn_client/externals.c Thu Jun 16 16:09:53 2011
@@ -184,7 +184,7 @@ switch_dir_external(const char *local_ab
             {
               /* URLs don't match.  Try to relocate (if necessary) and then
                  switch. */
-              if (! svn_uri_is_ancestor(repos_root_url, url))
+              if (! svn_uri__is_ancestor(repos_root_url, url))
                 {
                   const char *repos_root;
                   svn_ra_session_t *ra_session;

Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1136512&r1=1136511&r2=1136512&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Thu Jun 16 16:09:53 2011
@@ -300,7 +300,7 @@ check_repos_match(merge_cmd_baton_t *mer
                   const char *url,
                   apr_pool_t *scratch_pool)
 {
-  if (!svn_uri_is_ancestor(merge_b->repos_root_url, url))
+  if (!svn_uri__is_ancestor(merge_b->repos_root_url, url))
     return svn_error_createf(
         SVN_ERR_UNSUPPORTED_FEATURE, NULL,
          _("Url '%s' of '%s' is not in repository '%s'"),

Modified: subversion/trunk/subversion/libsvn_client/relocate.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/relocate.c?rev=1136512&r1=1136511&r2=1136512&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/relocate.c (original)
+++ subversion/trunk/subversion/libsvn_client/relocate.c Thu Jun 16 16:09:53 2011
@@ -77,7 +77,7 @@ validator_func(void *baton,
     {
       struct url_uuid_t *uu = &APR_ARRAY_IDX(uuids, i,
                                              struct url_uuid_t);
-      if (svn_uri_is_ancestor(uu->root, url))
+      if (svn_uri__is_ancestor(uu->root, url))
         {
           url_uuid = uu;
           break;

Modified: subversion/trunk/subversion/libsvn_client/status.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/status.c?rev=1136512&r1=1136511&r2=1136512&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/status.c (original)
+++ subversion/trunk/subversion/libsvn_client/status.c Thu Jun 16 16:09:53 2011
@@ -157,7 +157,7 @@ reporter_link_path(void *report_baton, c
 {
   report_baton_t *rb = report_baton;
 
-  if (!svn_uri_is_ancestor(rb->ancestor, url))
+  if (!svn_uri__is_ancestor(rb->ancestor, url))
     {
       const char *ancestor;
 

Modified: subversion/trunk/subversion/libsvn_client/switch.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/switch.c?rev=1136512&r1=1136511&r2=1136512&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/switch.c (original)
+++ subversion/trunk/subversion/libsvn_client/switch.c Thu Jun 16 16:09:53 2011
@@ -186,7 +186,7 @@ switch_internal(svn_revnum_t *result_rev
 
   /* Disallow a switch operation to change the repository root of the
      target. */
-  if (! svn_uri_is_ancestor(source_root, url))
+  if (! svn_uri__is_ancestor(source_root, url))
     return svn_error_createf(SVN_ERR_WC_INVALID_SWITCH, NULL,
                              _("'%s'\nis not the same repository as\n'%s'"),
                              url, source_root);

Modified: subversion/trunk/subversion/libsvn_client/update.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/update.c?rev=1136512&r1=1136511&r2=1136512&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/update.c (original)
+++ subversion/trunk/subversion/libsvn_client/update.c Thu Jun 16 16:09:53 2011
@@ -60,7 +60,7 @@ svn_client__dirent_fetcher(void *baton,
   url = svn_path_url_add_component2(repos_root_url, repos_relpath,
                                     scratch_pool);
 
-  if (!svn_uri_is_ancestor(dfb->anchor_url, url))
+  if (!svn_uri__is_ancestor(dfb->anchor_url, url))
     {
       SVN_ERR(svn_client__ensure_ra_session_url(&old_url, dfb->ra_session,
                                                 url, scratch_pool));

Modified: subversion/trunk/subversion/libsvn_client/util.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/util.c?rev=1136512&r1=1136511&r2=1136512&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/util.c (original)
+++ subversion/trunk/subversion/libsvn_client/util.c Thu Jun 16 16:09:53 2011
@@ -140,7 +140,7 @@ svn_client__path_relative_to_root(const 
      /* Merge handling passes a root that is not the repos root */
   else if (repos_root != NULL)
     {
-      if (!svn_uri_is_ancestor(repos_root, abspath_or_url))
+      if (!svn_uri__is_ancestor(repos_root, abspath_or_url))
         return svn_error_createf(SVN_ERR_CLIENT_UNRELATED_RESOURCES, NULL,
                                  _("URL '%s' is not a child of repository "
                                    "root URL '%s'"),

Modified: subversion/trunk/subversion/libsvn_ra/ra_loader.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra/ra_loader.c?rev=1136512&r1=1136511&r2=1136512&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra/ra_loader.c (original)
+++ subversion/trunk/subversion/libsvn_ra/ra_loader.c Thu Jun 16 16:09:53 2011
@@ -549,7 +549,7 @@ svn_error_t *svn_ra_reparent(svn_ra_sess
   /* Make sure the new URL is in the same repository, so that the
      implementations don't have to do it. */
   SVN_ERR(svn_ra_get_repos_root2(session, &repos_root, pool));
-  if (! svn_uri_is_ancestor(repos_root, url))
+  if (! svn_uri__is_ancestor(repos_root, url))
     return svn_error_createf(SVN_ERR_RA_ILLEGAL_URL, NULL,
                              _("'%s' isn't in the same repository as '%s'"),
                              url, repos_root);

Modified: subversion/trunk/subversion/libsvn_ra_local/ra_plugin.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_local/ra_plugin.c?rev=1136512&r1=1136511&r2=1136512&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_local/ra_plugin.c (original)
+++ subversion/trunk/subversion/libsvn_ra_local/ra_plugin.c Thu Jun 16 16:09:53 2011
@@ -192,7 +192,7 @@ reporter_link_path(void *reporter_baton,
   const char *fs_path = NULL;
   const char *repos_url = rbaton->sess->repos_url;
 
-  if (!svn_uri_is_ancestor(repos_url, url))
+  if (!svn_uri__is_ancestor(repos_url, url))
     return svn_error_createf(SVN_ERR_RA_ILLEGAL_URL, NULL,
                              _("'%s'\n"
                                "is not the same repository as\n"

Modified: subversion/trunk/subversion/libsvn_ra_serf/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/merge.c?rev=1136512&r1=1136511&r2=1136512&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/merge.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/merge.c Thu Jun 16 16:09:53 2011
@@ -448,7 +448,7 @@ svn_ra_serf__merge_lock_token_list(apr_h
       path.data = key;
       path.len = klen;
 
-      if (parent && !svn_relpath_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/trunk/subversion/libsvn_ra_serf/serf.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/serf.c?rev=1136512&r1=1136511&r2=1136512&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/serf.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/serf.c Thu Jun 16 16:09:53 2011
@@ -456,7 +456,7 @@ svn_ra_serf__reparent(svn_ra_session_t *
       SVN_ERR(svn_ra_serf__discover_vcc(&vcc_url, session, NULL, pool));
     }
 
-  if (!svn_uri_is_ancestor(session->repos_root_str, url))
+  if (!svn_uri__is_ancestor(session->repos_root_str, url))
     {
       return svn_error_createf(
           SVN_ERR_RA_ILLEGAL_URL, NULL,

Modified: subversion/trunk/subversion/libsvn_subr/dirent_uri.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/dirent_uri.c?rev=1136512&r1=1136511&r2=1136512&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/dirent_uri.c (original)
+++ subversion/trunk/subversion/libsvn_subr/dirent_uri.c Thu Jun 16 16:09:53 2011
@@ -1451,7 +1451,7 @@ svn_relpath__is_ancestor(const char *par
 }
 
 svn_boolean_t
-svn_uri_is_ancestor(const char *parent_uri, const char *child_uri)
+svn_uri__is_ancestor(const char *parent_uri, const char *child_uri)
 {
   assert(svn_uri_is_canonical(parent_uri, NULL));
   assert(svn_uri_is_canonical(child_uri, NULL));
@@ -2458,7 +2458,7 @@ svn_fspath__is_ancestor(const char *pare
   assert(svn_fspath__is_canonical(parent_fspath));
   assert(svn_fspath__is_canonical(child_fspath));
 
-  return svn_relpath_is_ancestor(parent_fspath + 1, child_fspath + 1);
+  return svn_relpath__is_ancestor(parent_fspath + 1, child_fspath + 1);
 }
 
 

Modified: subversion/trunk/subversion/libsvn_wc/adm_files.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_files.c?rev=1136512&r1=1136511&r2=1136512&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_files.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_files.c Thu Jun 16 16:09:53 2011
@@ -437,7 +437,7 @@ svn_wc__internal_ensure_adm(svn_wc__db_t
   SVN_ERR_ASSERT(url != NULL);
   SVN_ERR_ASSERT(repos_root_url != NULL);
   SVN_ERR_ASSERT(repos_uuid != NULL);
-  SVN_ERR_ASSERT(svn_uri_is_ancestor(repos_root_url, url));
+  SVN_ERR_ASSERT(svn_uri__is_ancestor(repos_root_url, url));
 
   SVN_ERR(svn_wc__internal_check_wc(&format, db, local_abspath, TRUE,
                                     scratch_pool));
@@ -503,7 +503,7 @@ svn_wc__internal_ensure_adm(svn_wc__db_t
       /* ### comparing URLs, should they be canonicalized first? */
       if (strcmp(db_repos_uuid, repos_uuid)
           || strcmp(db_repos_root_url, repos_root_url)
-          || !svn_relpath_is_ancestor(db_repos_relpath, repos_relpath))
+          || !svn_relpath__is_ancestor(db_repos_relpath, repos_relpath))
         {
           const char *copyfrom_root_url, *copyfrom_repos_relpath;
 

Modified: subversion/trunk/subversion/libsvn_wc/adm_ops.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_ops.c?rev=1136512&r1=1136511&r2=1136512&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Thu Jun 16 16:09:53 2011
@@ -1054,7 +1054,7 @@ svn_wc_add4(svn_wc_context_t *wc_ctx,
 
   /* If we're performing a repos-to-WC copy, check that the copyfrom
      repository is the same as the parent dir's repository. */
-  if (copyfrom_url && !svn_uri_is_ancestor(repos_root_url, copyfrom_url))
+  if (copyfrom_url && !svn_uri__is_ancestor(repos_root_url, copyfrom_url))
     return svn_error_createf(SVN_ERR_UNSUPPORTED_FEATURE, NULL,
                              _("The URL '%s' has a different repository "
                                "root than its parent"), copyfrom_url);

Modified: subversion/trunk/subversion/libsvn_wc/old-and-busted.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/old-and-busted.c?rev=1136512&r1=1136511&r2=1136512&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/old-and-busted.c (original)
+++ subversion/trunk/subversion/libsvn_wc/old-and-busted.c Thu Jun 16 16:09:53 2011
@@ -504,7 +504,7 @@ read_entry(svn_wc_entry_t **new_entry,
   /* Set up repository root.  Make sure it is a prefix of url. */
   SVN_ERR(read_url(&entry->repos, buf, end, entries_format, pool));
   if (entry->repos && entry->url
-      && ! svn_uri_is_ancestor(entry->repos, entry->url))
+      && ! svn_uri__is_ancestor(entry->repos, entry->url))
     return svn_error_createf(SVN_ERR_WC_CORRUPT, NULL,
                              _("Entry for '%s' has invalid repository "
                                "root"),
@@ -817,7 +817,7 @@ atts_to_entry(svn_wc_entry_t **new_entry
   entry->repos = extract_string(atts, ENTRIES_ATTR_REPOS, pool);
 
   if (entry->url && entry->repos
-      && !svn_uri_is_ancestor(entry->repos, entry->url))
+      && !svn_uri__is_ancestor(entry->repos, entry->url))
     return svn_error_createf(SVN_ERR_WC_CORRUPT, NULL,
                              _("Entry for '%s' has invalid repository "
                                "root"),

Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=1136512&r1=1136511&r2=1136512&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Thu Jun 16 16:09:53 2011
@@ -4474,7 +4474,7 @@ make_editor(svn_revnum_t *target_revisio
 
   /* Disallow a switch operation to change the repository root of the target,
      if that is known. */
-  if (switch_url && !svn_uri_is_ancestor(repos_root, switch_url))
+  if (switch_url && !svn_uri__is_ancestor(repos_root, switch_url))
     return svn_error_createf(SVN_ERR_WC_INVALID_SWITCH, NULL,
                              _("'%s'\nis not the same repository as\n'%s'"),
                              switch_url, repos_root);
@@ -5206,7 +5206,7 @@ svn_wc_add_repos_file4(svn_wc_context_t 
                                               dir_abspath,
                                               pool, pool));
 
-      if (!svn_uri_is_ancestor(original_root_url, copyfrom_url))
+      if (!svn_uri__is_ancestor(original_root_url, copyfrom_url))
         return svn_error_createf(SVN_ERR_UNSUPPORTED_FEATURE, NULL,
                                  _("Copyfrom-url '%s' has different repository"
                                    " root than '%s'"),

Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1136512&r1=1136511&r2=1136512&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Thu Jun 16 16:09:53 2011
@@ -10698,7 +10698,7 @@ svn_wc__db_wclock_obtain(svn_wc__db_t *d
           svn_wc__db_wclock_t* lock = &APR_ARRAY_IDX(wcroot->owned_locks,
                                                      i, svn_wc__db_wclock_t);
 
-          if (svn_relpath_is_ancestor(lock->local_relpath, local_relpath)
+          if (svn_relpath__is_ancestor(lock->local_relpath, local_relpath)
               && (lock->levels == -1
                   || (lock->levels + relpath_depth(lock->local_relpath))
                             >= depth))
@@ -10763,7 +10763,7 @@ is_wclocked(void *baton,
     {
       const char *relpath = svn_sqlite__column_text(stmt, 0, NULL);
 
-      if (svn_relpath_is_ancestor(relpath, dir_relpath))
+      if (svn_relpath__is_ancestor(relpath, dir_relpath))
         {
           /* Any row here means there can be no locks closer to root
              that extend past here. */
@@ -10898,7 +10898,7 @@ wclock_owns_lock(svn_boolean_t *own_lock
           svn_wc__db_wclock_t *lock = &APR_ARRAY_IDX(owned_locks, i,
                                                      svn_wc__db_wclock_t);
 
-          if (svn_relpath_is_ancestor(lock->local_relpath, local_relpath)
+          if (svn_relpath__is_ancestor(lock->local_relpath, local_relpath)
               && (lock->levels == -1
                   || ((relpath_depth(lock->local_relpath) + lock->levels)
                       >= lock_level)))

Modified: subversion/trunk/subversion/tests/libsvn_subr/dirent_uri-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_subr/dirent_uri-test.c?rev=1136512&r1=1136511&r2=1136512&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_subr/dirent_uri-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_subr/dirent_uri-test.c Thu Jun 16 16:09:53 2011
@@ -1419,7 +1419,7 @@ test_relpath_is_ancestor(apr_pool_t *poo
     {
       svn_boolean_t retval;
 
-      retval = svn_relpath_is_ancestor(tests[i].path1, tests[i].path2);
+      retval = svn_relpath__is_ancestor(tests[i].path1, tests[i].path2);
       if (tests[i].result != retval)
         return svn_error_createf
           (SVN_ERR_TEST_FAILED, NULL,
@@ -1453,7 +1453,7 @@ test_uri_is_ancestor(apr_pool_t *pool)
     {
       svn_boolean_t retval;
 
-      retval = svn_uri_is_ancestor(tests[i].path1, tests[i].path2);
+      retval = svn_uri__is_ancestor(tests[i].path1, tests[i].path2);
       if (tests[i].result != retval)
         return svn_error_createf
           (SVN_ERR_TEST_FAILED, NULL,



Mime
View raw message