Author: julianfoad
Date: Thu Jun 16 16:00:07 2011
New Revision: 1136505
URL: http://svn.apache.org/viewvc?rev=1136505&view=rev
Log:
Make these new APIs private: svn_uri_is_child(), svn_relpath_is_child().
* subversion/include/svn_dirent_uri.h,
subversion/libsvn_subr/dirent_uri.c
(svn_uri_is_child): Rename to svn_uri__is_child().
(svn_relpath_is_child): Rename to svn_relpath__is_child().
* Everywhere else: Adjust calls.
Modified:
subversion/trunk/subversion/include/svn_dirent_uri.h
subversion/trunk/subversion/libsvn_client/cleanup.c
subversion/trunk/subversion/libsvn_client/commit_util.c
subversion/trunk/subversion/libsvn_client/copy.c
subversion/trunk/subversion/libsvn_client/delete.c
subversion/trunk/subversion/libsvn_client/info.c
subversion/trunk/subversion/libsvn_client/merge.c
subversion/trunk/subversion/libsvn_fs_fs/tree.c
subversion/trunk/subversion/libsvn_ra/ra_loader.c
subversion/trunk/subversion/libsvn_ra_local/ra_plugin.c
subversion/trunk/subversion/libsvn_ra_neon/commit.c
subversion/trunk/subversion/libsvn_ra_neon/props.c
subversion/trunk/subversion/libsvn_ra_neon/session.c
subversion/trunk/subversion/libsvn_ra_serf/commit.c
subversion/trunk/subversion/libsvn_ra_svn/client.c
subversion/trunk/subversion/libsvn_repos/replay.c
subversion/trunk/subversion/libsvn_subr/dirent_uri.c
subversion/trunk/subversion/libsvn_subr/target.c
subversion/trunk/subversion/libsvn_wc/adm_crawler.c
subversion/trunk/subversion/libsvn_wc/adm_files.c
subversion/trunk/subversion/libsvn_wc/entries.c
subversion/trunk/subversion/libsvn_wc/externals.c
subversion/trunk/subversion/libsvn_wc/status.c
subversion/trunk/subversion/libsvn_wc/upgrade.c
subversion/trunk/subversion/libsvn_wc/wc_db.c
subversion/trunk/subversion/svnsync/main.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=1136505&r1=1136504&r2=1136505&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_dirent_uri.h (original)
+++ subversion/trunk/subversion/include/svn_dirent_uri.h Thu Jun 16 16:00:07
2011
@@ -568,9 +568,9 @@ svn_dirent_get_absolute(const char **pab
* @since New in 1.7.
*/
const char *
-svn_uri_is_child(const char *parent_uri,
- const char *child_uri,
- apr_pool_t *pool);
+svn_uri__is_child(const char *parent_uri,
+ const char *child_uri,
+ apr_pool_t *pool);
/**
* This function is similar to svn_uri_is_child(), except that it supports
@@ -593,9 +593,9 @@ svn_dirent_is_child(const char *parent_d
* @since New in 1.7.
*/
const char *
-svn_relpath_is_child(const char *parent_relpath,
- const char *child_relpath,
- apr_pool_t *pool);
+svn_relpath__is_child(const char *parent_relpath,
+ const char *child_relpath,
+ apr_pool_t *pool);
/** Return TRUE if @a parent_dirent is an ancestor of @a child_dirent or
* the dirents are equal, and FALSE otherwise.
Modified: subversion/trunk/subversion/libsvn_client/cleanup.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/cleanup.c?rev=1136505&r1=1136504&r2=1136505&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/cleanup.c (original)
+++ subversion/trunk/subversion/libsvn_client/cleanup.c Thu Jun 16 16:00:07 2011
@@ -88,7 +88,7 @@ fetch_repos_info(const char **repos_root
svn_ra_session_t *ra_session;
/* The same info is likely to retrieved multiple times (e.g. externals) */
- if (ri->last_repos && svn_uri_is_child(ri->last_repos, url, NULL))
+ if (ri->last_repos && svn_uri__is_child(ri->last_repos, url, NULL))
{
*repos_root = apr_pstrdup(result_pool, ri->last_repos);
*repos_uuid = apr_pstrdup(result_pool, ri->last_uuid);
Modified: subversion/trunk/subversion/libsvn_client/commit_util.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/commit_util.c?rev=1136505&r1=1136504&r2=1136505&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/commit_util.c (original)
+++ subversion/trunk/subversion/libsvn_client/commit_util.c Thu Jun 16 16:00:07
2011
@@ -1264,8 +1264,8 @@ svn_client__condense_commit_items(const
size_t base_url_len = strlen(*base_url);
if (url_len > base_url_len)
- this_item->session_relpath = svn_uri_is_child(*base_url,
- this_item->url, pool);
+ this_item->session_relpath = svn_uri__is_child(*base_url,
+ this_item->url, pool);
else
this_item->session_relpath = "";
}
Modified: subversion/trunk/subversion/libsvn_client/copy.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/copy.c?rev=1136505&r1=1136504&r2=1136505&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/copy.c (original)
+++ subversion/trunk/subversion/libsvn_client/copy.c Thu Jun 16 16:00:07 2011
@@ -936,7 +936,7 @@ repos_to_repos_copy(const apr_array_head
case, do not try to add dst to the NEW_DIRS list since it
will be added to the commit items array later in this
function. */
- dir = svn_uri_is_child(
+ dir = svn_uri__is_child(
top_url,
svn_uri_dirname(first_pair->dst_abspath_or_url, pool),
pool);
@@ -959,7 +959,7 @@ repos_to_repos_copy(const apr_array_head
for (i = 0; i < new_urls->nelts; i++)
{
const char *new_url = APR_ARRAY_IDX(new_urls, i, const char *);
- dir = svn_uri_is_child(top_url, new_url, pool);
+ dir = svn_uri__is_child(top_url, new_url, pool);
APR_ARRAY_PUSH(new_dirs, const char *) = dir ? dir : "";
}
}
@@ -978,8 +978,8 @@ repos_to_repos_copy(const apr_array_head
path_driver_info_t *);
if ((strcmp(pair->dst_abspath_or_url, repos_root) != 0)
- && (svn_uri_is_child(pair->dst_abspath_or_url,
- pair->src_abspath_or_url, pool) != NULL))
+ && (svn_uri__is_child(pair->dst_abspath_or_url,
+ pair->src_abspath_or_url, pool) != NULL))
{
info->resurrection = TRUE;
top_url = svn_uri_dirname(top_url, pool);
@@ -1003,7 +1003,7 @@ repos_to_repos_copy(const apr_array_head
svn_node_kind_t dst_kind;
const char *src_rel, *dst_rel;
- src_rel = svn_uri_is_child(top_url, pair->src_abspath_or_url, pool);
+ src_rel = svn_uri__is_child(top_url, pair->src_abspath_or_url, pool);
if (src_rel)
{
SVN_ERR(svn_ra_check_path(ra_session, src_rel, pair->src_revnum,
@@ -1036,7 +1036,7 @@ repos_to_repos_copy(const apr_array_head
/* Figure out the basename that will result from this operation,
and ensure that we aren't trying to overwrite existing paths. */
- dst_rel = svn_uri_is_child(top_url, pair->dst_abspath_or_url, pool);
+ dst_rel = svn_uri__is_child(top_url, pair->dst_abspath_or_url, pool);
if (! dst_rel)
dst_rel = "";
SVN_ERR(svn_ra_check_path(ra_session, dst_rel, youngest,
@@ -1292,9 +1292,9 @@ wc_to_repos_copy(const apr_array_header_
APR_ARRAY_IDX(copy_pairs, i, svn_client__copy_pair_t *);
svn_pool_clear(iterpool);
- dst_rel = svn_uri_is_child(top_dst_url,
- pair->dst_abspath_or_url,
- iterpool);
+ dst_rel = svn_uri__is_child(top_dst_url,
+ pair->dst_abspath_or_url,
+ iterpool);
SVN_ERR(svn_ra_check_path(ra_session, dst_rel, SVN_INVALID_REVNUM,
&dst_kind, iterpool));
if (dst_kind != svn_node_none)
Modified: subversion/trunk/subversion/libsvn_client/delete.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/delete.c?rev=1136505&r1=1136504&r2=1136505&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/delete.c (original)
+++ subversion/trunk/subversion/libsvn_client/delete.c Thu Jun 16 16:00:07 2011
@@ -237,7 +237,7 @@ delete_urls_multi_repos(const apr_array_
for (hi = apr_hash_first(pool, sessions); hi; hi = apr_hash_next(hi))
{
repos_root = svn__apr_hash_index_key(hi);
- repos_relpath = svn_uri_is_child(repos_root, uri, pool);
+ repos_relpath = svn_uri__is_child(repos_root, uri, pool);
if (repos_relpath)
{
@@ -264,7 +264,7 @@ delete_urls_multi_repos(const apr_array_
SVN_ERR(svn_ra_reparent(ra_session, repos_root, pool));
apr_hash_set(sessions, repos_root, APR_HASH_KEY_STRING, ra_session);
- repos_relpath = svn_uri_is_child(repos_root, uri, pool);
+ repos_relpath = svn_uri__is_child(repos_root, uri, pool);
relpaths_list = apr_array_make(pool, 1, sizeof(const char *));
apr_hash_set(relpaths, repos_root, APR_HASH_KEY_STRING,
Modified: subversion/trunk/subversion/libsvn_client/info.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/info.c?rev=1136505&r1=1136504&r2=1136505&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/info.c (original)
+++ subversion/trunk/subversion/libsvn_client/info.c Thu Jun 16 16:00:07 2011
@@ -145,8 +145,8 @@ push_dir_info(svn_ra_session_t *ra_sessi
path = svn_relpath_join(dir, name, subpool);
URL = svn_path_url_add_component2(session_URL, name, subpool);
- fs_path = svn_fspath__canonicalize(svn_uri_is_child(repos_root, URL,
- subpool), subpool);
+ fs_path = svn_fspath__canonicalize(svn_uri__is_child(repos_root, URL,
+ subpool), subpool);
lock = apr_hash_get(locks, fs_path, APR_HASH_KEY_STRING);
Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1136505&r1=1136504&r2=1136505&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Thu Jun 16 16:00:07 2011
@@ -476,12 +476,12 @@ make_conflict_versions(const svn_wc_conf
*left = svn_wc_conflict_version_create(
src_repos_url,
- svn_uri_is_child(src_repos_url, left_url, merge_b->pool),
+ svn_uri__is_child(src_repos_url, left_url, merge_b->pool),
merge_b->merge_source.rev1, node_kind, merge_b->pool);
*right = svn_wc_conflict_version_create(
src_repos_url,
- svn_uri_is_child(src_repos_url, right_url, merge_b->pool),
+ svn_uri__is_child(src_repos_url, right_url, merge_b->pool),
merge_b->merge_source.rev2, node_kind, merge_b->pool);
return SVN_NO_ERROR;
Modified: subversion/trunk/subversion/libsvn_fs_fs/tree.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/tree.c?rev=1136505&r1=1136504&r2=1136505&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/tree.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/tree.c Thu Jun 16 16:00:07 2011
@@ -2955,7 +2955,7 @@ prev_location(const char **prev_path,
SVN_ERR(fs_copied_from(©_src_rev, ©_src_path,
copy_root, copy_path, pool));
if (strcmp(copy_path, path) != 0)
- remainder = svn_relpath_is_child(copy_path, path, pool);
+ remainder = svn_relpath__is_child(copy_path, path, pool);
*prev_path = svn_fspath__join(copy_src_path, remainder, pool);
*prev_rev = copy_src_rev;
return SVN_NO_ERROR;
@@ -3205,7 +3205,7 @@ history_prev(void *baton, apr_pool_t *po
if (strcmp(path, copy_dst) == 0)
remainder = "";
else
- remainder = svn_relpath_is_child(copy_dst, path, pool);
+ remainder = svn_relpath__is_child(copy_dst, path, pool);
if (remainder)
{
Modified: subversion/trunk/subversion/libsvn_ra/ra_loader.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra/ra_loader.c?rev=1136505&r1=1136504&r2=1136505&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra/ra_loader.c (original)
+++ subversion/trunk/subversion/libsvn_ra/ra_loader.c Thu Jun 16 16:00:07 2011
@@ -577,7 +577,7 @@ svn_error_t *svn_ra_get_path_relative_to
}
else
{
- *rel_path = svn_uri_is_child(sess_url, url, pool);
+ *rel_path = svn_uri__is_child(sess_url, url, pool);
if (! *rel_path)
return svn_error_createf(SVN_ERR_RA_ILLEGAL_URL, NULL,
_("'%s' isn't a child of session URL '%s'"),
@@ -599,7 +599,7 @@ svn_error_t *svn_ra_get_path_relative_to
}
else
{
- *rel_path = svn_uri_is_child(root_url, url, pool);
+ *rel_path = svn_uri__is_child(root_url, url, pool);
if (! *rel_path)
return svn_error_createf(SVN_ERR_RA_ILLEGAL_URL, NULL,
_("'%s' isn't a child of repository 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=1136505&r1=1136504&r2=1136505&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:00:07
2011
@@ -504,7 +504,7 @@ svn_ra_local__reparent(svn_ra_session_t
/* If the new URL isn't the same as our repository root URL, then
let's ensure that it's some child of it. */
if (strcmp(url, sess->repos_url) != 0)
- relpath = svn_uri_is_child(sess->repos_url, url, pool);
+ relpath = svn_uri__is_child(sess->repos_url, url, pool);
if (! relpath)
return svn_error_createf
(SVN_ERR_RA_ILLEGAL_URL, NULL,
Modified: subversion/trunk/subversion/libsvn_ra_neon/commit.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_neon/commit.c?rev=1136505&r1=1136504&r2=1136505&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_neon/commit.c (original)
+++ subversion/trunk/subversion/libsvn_ra_neon/commit.c Thu Jun 16 16:00:07 2011
@@ -641,7 +641,7 @@ static apr_hash_t *get_child_tokens(apr_
svn_pool_clear(subpool);
apr_hash_this(hi, &key, &klen, &val);
- if (svn_relpath_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/props.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_neon/props.c?rev=1136505&r1=1136504&r2=1136505&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_neon/props.c (original)
+++ subversion/trunk/subversion/libsvn_ra_neon/props.c Thu Jun 16 16:00:07 2011
@@ -1011,7 +1011,7 @@ svn_error_t *svn_ra_neon__get_baseline_i
}
if (bc_relative_p)
{
- const char *relpath = svn_uri_is_child(sess->repos_root, url, pool);
+ const char *relpath = svn_uri__is_child(sess->repos_root, url, pool);
if (! relpath)
relpath = "";
*bc_relative_p = relpath;
Modified: subversion/trunk/subversion/libsvn_ra_neon/session.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_neon/session.c?rev=1136505&r1=1136504&r2=1136505&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_neon/session.c (original)
+++ subversion/trunk/subversion/libsvn_ra_neon/session.c Thu Jun 16 16:00:07
2011
@@ -1150,7 +1150,7 @@ svn_ra_neon__get_path_relative_to_root(s
}
else
{
- *rel_path = svn_uri_is_child(root_url, url, pool);
+ *rel_path = svn_uri__is_child(root_url, url, pool);
if (! *rel_path)
return svn_error_createf(SVN_ERR_RA_ILLEGAL_URL, NULL,
_("'%s' isn't a child of repository root "
Modified: subversion/trunk/subversion/libsvn_ra_serf/commit.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/commit.c?rev=1136505&r1=1136504&r2=1136505&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/commit.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/commit.c Thu Jun 16 16:00:07 2011
@@ -561,9 +561,9 @@ checkout_file(file_context_t *file)
file->checkout->activity_url = file->commit->activity_url;
file->checkout->resource_url =
svn_path_url_add_component2(parent_dir->checkout->resource_url,
- svn_relpath_is_child(parent_dir->name,
- file->name,
- file->pool),
+ svn_relpath__is_child(parent_dir->name,
+ file->name,
+ file->pool),
file->pool);
return SVN_NO_ERROR;
}
Modified: subversion/trunk/subversion/libsvn_ra_svn/client.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_svn/client.c?rev=1136505&r1=1136504&r2=1136505&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_svn/client.c (original)
+++ subversion/trunk/subversion/libsvn_ra_svn/client.c Thu Jun 16 16:00:07 2011
@@ -2290,7 +2290,7 @@ static svn_error_t *path_relative_to_roo
}
else
{
- *rel_path = svn_uri_is_child(root_url, url, pool);
+ *rel_path = svn_uri__is_child(root_url, url, pool);
if (! *rel_path)
return svn_error_createf(SVN_ERR_RA_ILLEGAL_URL, NULL,
_("'%s' isn't a child of repository root "
Modified: subversion/trunk/subversion/libsvn_repos/replay.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/replay.c?rev=1136505&r1=1136504&r2=1136505&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_repos/replay.c (original)
+++ subversion/trunk/subversion/libsvn_repos/replay.c Thu Jun 16 16:00:07 2011
@@ -573,8 +573,8 @@ path_driver_cb_func(void **dir_baton,
struct copy_info);
if (info->copyfrom_path)
{
- const char *relpath = svn_relpath_is_child(info->path,
- edit_path, pool);
+ const char *relpath = svn_relpath__is_child(info->path,
+ edit_path, pool);
SVN_ERR(svn_fs_revision_root(&source_root,
svn_fs_root_fs(root),
info->copyfrom_rev, pool));
Modified: subversion/trunk/subversion/libsvn_subr/dirent_uri.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/dirent_uri.c?rev=1136505&r1=1136504&r2=1136505&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/dirent_uri.c (original)
+++ subversion/trunk/subversion/libsvn_subr/dirent_uri.c Thu Jun 16 16:00:07
2011
@@ -1409,9 +1409,9 @@ svn_dirent_is_child(const char *parent_d
}
const char *
-svn_relpath_is_child(const char *parent_relpath,
- const char *child_relpath,
- apr_pool_t *pool)
+svn_relpath__is_child(const char *parent_relpath,
+ const char *child_relpath,
+ apr_pool_t *pool)
{
/* assert(relpath_is_canonical(parent_relpath)); */
/* assert(relpath_is_canonical(child_relpath)); */
@@ -1420,9 +1420,9 @@ svn_relpath_is_child(const char *parent_
}
const char *
-svn_uri_is_child(const char *parent_uri,
- const char *child_uri,
- apr_pool_t *pool)
+svn_uri__is_child(const char *parent_uri,
+ const char *child_uri,
+ apr_pool_t *pool)
{
const char *relpath;
@@ -1442,7 +1442,7 @@ svn_dirent_is_ancestor(const char *paren
}
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)
{
assert(relpath_is_canonical(parent_relpath));
assert(relpath_is_canonical(child_relpath));
@@ -2435,7 +2435,7 @@ svn_fspath__is_child(const char *parent_
assert(svn_fspath__is_canonical(parent_fspath));
assert(svn_fspath__is_canonical(child_fspath));
- result = svn_relpath_is_child(parent_fspath + 1, child_fspath + 1, pool);
+ result = svn_relpath__is_child(parent_fspath + 1, child_fspath + 1, pool);
assert(result == NULL || svn_relpath_is_canonical(result));
return result;
Modified: subversion/trunk/subversion/libsvn_subr/target.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/target.c?rev=1136505&r1=1136504&r2=1136505&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/target.c (original)
+++ subversion/trunk/subversion/libsvn_subr/target.c Thu Jun 16 16:00:07 2011
@@ -312,7 +312,7 @@ svn_path_remove_redundancies(apr_array_h
/* Quit here if this path is a child of one of the keepers. */
if (is_url)
- child_relpath = svn_uri_is_child(keeper, abs_path, temp_pool);
+ child_relpath = svn_uri__is_child(keeper, abs_path, temp_pool);
else
child_relpath = svn_dirent_is_child(keeper, abs_path, temp_pool);
if (child_relpath)
Modified: subversion/trunk/subversion/libsvn_wc/adm_crawler.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_crawler.c?rev=1136505&r1=1136504&r2=1136505&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_crawler.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_crawler.c Thu Jun 16 16:00:07 2011
@@ -416,9 +416,9 @@ report_revisions_and_depths(svn_wc__db_t
}
else
{
- const char *childname = svn_relpath_is_child(dir_repos_relpath,
- ths->repos_relpath,
- NULL);
+ const char *childname = svn_relpath__is_child(dir_repos_relpath,
+ ths->repos_relpath,
+ NULL);
if (childname == NULL || strcmp(childname, child) != 0)
{
Modified: subversion/trunk/subversion/libsvn_wc/adm_files.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_files.c?rev=1136505&r1=1136504&r2=1136505&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_files.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_files.c Thu Jun 16 16:00:07 2011
@@ -442,7 +442,7 @@ svn_wc__internal_ensure_adm(svn_wc__db_t
SVN_ERR(svn_wc__internal_check_wc(&format, db, local_abspath, TRUE,
scratch_pool));
- repos_relpath = svn_uri_is_child(repos_root_url, url, scratch_pool);
+ repos_relpath = svn_uri__is_child(repos_root_url, url, scratch_pool);
if (repos_relpath == NULL)
repos_relpath = "";
Modified: subversion/trunk/subversion/libsvn_wc/entries.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/entries.c?rev=1136505&r1=1136504&r2=1136505&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/entries.c (original)
+++ subversion/trunk/subversion/libsvn_wc/entries.c Thu Jun 16 16:00:07 2011
@@ -1704,9 +1704,9 @@ write_entry(struct write_baton **entry_n
const char *relpath;
working_node->repos_id = repos_id;
- relpath = svn_uri_is_child(this_dir->repos,
- entry->copyfrom_url,
- result_pool);
+ relpath = svn_uri__is_child(this_dir->repos,
+ entry->copyfrom_url,
+ result_pool);
if (relpath == NULL)
working_node->repos_relpath = "";
else
@@ -1938,16 +1938,16 @@ write_entry(struct write_baton **entry_n
if (entry->url != NULL)
{
- const char *relpath = svn_uri_is_child(this_dir->repos,
- entry->url,
- result_pool);
+ const char *relpath = svn_uri__is_child(this_dir->repos,
+ entry->url,
+ result_pool);
base_node->repos_relpath = relpath ? relpath : "";
}
else
{
- const char *relpath = svn_uri_is_child(this_dir->repos,
- this_dir->url,
- scratch_pool);
+ const char *relpath = svn_uri__is_child(this_dir->repos,
+ this_dir->url,
+ scratch_pool);
if (relpath == NULL)
base_node->repos_relpath = entry->name;
else
Modified: subversion/trunk/subversion/libsvn_wc/externals.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/externals.c?rev=1136505&r1=1136504&r2=1136505&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/externals.c (original)
+++ subversion/trunk/subversion/libsvn_wc/externals.c Thu Jun 16 16:00:07 2011
@@ -609,8 +609,8 @@ close_file(void *file_baton,
const svn_checksum_t *original_checksum = NULL;
svn_boolean_t added = !SVN_IS_VALID_REVNUM(eb->original_revision);
- const char *repos_relpath = svn_uri_is_child(eb->repos_root_url,
- eb->url, pool);
+ const char *repos_relpath = svn_uri__is_child(eb->repos_root_url,
+ eb->url, pool);
if (! added)
{
@@ -901,8 +901,8 @@ svn_wc__get_file_external_editor(const s
eb->diff3cmd = diff3_cmd;
eb->record_ancestor_abspath = apr_pstrdup(edit_pool,record_ancestor_abspath);
- eb->recorded_repos_relpath = svn_uri_is_child(repos_root_url, recorded_url,
- edit_pool);
+ eb->recorded_repos_relpath = svn_uri__is_child(repos_root_url, recorded_url,
+ edit_pool);
eb->changed_rev = SVN_INVALID_REVNUM;
Modified: subversion/trunk/subversion/libsvn_wc/status.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/status.c?rev=1136505&r1=1136504&r2=1136505&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/status.c (original)
+++ subversion/trunk/subversion/libsvn_wc/status.c Thu Jun 16 16:00:07 2011
@@ -408,8 +408,8 @@ assemble_status(svn_wc_status3_t **statu
else
{
/* A node is switched if it doesn't have the implied repos_relpath */
- const char *name = svn_relpath_is_child(parent_repos_relpath,
- info->repos_relpath, NULL);
+ const char *name = svn_relpath__is_child(parent_repos_relpath,
+ info->repos_relpath, NULL);
switched_p = !name || (strcmp(name, svn_dirent_basename(local_abspath,
NULL)) != 0);
}
Modified: subversion/trunk/subversion/libsvn_wc/upgrade.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/upgrade.c?rev=1136505&r1=1136504&r2=1136505&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/upgrade.c (original)
+++ subversion/trunk/subversion/libsvn_wc/upgrade.c Thu Jun 16 16:00:07 2011
@@ -612,8 +612,8 @@ ensure_repos_info(svn_wc_entry_t *entry,
for (hi = apr_hash_first(scratch_pool, repos_cache);
hi; hi = apr_hash_next(hi))
{
- if (svn_uri_is_child(svn__apr_hash_index_key(hi), entry->url,
- scratch_pool))
+ if (svn_uri__is_child(svn__apr_hash_index_key(hi), entry->url,
+ scratch_pool))
{
if (!entry->repos)
entry->repos = svn__apr_hash_index_key(hi);
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1136505&r1=1136504&r2=1136505&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Thu Jun 16 16:00:07 2011
@@ -11500,8 +11500,8 @@ svn_wc__db_get_not_present_descendants(c
const char *found_relpath = svn_sqlite__column_text(stmt, 0, NULL);
APR_ARRAY_PUSH(paths, const char *)
- = svn_relpath_is_child(local_relpath, found_relpath,
- result_pool);
+ = svn_relpath__is_child(local_relpath, found_relpath,
+ result_pool);
SVN_ERR(svn_sqlite__step(&have_row, stmt));
}
Modified: subversion/trunk/subversion/svnsync/main.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svnsync/main.c?rev=1136505&r1=1136504&r2=1136505&view=diff
==============================================================================
--- subversion/trunk/subversion/svnsync/main.c (original)
+++ subversion/trunk/subversion/svnsync/main.c Thu Jun 16 16:00:07 2011
@@ -758,7 +758,7 @@ do_initialize(svn_ra_session_t *to_sessi
/* If we're doing a partial replay, we have to check first if the server
supports this. */
- if (svn_uri_is_child(root_url, baton->from_url, pool))
+ if (svn_uri__is_child(root_url, baton->from_url, pool))
{
svn_boolean_t server_supports_partial_replay;
svn_error_t *err = svn_ra_has_capability(from_session,
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=1136505&r1=1136504&r2=1136505&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:00:07 2011
@@ -2008,7 +2008,7 @@ test_uri_is_child(apr_pool_t *pool)
{
const char *remainder;
- remainder = svn_uri_is_child(paths[i], paths[j], pool);
+ remainder = svn_uri__is_child(paths[i], paths[j], pool);
if (((remainder) && (! remainders[i][j]))
|| ((! remainder) && (remainders[i][j]))
