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/10/25 15:57:43 UTC
svn commit: r1188661 - in /subversion/trunk/subversion:
include/private/svn_fspath.h include/svn_path.h libsvn_client/mergeinfo.c
libsvn_ra_neon/merge.c libsvn_ra_serf/merge.c libsvn_repos/log.c
libsvn_subr/dirent_uri.c libsvn_subr/mergeinfo.c
Author: julianfoad
Date: Tue Oct 25 13:57:43 2011
New Revision: 1188661
URL: http://svn.apache.org/viewvc?rev=1188661&view=rev
Log:
Eliminate svn_fspath__is_ancestor() and svn_urlpath__is_ancestor(); use
svn_fspath__skip_ancestor() and svn_urlpath__skip_ancestor() instead.
* subversion/include/private/svn_fspath.h
(svn_fspath__is_ancestor, svn_urlpath__is_ancestor): Remove.
* subversion/include/svn_path.h
(svn_path_is_ancestor): Update recommendations in the deprecation clause.
* subversion/libsvn_subr/dirent_uri.c
(svn_fspath__is_ancestor): Remove.
* subversion/libsvn_client/mergeinfo.c
(find_nearest_ancestor, filter_log_entry_with_rangelist): Use
svn_fspath__skip_ancestor() instead of __is_ancestor().
* subversion/libsvn_repos/log.c
(get_combined_mergeinfo_changes, send_log): Same.
* subversion/libsvn_subr/mergeinfo.c
(svn_mergeinfo__remove_prefix_from_catalog): Same.
* subversion/libsvn_ra_neon/merge.c
(handle_resource): Use svn_urlpath__skip_ancestor() instead of
__is_ancestor().
* subversion/libsvn_ra_serf/merge.c
(end_merge): Same.
Modified:
subversion/trunk/subversion/include/private/svn_fspath.h
subversion/trunk/subversion/include/svn_path.h
subversion/trunk/subversion/libsvn_client/mergeinfo.c
subversion/trunk/subversion/libsvn_ra_neon/merge.c
subversion/trunk/subversion/libsvn_ra_serf/merge.c
subversion/trunk/subversion/libsvn_repos/log.c
subversion/trunk/subversion/libsvn_subr/dirent_uri.c
subversion/trunk/subversion/libsvn_subr/mergeinfo.c
Modified: subversion/trunk/subversion/include/private/svn_fspath.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_fspath.h?rev=1188661&r1=1188660&r2=1188661&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_fspath.h (original)
+++ subversion/trunk/subversion/include/private/svn_fspath.h Tue Oct 25 13:57:43 2011
@@ -151,15 +151,6 @@ const char *
svn_fspath__skip_ancestor(const char *parent_fspath,
const char *child_fspath);
-/** Return TRUE if @a parent_fspath is an ancestor of @a child_fspath or
- * the fspaths are equal, and FALSE otherwise.
- *
- * @since New in 1.7.
- */
-svn_boolean_t
-svn_fspath__is_ancestor(const char *parent_fspath,
- const char *child_fspath);
-
/** Return the longest common path shared by two fspaths, @a fspath1 and
* @a fspath2. If there's no common ancestor, return "/".
*
@@ -179,7 +170,6 @@ svn_fspath__get_longest_ancestor(const c
#define svn_urlpath__basename svn_fspath__basename
#define svn_urlpath__dirname svn_fspath__dirname
#define svn_urlpath__get_longest_ancestor svn_fspath__get_longest_ancestor
-#define svn_urlpath__is_ancestor svn_fspath__is_ancestor
#define svn_urlpath__is_canonical svn_fspath__is_canonical
#define svn_urlpath__is_child svn_fspath__is_child
#define svn_urlpath__is_root svn_fspath__is_root
Modified: subversion/trunk/subversion/include/svn_path.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_path.h?rev=1188661&r1=1188660&r2=1188661&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_path.h (original)
+++ subversion/trunk/subversion/include/svn_path.h Tue Oct 25 13:57:43 2011
@@ -523,8 +523,8 @@ svn_path_is_child(const char *path1, con
* @since New in 1.3.
*
* @deprecated Provided for backward compatibility with the 1.6 API.
- * New code should use svn_dirent_is_ancestor(), svn_uri_is_ancestor(),
- * svn_relpath_is_ancestor() or svn_fspath__is_ancestor().
+ * For replacement functionality, see svn_dirent_skip_ancestor(),
+ * svn_uri_skip_ancestor(), and svn_relpath_skip_ancestor().
*/
SVN_DEPRECATED
svn_boolean_t
Modified: subversion/trunk/subversion/libsvn_client/mergeinfo.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/mergeinfo.c?rev=1188661&r1=1188660&r2=1188661&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/mergeinfo.c (original)
+++ subversion/trunk/subversion/libsvn_client/mergeinfo.c Tue Oct 25 13:57:43 2011
@@ -1243,7 +1243,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_fspath__is_ancestor(item.key, fspath))
+ if (svn_fspath__skip_ancestor(item.key, fspath))
{
ancestor_index = i;
@@ -1459,8 +1459,8 @@ filter_log_entry_with_rangelist(void *ba
/* Does the mergeinfo for PATH reflect if
LOG_ENTRY->REVISION was previously merged
from MERGE_SOURCE_FSPATH? */
- if (svn_fspath__is_ancestor(merge_source_fspath,
- mergeinfo_path))
+ if (svn_fspath__skip_ancestor(merge_source_fspath,
+ mergeinfo_path))
{
/* Something was merged from MERGE_SOURCE_FSPATH, does
it include LOG_ENTRY->REVISION? */
Modified: subversion/trunk/subversion/libsvn_ra_neon/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_neon/merge.c?rev=1188661&r1=1188660&r2=1188661&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_neon/merge.c (original)
+++ subversion/trunk/subversion/libsvn_ra_neon/merge.c Tue Oct 25 13:57:43 2011
@@ -259,7 +259,7 @@ static svn_error_t * handle_resource(mer
}
/* a collection or regular resource */
- if (! svn_urlpath__is_ancestor(mc->base_href, mc->href->data))
+ if (! svn_urlpath__skip_ancestor(mc->base_href, mc->href->data))
{
/* ### need something better than APR_EGENERAL */
return svn_error_createf(APR_EGENERAL, NULL,
Modified: subversion/trunk/subversion/libsvn_ra_serf/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/merge.c?rev=1188661&r1=1188660&r2=1188661&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/merge.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/merge.c Tue Oct 25 13:57:43 2011
@@ -292,7 +292,7 @@ end_merge(svn_ra_serf__xml_parser_t *par
const char *href;
href = apr_hash_get(info->props, "href", APR_HASH_KEY_STRING);
- if (! svn_urlpath__is_ancestor(ctx->merge_url, href))
+ if (! svn_urlpath__skip_ancestor(ctx->merge_url, href))
{
return svn_error_createf(SVN_ERR_RA_DAV_REQUEST_FAILED, NULL,
_("A MERGE response for '%s' is not "
Modified: subversion/trunk/subversion/libsvn_repos/log.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/log.c?rev=1188661&r1=1188660&r2=1188661&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_repos/log.c (original)
+++ subversion/trunk/subversion/libsvn_repos/log.c Tue Oct 25 13:57:43 2011
@@ -925,7 +925,7 @@ get_combined_mergeinfo_changes(svn_merge
for (i = 0; i < paths->nelts; i++)
{
const char *path = APR_ARRAY_IDX(paths, i, const char *);
- if (! svn_fspath__is_ancestor(path, changed_path))
+ if (! svn_fspath__skip_ancestor(path, changed_path))
continue;
svn_pool_clear(iterpool);
deleted = apr_hash_get(deleted_mergeinfo_catalog, key, klen);
@@ -1140,8 +1140,7 @@ send_log(svn_revnum_t rev,
apr_array_header_t *rangelist =
svn__apr_hash_index_val(hi2);
- if (svn_fspath__is_ancestor(mergeinfo_path,
- changed_path))
+ if (svn_fspath__skip_ancestor(mergeinfo_path, changed_path))
{
int i;
Modified: subversion/trunk/subversion/libsvn_subr/dirent_uri.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/dirent_uri.c?rev=1188661&r1=1188660&r2=1188661&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/dirent_uri.c (original)
+++ subversion/trunk/subversion/libsvn_subr/dirent_uri.c Tue Oct 25 13:57:43 2011
@@ -2472,16 +2472,6 @@ svn_fspath__skip_ancestor(const char *pa
return svn_relpath_skip_ancestor(parent_fspath + 1, child_fspath + 1);
}
-svn_boolean_t
-svn_fspath__is_ancestor(const char *parent_fspath,
- const char *child_fspath)
-{
- 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);
-}
-
const char *
svn_fspath__dirname(const char *fspath,
Modified: subversion/trunk/subversion/libsvn_subr/mergeinfo.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/mergeinfo.c?rev=1188661&r1=1188660&r2=1188661&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/mergeinfo.c (original)
+++ subversion/trunk/subversion/libsvn_subr/mergeinfo.c Tue Oct 25 13:57:43 2011
@@ -2131,7 +2131,7 @@ svn_mergeinfo__remove_prefix_from_catalo
apr_ssize_t padding = 0;
SVN_ERR_ASSERT(klen >= prefix_len);
- SVN_ERR_ASSERT(svn_fspath__is_ancestor(prefix_path, original_path));
+ SVN_ERR_ASSERT(svn_fspath__skip_ancestor(prefix_path, original_path));
/* If the ORIGINAL_PATH doesn't match the PREFIX_PATH exactly
and we're not simply removing a single leading slash (such as