Author: stefan2 Date: Mon Apr 13 21:11:50 2015 New Revision: 1673282 URL: http://svn.apache.org/r1673282 Log: Rename public API svn_relpath_limit() to svn_relpath_prefix(). No functional change intended.
* subversion/include/svn_dirent_uri.h (svn_relpath_limit): Rename to ... (svn_relpath_prefix): ... this. * subversion/libsvn_subr/dirent_uri.c (svn_relpath_limit, svn_relpath_prefix): Sync. implementation with declaration. * subversion/libsvn_wc/wc_db.c (read_children_info, read_single_info, scan_addition, svn_wc__db_scan_moved, svn_wc__db_scan_moved_to_internal): Update callers. * subversion/libsvn_wc/wc_db_update_move.c (create_node_tree_conflict, bump_moved_layer, svn_wc__db_op_raise_moved_away_internal): Same. Modified: subversion/trunk/subversion/include/svn_dirent_uri.h subversion/trunk/subversion/libsvn_subr/dirent_uri.c subversion/trunk/subversion/libsvn_wc/wc_db.c subversion/trunk/subversion/libsvn_wc/wc_db_update_move.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=1673282&r1=1673281&r2=1673282&view=diff ============================================================================== --- subversion/trunk/subversion/include/svn_dirent_uri.h (original) +++ subversion/trunk/subversion/include/svn_dirent_uri.h Mon Apr 13 21:11:50 2015 @@ -363,9 +363,9 @@ svn_relpath_dirname(const char *relpath, * @since New in 1.9. */ const char * -svn_relpath_limit(const char *relpath, - int max_components, - apr_pool_t *result_pool); +svn_relpath_prefix(const char *relpath, + int max_components, + apr_pool_t *result_pool); /** Divide the canonicalized @a uri into a uri @a *dirpath and a Modified: subversion/trunk/subversion/libsvn_subr/dirent_uri.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/dirent_uri.c?rev=1673282&r1=1673281&r2=1673282&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_subr/dirent_uri.c (original) +++ subversion/trunk/subversion/libsvn_subr/dirent_uri.c Mon Apr 13 21:11:50 2015 @@ -1295,9 +1295,9 @@ svn_relpath_split(const char **dirpath, } const char * -svn_relpath_limit(const char *relpath, - int max_components, - apr_pool_t *result_pool) +svn_relpath_prefix(const char *relpath, + int max_components, + apr_pool_t *result_pool) { const char *end; assert(relpath_is_canonical(relpath)); Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1673282&r1=1673281&r2=1673282&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_wc/wc_db.c (original) +++ subversion/trunk/subversion/libsvn_wc/wc_db.c Mon Apr 13 21:11:50 2015 @@ -9434,8 +9434,8 @@ read_children_info(svn_wc__db_wcroot_t * moved_to_relpath, result_pool); - shadow_op_relpath = svn_relpath_limit(child_relpath, op_depth, - scratch_pool); + shadow_op_relpath = svn_relpath_prefix(child_relpath, op_depth, + scratch_pool); moved_to->shadow_op_root_abspath = svn_dirent_join(wcroot->abspath, shadow_op_relpath, @@ -9624,8 +9624,8 @@ read_single_info(const struct svn_wc__db moved_to_relpath, result_pool); - cur_relpath = svn_relpath_limit(local_relpath, op_depth, - scratch_pool); + cur_relpath = svn_relpath_prefix(local_relpath, op_depth, + scratch_pool); move->shadow_op_root_abspath = svn_dirent_join(wcroot->abspath, cur_relpath, @@ -12700,7 +12700,8 @@ scan_addition(svn_wc__db_status_t *statu /* Calculate the op root local path components */ - op_root_relpath = svn_relpath_limit(local_relpath, op_depth, scratch_pool); + op_root_relpath = svn_relpath_prefix(local_relpath, op_depth, + scratch_pool); repos_prefix_path = svn_relpath_skip_ancestor(op_root_relpath, local_relpath); @@ -12819,8 +12820,8 @@ scan_addition(svn_wc__db_status_t *statu /* Skip to op_depth */ tmp = op_root_relpath; - op_root_relpath = svn_relpath_limit(op_root_relpath, op_depth, - scratch_pool); + op_root_relpath = svn_relpath_prefix(op_root_relpath, op_depth, + scratch_pool); repos_prefix_path = svn_relpath_join( svn_relpath_skip_ancestor(op_root_relpath, tmp), repos_prefix_path, scratch_pool); @@ -13029,8 +13030,8 @@ svn_wc__db_scan_moved(const char **moved /* The deleted node is either where we moved from, or one of its ancestors */ if (moved_from_delete_abspath) { - const char *tmp = svn_relpath_limit(moved_from_op_root_relpath, - moved_from_op_depth, scratch_pool); + const char *tmp = svn_relpath_prefix(moved_from_op_root_relpath, + moved_from_op_depth, scratch_pool); *moved_from_delete_abspath = svn_dirent_join(wcroot->abspath, tmp, scratch_pool); @@ -13236,8 +13237,8 @@ svn_wc__db_scan_moved_to_internal(const *move_dst_relpath = apr_pstrdup(result_pool, dst_relpath); if (delete_relpath) - *delete_relpath = svn_relpath_limit(local_relpath, delete_op_depth, - result_pool); + *delete_relpath = svn_relpath_prefix(local_relpath, delete_op_depth, + result_pool); } return SVN_NO_ERROR; Modified: subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c?rev=1673282&r1=1673281&r2=1673282&view=diff ============================================================================== --- subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c (original) +++ subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c Mon Apr 13 21:11:50 2015 @@ -490,9 +490,9 @@ create_node_tree_conflict(svn_skel_t **c { update_move_baton_t *umb = nmb->umb; const char *dst_repos_relpath; - const char *dst_root_relpath = svn_relpath_limit(nmb->dst_relpath, - nmb->umb->dst_op_depth, - scratch_pool); + const char *dst_root_relpath = svn_relpath_prefix(nmb->dst_relpath, + nmb->umb->dst_op_depth, + scratch_pool); dst_repos_relpath = svn_relpath_join(nmb->umb->old_version->path_in_repos, @@ -504,9 +504,9 @@ create_node_tree_conflict(svn_skel_t **c return svn_error_trace( create_tree_conflict(conflict_p, umb->wcroot, dst_local_relpath, - svn_relpath_limit(dst_local_relpath, - umb->dst_op_depth, - scratch_pool), + svn_relpath_prefix(dst_local_relpath, + umb->dst_op_depth, + scratch_pool), umb->db, umb->old_version, umb->new_version, umb->operation, old_kind, new_kind, @@ -2083,8 +2083,8 @@ bump_moved_layer(svn_boolean_t *recurse, can_bump = FALSE; } - src_root_relpath = svn_relpath_limit(src_relpath, src_del_depth, - scratch_pool); + src_root_relpath = svn_relpath_prefix(src_relpath, src_del_depth, + scratch_pool); if (!can_bump) { @@ -2404,9 +2404,9 @@ svn_wc__db_op_raise_moved_away_internal( src_repos_relpath, svn_wc_conflict_reason_moved_away, action, - svn_relpath_limit(src_relpath, - delete_op_depth, - iterpool), + svn_relpath_prefix(src_relpath, + delete_op_depth, + iterpool), iterpool, iterpool); if (!err)