You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2011/09/13 13:19:45 UTC
svn commit: r1170120 - in /subversion/trunk:
subversion/libsvn_client/commit_util.c subversion/libsvn_client/copy.c
subversion/libsvn_ra/ra_loader.c subversion/libsvn_ra_neon/session.c
subversion/libsvn_ra_svn/client.c tools/client-side/svnmucc/svnmucc.c
Author: julianfoad
Date: Tue Sep 13 11:19:44 2011
New Revision: 1170120
URL: http://svn.apache.org/viewvc?rev=1170120&view=rev
Log:
Use svn_uri_skip_ancestor() wherever svn_uri__is_child() was being used with
an extra string comparison to achieve the same effect.
* subversion/libsvn_client/commit_util.c
(svn_client__condense_commit_items): Same.
* subversion/libsvn_client/copy.c
(repos_to_repos_copy): Same.
* subversion/libsvn_ra_neon/session.c
(svn_ra_neon__get_path_relative_to_root): Same.
* subversion/libsvn_ra/ra_loader.c
(svn_ra_get_path_relative_to_root): Same.
* subversion/libsvn_ra_svn/client.c
(path_relative_to_root): Same.
* tools/client-side/svnmucc/svnmucc.c
(subtract_anchor): Same.
Modified:
subversion/trunk/subversion/libsvn_client/commit_util.c
subversion/trunk/subversion/libsvn_client/copy.c
subversion/trunk/subversion/libsvn_ra/ra_loader.c
subversion/trunk/subversion/libsvn_ra_neon/session.c
subversion/trunk/subversion/libsvn_ra_svn/client.c
subversion/trunk/tools/client-side/svnmucc/svnmucc.c
Modified: subversion/trunk/subversion/libsvn_client/commit_util.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/commit_util.c?rev=1170120&r1=1170119&r2=1170120&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/commit_util.c (original)
+++ subversion/trunk/subversion/libsvn_client/commit_util.c Tue Sep 13 11:19:44 2011
@@ -1341,14 +1341,9 @@ svn_client__condense_commit_items(const
{
svn_client_commit_item3_t *this_item
= APR_ARRAY_IDX(ci, i, svn_client_commit_item3_t *);
- size_t url_len = strlen(this_item->url);
- 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);
- else
- this_item->session_relpath = "";
+ this_item->session_relpath = svn_uri_skip_ancestor(*base_url,
+ this_item->url, pool);
}
#ifdef SVN_CLIENT_COMMIT_DEBUG
/* ### TEMPORARY CODE ### */
Modified: subversion/trunk/subversion/libsvn_client/copy.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/copy.c?rev=1170120&r1=1170119&r2=1170120&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/copy.c (original)
+++ subversion/trunk/subversion/libsvn_client/copy.c Tue Sep 13 11:19:44 2011
@@ -1000,18 +1000,12 @@ 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_skip_ancestor(top_url, pair->src_abspath_or_url, pool);
if (src_rel)
{
SVN_ERR(svn_ra_check_path(ra_session, src_rel, pair->src_revnum,
&info->src_kind, pool));
}
- else if (strcmp(pair->src_abspath_or_url, top_url) == 0)
- {
- src_rel = "";
- SVN_ERR(svn_ra_check_path(ra_session, src_rel, pair->src_revnum,
- &info->src_kind, pool));
- }
else
{
const char *old_url = NULL;
Modified: subversion/trunk/subversion/libsvn_ra/ra_loader.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra/ra_loader.c?rev=1170120&r1=1170119&r2=1170120&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra/ra_loader.c (original)
+++ subversion/trunk/subversion/libsvn_ra/ra_loader.c Tue Sep 13 11:19:44 2011
@@ -574,19 +574,13 @@ svn_error_t *svn_ra_get_path_relative_to
apr_pool_t *pool)
{
const char *sess_url;
+
SVN_ERR(session->vtable->get_session_url(session, &sess_url, pool));
- if (strcmp(sess_url, url) == 0)
- {
- *rel_path = "";
- }
- else
- {
- *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'"),
- url, sess_url);
- }
+ *rel_path = svn_uri_skip_ancestor(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'"),
+ url, sess_url);
return SVN_NO_ERROR;
}
@@ -596,21 +590,14 @@ svn_error_t *svn_ra_get_path_relative_to
apr_pool_t *pool)
{
const char *root_url;
- SVN_ERR(session->vtable->get_repos_root(session, &root_url, pool));
- if (strcmp(root_url, url) == 0)
- {
- *rel_path = "";
- }
- else
- {
- *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 "
- "URL '%s'"),
- url, root_url);
- }
+ SVN_ERR(session->vtable->get_repos_root(session, &root_url, pool));
+ *rel_path = svn_uri_skip_ancestor(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 "
+ "URL '%s'"),
+ url, root_url);
return SVN_NO_ERROR;
}
Modified: subversion/trunk/subversion/libsvn_ra_neon/session.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_neon/session.c?rev=1170120&r1=1170119&r2=1170120&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_neon/session.c (original)
+++ subversion/trunk/subversion/libsvn_ra_neon/session.c Tue Sep 13 11:19:44 2011
@@ -1145,19 +1145,13 @@ svn_ra_neon__get_path_relative_to_root(s
const char *root_url;
SVN_ERR(svn_ra_neon__get_repos_root(session, &root_url, pool));
- if (strcmp(root_url, url) == 0)
- {
- *rel_path = "";
- }
- else
- {
- *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 "
- "URL '%s'"),
- url, root_url);
- }
+ *rel_path = svn_uri_skip_ancestor(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 "
+ "URL '%s'"),
+ url, root_url);
+
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=1170120&r1=1170119&r2=1170120&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_svn/client.c (original)
+++ subversion/trunk/subversion/libsvn_ra_svn/client.c Tue Sep 13 11:19:44 2011
@@ -2279,19 +2279,12 @@ static svn_error_t *path_relative_to_roo
const char *root_url;
SVN_ERR(ra_svn_get_repos_root(session, &root_url, pool));
- if (strcmp(root_url, url) == 0)
- {
- *rel_path = "";
- }
- else
- {
- *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 "
- "URL '%s'"),
- url, root_url);
- }
+ *rel_path = svn_uri_skip_ancestor(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 "
+ "URL '%s'"),
+ url, root_url);
return SVN_NO_ERROR;
}
Modified: subversion/trunk/tools/client-side/svnmucc/svnmucc.c
URL: http://svn.apache.org/viewvc/subversion/trunk/tools/client-side/svnmucc/svnmucc.c?rev=1170120&r1=1170119&r2=1170120&view=diff
==============================================================================
--- subversion/trunk/tools/client-side/svnmucc/svnmucc.c (original)
+++ subversion/trunk/tools/client-side/svnmucc/svnmucc.c Tue Sep 13 11:19:44 2011
@@ -366,10 +366,7 @@ get_operation(const char *path,
static const char *
subtract_anchor(const char *anchor, const char *url, apr_pool_t *pool)
{
- if (! strcmp(url, anchor))
- return "";
- else
- return svn_uri__is_child(anchor, url, pool);
+ return svn_uri_skip_ancestor(anchor, url, pool);
}
/* Add PATH to the operations tree rooted at OPERATION, creating any