Modified: subversion/branches/move-tracking-2/subversion/libsvn_wc/wc_db_wcroot.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_wc/wc_db_wcroot.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/libsvn_wc/wc_db_wcroot.c (original) +++ subversion/branches/move-tracking-2/subversion/libsvn_wc/wc_db_wcroot.c Wed Jul 30 11:23:49 2014 @@ -245,8 +245,8 @@ svn_wc__db_close(svn_wc__db_t *db) hi; hi = apr_hash_next(hi)) { - svn_wc__db_wcroot_t *wcroot = svn__apr_hash_index_val(hi); - const char *local_abspath = svn__apr_hash_index_key(hi); + svn_wc__db_wcroot_t *wcroot = apr_hash_this_val(hi); + const char *local_abspath = apr_hash_this_key(hi); if (wcroot->sdb) svn_hash_sets(roots, wcroot->abspath, wcroot); @@ -362,7 +362,7 @@ svn_wc__db_close_many_wcroots(apr_hash_t for (hi = apr_hash_first(scratch_pool, roots); hi; hi = apr_hash_next(hi)) { - svn_wc__db_wcroot_t *wcroot = svn__apr_hash_index_val(hi); + svn_wc__db_wcroot_t *wcroot = apr_hash_this_val(hi); apr_status_t result; result = apr_pool_cleanup_run(state_pool, wcroot, close_wcroot); @@ -916,10 +916,10 @@ svn_wc__db_drop_root(svn_wc__db_t *db, hi; hi = apr_hash_next(hi)) { - svn_wc__db_wcroot_t *wcroot = svn__apr_hash_index_val(hi); + svn_wc__db_wcroot_t *wcroot = apr_hash_this_val(hi); if (wcroot == root_wcroot) - svn_hash_sets(db->dir_data, svn__apr_hash_index_key(hi), NULL); + svn_hash_sets(db->dir_data, apr_hash_this_key(hi), NULL); } result = apr_pool_cleanup_run(db->state_pool, root_wcroot, close_wcroot);
Modified: subversion/branches/move-tracking-2/subversion/mod_dav_svn/reports/inherited-props.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/mod_dav_svn/reports/inherited-props.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/mod_dav_svn/reports/inherited-props.c (original) +++ subversion/branches/move-tracking-2/subversion/mod_dav_svn/reports/inherited-props.c Wed Jul 30 11:23:49 2014 @@ -156,8 +156,8 @@ dav_svn__get_inherited_props_report(cons hi; hi = apr_hash_next(hi)) { - const char *propname = svn__apr_hash_index_key(hi); - svn_string_t *propval = svn__apr_hash_index_val(hi); + const char *propname = apr_hash_this_key(hi); + svn_string_t *propval = apr_hash_this_val(hi); const char *xml_safe; serr = dav_svn__brigade_printf( Modified: subversion/branches/move-tracking-2/subversion/mod_dav_svn/version.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/mod_dav_svn/version.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/mod_dav_svn/version.c (original) +++ subversion/branches/move-tracking-2/subversion/mod_dav_svn/version.c Wed Jul 30 11:23:49 2014 @@ -1388,8 +1388,8 @@ release_locks(apr_hash_t *locks, for (hi = apr_hash_first(subpool, locks); hi; hi = apr_hash_next(hi)) { - const char *path = svn__apr_hash_index_key(hi); - const char *token = svn__apr_hash_index_val(hi); + const char *path = apr_hash_this_key(hi); + const char *token = apr_hash_this_val(hi); svn_hash_sets(targets, path, token); } Modified: subversion/branches/move-tracking-2/subversion/svn/log-cmd.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/svn/log-cmd.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/svn/log-cmd.c (original) +++ subversion/branches/move-tracking-2/subversion/svn/log-cmd.c Wed Jul 30 11:23:49 2014 @@ -147,14 +147,14 @@ match_search_pattern(const char *search_ hi; hi = apr_hash_next(hi)) { - const char *path = svn__apr_hash_index_key(hi); + const char *path = apr_hash_this_key(hi); svn_log_changed_path2_t *log_item; if (apr_fnmatch(pattern, path, flags) == APR_SUCCESS) return TRUE; /* Match copy-from paths, too. */ - log_item = svn__apr_hash_index_val(hi); + log_item = apr_hash_this_val(hi); if (log_item->copyfrom_path && SVN_IS_VALID_REVNUM(log_item->copyfrom_rev) && apr_fnmatch(pattern, @@ -821,8 +821,8 @@ svn_cl__log(apr_getopt_t *os, hi != NULL; hi = apr_hash_next(hi)) { - const char *property = svn__apr_hash_index_key(hi); - svn_string_t *value = svn__apr_hash_index_val(hi); + const char *property = apr_hash_this_key(hi); + svn_string_t *value = apr_hash_this_val(hi); if (value && value->data[0] != '\0') return svn_error_createf(SVN_ERR_CL_ARG_PARSING_ERROR, NULL, Modified: subversion/branches/move-tracking-2/subversion/svn/propget-cmd.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/svn/propget-cmd.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/svn/propget-cmd.c (original) +++ subversion/branches/move-tracking-2/subversion/svn/propget-cmd.c Wed Jul 30 11:23:49 2014 @@ -89,7 +89,7 @@ print_properties_xml(const char *pname, const char *name_local; svn_prop_inherited_item_t *iprop = APR_ARRAY_IDX(inherited_props, i, svn_prop_inherited_item_t *); - svn_string_t *propval = svn__apr_hash_index_val( + svn_string_t *propval = apr_hash_this_val( apr_hash_first(pool, iprop->prop_hash)); sb = NULL; @@ -278,7 +278,7 @@ print_properties(svn_stream_t *out, { svn_prop_inherited_item_t *iprop = APR_ARRAY_IDX(inherited_props, i, svn_prop_inherited_item_t *); - svn_string_t *propval = svn__apr_hash_index_val(apr_hash_first(pool, + svn_string_t *propval = apr_hash_this_val(apr_hash_first(pool, iprop->prop_hash)); SVN_ERR(print_single_prop(propval, target_abspath_or_url, iprop->path_or_url, Modified: subversion/branches/move-tracking-2/subversion/svn/status-cmd.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/svn/status-cmd.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/svn/status-cmd.c (original) +++ subversion/branches/move-tracking-2/subversion/svn/status-cmd.c Wed Jul 30 11:23:49 2014 @@ -379,8 +379,8 @@ svn_cl__status(apr_getopt_t *os, for (hi = apr_hash_first(scratch_pool, master_cl_hash); hi; hi = apr_hash_next(hi)) { - const char *changelist_name = svn__apr_hash_index_key(hi); - apr_array_header_t *path_array = svn__apr_hash_index_val(hi); + const char *changelist_name = apr_hash_this_key(hi); + apr_array_header_t *path_array = apr_hash_this_val(hi); int j; /* ### TODO: For non-XML output, we shouldn't print the Modified: subversion/branches/move-tracking-2/subversion/svn/svn.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/svn/svn.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/svn/svn.c (original) +++ subversion/branches/move-tracking-2/subversion/svn/svn.c Wed Jul 30 11:23:49 2014 @@ -2532,7 +2532,7 @@ sub_main(int *exit_code, int argc, const for (hi = apr_hash_first(pool, opt_state.revprop_table); hi; hi = apr_hash_next(hi)) { - SVN_ERR(svn_cl__check_svn_prop_name(svn__apr_hash_index_key(hi), + SVN_ERR(svn_cl__check_svn_prop_name(apr_hash_this_key(hi), TRUE, svn_cl__prop_use_use, pool)); } Modified: subversion/branches/move-tracking-2/subversion/svnadmin/svnadmin.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/svnadmin/svnadmin.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/svnadmin/svnadmin.c (original) +++ subversion/branches/move-tracking-2/subversion/svnadmin/svnadmin.c Wed Jul 30 11:23:49 2014 @@ -2118,8 +2118,8 @@ subcommand_lslocks(apr_getopt_t *os, voi for (hi = apr_hash_first(pool, locks); hi; hi = apr_hash_next(hi)) { const char *cr_date, *exp_date = ""; - const char *path = svn__apr_hash_index_key(hi); - svn_lock_t *lock = svn__apr_hash_index_val(hi); + const char *path = apr_hash_this_key(hi); + svn_lock_t *lock = apr_hash_this_val(hi); int comment_lines = 0; svn_pool_clear(iterpool); Modified: subversion/branches/move-tracking-2/subversion/svndumpfilter/svndumpfilter.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/svndumpfilter/svndumpfilter.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/svndumpfilter/svndumpfilter.c (original) +++ subversion/branches/move-tracking-2/subversion/svndumpfilter/svndumpfilter.c Wed Jul 30 11:23:49 2014 @@ -348,8 +348,8 @@ new_revision_record(void **revision_bato for (hi = apr_hash_first(pool, headers); hi; hi = apr_hash_next(hi)) { - const char *key = svn__apr_hash_index_key(hi); - const char *val = svn__apr_hash_index_val(hi); + const char *key = apr_hash_this_key(hi); + const char *val = apr_hash_this_val(hi); if ((!strcmp(key, SVN_REPOS_DUMPFILE_CONTENT_LENGTH)) || (!strcmp(key, SVN_REPOS_DUMPFILE_PROP_CONTENT_LENGTH)) @@ -415,8 +415,8 @@ output_revision(struct revision_baton_t hi; hi = apr_hash_next(hi)) { - const char *pname = svn__apr_hash_index_key(hi); - const svn_string_t *pval = svn__apr_hash_index_val(hi); + const char *pname = apr_hash_this_key(hi); + const svn_string_t *pval = apr_hash_this_val(hi); write_prop_to_stringbuf(props, pname, pval); } @@ -651,8 +651,8 @@ new_node_record(void **node_baton, for (hi = apr_hash_first(pool, headers); hi; hi = apr_hash_next(hi)) { - const char *key = svn__apr_hash_index_key(hi); - const char *val = svn__apr_hash_index_val(hi); + const char *key = apr_hash_this_key(hi); + const char *val = apr_hash_this_val(hi); if ((!strcmp(key, SVN_REPOS_DUMPFILE_PROP_DELTA)) && (!strcmp(val, "true"))) @@ -803,8 +803,8 @@ adjust_mergeinfo(svn_string_t **final_va for (hi = apr_hash_first(subpool, mergeinfo); hi; hi = apr_hash_next(hi)) { - const char *merge_source = svn__apr_hash_index_key(hi); - svn_rangelist_t *rangelist = svn__apr_hash_index_val(hi); + const char *merge_source = apr_hash_this_key(hi); + svn_rangelist_t *rangelist = apr_hash_this_val(hi); struct parse_baton_t *pb = rb->pb; /* Determine whether the merge_source is a part of the prefix. */ @@ -1303,7 +1303,7 @@ do_filter(apr_getopt_t *os, hi; hi = apr_hash_next(hi)) { - const svn_revnum_t *revnum = svn__apr_hash_index_key(hi); + const svn_revnum_t *revnum = apr_hash_this_key(hi); APR_ARRAY_PUSH(keys, svn_revnum_t) = *revnum; } @@ -1346,7 +1346,7 @@ do_filter(apr_getopt_t *os, hi; hi = apr_hash_next(hi)) { - const char *path = svn__apr_hash_index_key(hi); + const char *path = apr_hash_this_key(hi); APR_ARRAY_PUSH(keys, const char *) = path; } Modified: subversion/branches/move-tracking-2/subversion/svnlook/svnlook.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/svnlook/svnlook.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/svnlook/svnlook.c (original) +++ subversion/branches/move-tracking-2/subversion/svnlook/svnlook.c Wed Jul 30 11:23:49 2014 @@ -1769,8 +1769,7 @@ do_pget(svnlook_ctxt_t *c, else { svn_string_t *propval = - svn__apr_hash_index_val(apr_hash_first(pool, - elt->prop_hash)); + apr_hash_this_val(apr_hash_first(pool, elt->prop_hash)); SVN_ERR(svn_stream_printf( stdout_stream, pool, "%s - ", @@ -1953,8 +1952,8 @@ do_plist(svnlook_ctxt_t *c, for (hi = apr_hash_first(pool, props); hi; hi = apr_hash_next(hi)) { - const char *pname = svn__apr_hash_index_key(hi); - svn_string_t *propval = svn__apr_hash_index_val(hi); + const char *pname = apr_hash_this_key(hi); + svn_string_t *propval = apr_hash_this_val(hi); SVN_ERR(check_cancel(NULL)); Modified: subversion/branches/move-tracking-2/subversion/svnmucc/svnmucc.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/svnmucc/svnmucc.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/svnmucc/svnmucc.c (original) +++ subversion/branches/move-tracking-2/subversion/svnmucc/svnmucc.c Wed Jul 30 11:23:49 2014 @@ -43,7 +43,7 @@ #include "svn_private_config.h" #include "svn_hash.h" #include "svn_client.h" -#include "svn_client_mtcc.h" +#include "private/svn_client_mtcc.h" #include "svn_cmdline.h" #include "svn_config.h" #include "svn_error.h" @@ -136,16 +136,16 @@ execute(const apr_array_header_t *action svn_client_ctx_t *ctx, apr_pool_t *pool) { - svn_client_mtcc_t *mtcc; + svn_client__mtcc_t *mtcc; apr_pool_t *iterpool = svn_pool_create(pool); svn_error_t *err; int i; - SVN_ERR(svn_client_mtcc_create(&mtcc, anchor, - SVN_IS_VALID_REVNUM(base_revision) - ? base_revision - : SVN_INVALID_REVNUM, - ctx, pool, iterpool)); + SVN_ERR(svn_client__mtcc_create(&mtcc, anchor, + SVN_IS_VALID_REVNUM(base_revision) + ? base_revision + : SVN_INVALID_REVNUM, + ctx, pool, iterpool)); for (i = 0; i < actions->nelts; ++i) { @@ -160,29 +160,29 @@ execute(const apr_array_header_t *action case ACTION_MV: path1 = subtract_anchor(anchor, action->path[0], pool); path2 = subtract_anchor(anchor, action->path[1], pool); - SVN_ERR(svn_client_mtcc_add_move(path1, path2, mtcc, iterpool)); + SVN_ERR(svn_client__mtcc_add_move(path1, path2, mtcc, iterpool)); break; case ACTION_CP: path1 = subtract_anchor(anchor, action->path[0], pool); path2 = subtract_anchor(anchor, action->path[1], pool); - SVN_ERR(svn_client_mtcc_add_copy(path1, action->rev, path2, - mtcc, iterpool)); + SVN_ERR(svn_client__mtcc_add_copy(path1, action->rev, path2, + mtcc, iterpool)); break; case ACTION_RM: path1 = subtract_anchor(anchor, action->path[0], pool); - SVN_ERR(svn_client_mtcc_add_delete(path1, mtcc, iterpool)); + SVN_ERR(svn_client__mtcc_add_delete(path1, mtcc, iterpool)); break; case ACTION_MKDIR: path1 = subtract_anchor(anchor, action->path[0], pool); - SVN_ERR(svn_client_mtcc_add_mkdir(path1, mtcc, iterpool)); + SVN_ERR(svn_client__mtcc_add_mkdir(path1, mtcc, iterpool)); break; case ACTION_PUT: path1 = subtract_anchor(anchor, action->path[0], pool); - SVN_ERR(svn_client_mtcc_check_path(&kind, path1, TRUE, mtcc, pool)); + SVN_ERR(svn_client__mtcc_check_path(&kind, path1, TRUE, mtcc, pool)); if (kind == svn_node_dir) { - SVN_ERR(svn_client_mtcc_add_delete(path1, mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_delete(path1, mtcc, pool)); kind = svn_node_none; } @@ -197,20 +197,20 @@ execute(const apr_array_header_t *action if (kind == svn_node_file) - SVN_ERR(svn_client_mtcc_add_update_file(path1, src, NULL, - NULL, NULL, - mtcc, iterpool)); + SVN_ERR(svn_client__mtcc_add_update_file(path1, src, NULL, + NULL, NULL, + mtcc, iterpool)); else if (kind == svn_node_none) - SVN_ERR(svn_client_mtcc_add_add_file(path1, src, NULL, - mtcc, iterpool)); + SVN_ERR(svn_client__mtcc_add_add_file(path1, src, NULL, + mtcc, iterpool)); } break; case ACTION_PROPSET: case ACTION_PROPDEL: path1 = subtract_anchor(anchor, action->path[0], pool); - SVN_ERR(svn_client_mtcc_add_propset(path1, action->prop_name, - action->prop_value, FALSE, - mtcc, iterpool)); + SVN_ERR(svn_client__mtcc_add_propset(path1, action->prop_name, + action->prop_value, FALSE, + mtcc, iterpool)); break; case ACTION_PROPSETF: default: @@ -218,8 +218,8 @@ execute(const apr_array_header_t *action } } - err = svn_client_mtcc_commit(revprops, commit_callback, NULL, - mtcc, iterpool); + err = svn_client__mtcc_commit(revprops, commit_callback, NULL, + mtcc, iterpool); svn_pool_destroy(iterpool); return svn_error_trace(err);; Modified: subversion/branches/move-tracking-2/subversion/svnrdump/dump_editor.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/svnrdump/dump_editor.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/svnrdump/dump_editor.c (original) +++ subversion/branches/move-tracking-2/subversion/svnrdump/dump_editor.c Wed Jul 30 11:23:49 2014 @@ -794,7 +794,7 @@ close_directory(void *dir_baton, for (hi = apr_hash_first(pool, db->deleted_entries); hi; hi = apr_hash_next(hi)) { - const char *path = svn__apr_hash_index_key(hi); + const char *path = apr_hash_this_key(hi); SVN_ERR(dump_node(db->eb, path, NULL, NULL, svn_node_action_delete, FALSE, NULL, SVN_INVALID_REVNUM, pool)); Modified: subversion/branches/move-tracking-2/subversion/svnrdump/load_editor.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/svnrdump/load_editor.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/svnrdump/load_editor.c (original) +++ subversion/branches/move-tracking-2/subversion/svnrdump/load_editor.c Wed Jul 30 11:23:49 2014 @@ -557,8 +557,8 @@ new_revision_record(void **revision_bato for (hi = apr_hash_first(pool, headers); hi; hi = apr_hash_next(hi)) { - const char *hname = svn__apr_hash_index_key(hi); - const char *hval = svn__apr_hash_index_val(hi); + const char *hname = apr_hash_this_key(hi); + const char *hval = apr_hash_this_val(hi); if (strcmp(hname, SVN_REPOS_DUMPFILE_REVISION_NUMBER) == 0) rb->rev = atoi(hval); @@ -669,8 +669,8 @@ new_node_record(void **node_baton, for (hi = apr_hash_first(rb->pool, headers); hi; hi = apr_hash_next(hi)) { - const char *hname = svn__apr_hash_index_key(hi); - const char *hval = svn__apr_hash_index_val(hi); + const char *hname = apr_hash_this_key(hi); + const char *hval = apr_hash_this_val(hi); /* Parse the different kinds of headers we can encounter and stuff them into the node_baton for writing later */ @@ -1009,7 +1009,7 @@ remove_node_props(void *baton) for (hi = apr_hash_first(pool, props); hi; hi = apr_hash_next(hi)) { - const char *name = svn__apr_hash_index_key(hi); + const char *name = apr_hash_this_key(hi); svn_prop_kind_t kind = svn_property_kind2(name); if (kind == svn_prop_regular_kind) Modified: subversion/branches/move-tracking-2/subversion/svnrdump/util.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/svnrdump/util.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/svnrdump/util.c (original) +++ subversion/branches/move-tracking-2/subversion/svnrdump/util.c Wed Jul 30 11:23:49 2014 @@ -61,8 +61,8 @@ svn_rdump__normalize_props(apr_hash_t ** for (hi = apr_hash_first(result_pool, props); hi; hi = apr_hash_next(hi)) { - const char *key = svn__apr_hash_index_key(hi); - const svn_string_t *value = svn__apr_hash_index_val(hi); + const char *key = apr_hash_this_key(hi); + const svn_string_t *value = apr_hash_this_val(hi); SVN_ERR(svn_rdump__normalize_prop(key, &value, result_pool)); Modified: subversion/branches/move-tracking-2/subversion/svnserve/serve.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/svnserve/serve.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/svnserve/serve.c (original) +++ subversion/branches/move-tracking-2/subversion/svnserve/serve.c Wed Jul 30 11:23:49 2014 @@ -1743,8 +1743,8 @@ static svn_error_t *get_dir(svn_ra_svn_c subpool = svn_pool_create(pool); for (hi = apr_hash_first(pool, entries); hi; hi = apr_hash_next(hi)) { - const char *name = svn__apr_hash_index_key(hi); - svn_fs_dirent_t *fsent = svn__apr_hash_index_val(hi); + const char *name = apr_hash_this_key(hi); + svn_fs_dirent_t *fsent = apr_hash_this_val(hi); const char *file_path; /* The fields in the entry tuple. */ @@ -2100,8 +2100,8 @@ static svn_error_t *get_mergeinfo(svn_ra iterpool = svn_pool_create(pool); for (hi = apr_hash_first(pool, mergeinfo); hi; hi = apr_hash_next(hi)) { - const char *key = svn__apr_hash_index_key(hi); - svn_mergeinfo_t value = svn__apr_hash_index_val(hi); + const char *key = apr_hash_this_key(hi); + svn_mergeinfo_t value = apr_hash_this_val(hi); svn_string_t *mergeinfo_string; svn_pool_clear(iterpool); @@ -2160,8 +2160,8 @@ static svn_error_t *log_receiver(void *b for (h = apr_hash_first(pool, log_entry->changed_paths2); h; h = apr_hash_next(h)) { - const char *path = svn__apr_hash_index_key(h); - svn_log_changed_path2_t *change = svn__apr_hash_index_val(h); + const char *path = apr_hash_this_key(h); + svn_log_changed_path2_t *change = apr_hash_this_val(h); SVN_ERR(svn_ra_svn__write_data_log_changed_path( conn, pool, @@ -2446,8 +2446,8 @@ static svn_error_t *get_locations(svn_ra for (iter = apr_hash_first(pool, fs_locations); iter; iter = apr_hash_next(iter)) { - const svn_revnum_t *iter_key = svn__apr_hash_index_key(iter); - const char *iter_value = svn__apr_hash_index_val(iter); + const svn_revnum_t *iter_key = apr_hash_this_key(iter); + const char *iter_value = apr_hash_this_val(iter); SVN_ERR(svn_ra_svn__write_tuple(conn, pool, "rc", *iter_key, iter_value)); @@ -2743,7 +2743,7 @@ clear_lock_result_hash(apr_hash_t *resul for (hi = apr_hash_first(scratch_pool, results); hi; hi = apr_hash_next(hi)) { - struct lock_result_t *result = svn__apr_hash_index_val(hi); + struct lock_result_t *result = apr_hash_this_val(hi); svn_error_clear(result->err); } } @@ -2812,7 +2812,7 @@ static svn_error_t *lock_many(svn_ra_svn results, are cleared before returning from this function. */ for (hi = apr_hash_first(pool, targets); hi; hi = apr_hash_next(hi)) { - const char *full_path = svn__apr_hash_index_key(hi); + const char *full_path = apr_hash_this_key(hi); svn_pool_clear(subpool); @@ -2990,7 +2990,7 @@ static svn_error_t *unlock_many(svn_ra_s results, are cleared before returning from this function. */ for (hi = apr_hash_first(pool, targets); hi; hi = apr_hash_next(hi)) { - const char *full_path = svn__apr_hash_index_key(hi); + const char *full_path = apr_hash_this_key(hi); svn_pool_clear(subpool); @@ -3145,7 +3145,7 @@ static svn_error_t *get_locks(svn_ra_svn SVN_ERR(svn_ra_svn__write_tuple(conn, pool, "w((!", "success")); for (hi = apr_hash_first(pool, locks); hi; hi = apr_hash_next(hi)) { - svn_lock_t *l = svn__apr_hash_index_val(hi); + svn_lock_t *l = apr_hash_this_val(hi); SVN_ERR(write_lock(conn, pool, l)); } Modified: subversion/branches/move-tracking-2/subversion/svnsync/svnsync.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/svnsync/svnsync.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/svnsync/svnsync.c (original) +++ subversion/branches/move-tracking-2/subversion/svnsync/svnsync.c Wed Jul 30 11:23:49 2014 @@ -486,7 +486,7 @@ remove_props_not_in_source(svn_ra_sessio hi; hi = apr_hash_next(hi)) { - const char *propname = svn__apr_hash_index_key(hi); + const char *propname = apr_hash_this_key(hi); svn_pool_clear(subpool); @@ -530,8 +530,8 @@ filter_props(int *filtered_count, apr_ha for (hi = apr_hash_first(pool, props); hi ; hi = apr_hash_next(hi)) { - const char *propname = svn__apr_hash_index_key(hi); - void *propval = svn__apr_hash_index_val(hi); + const char *propname = apr_hash_this_key(hi); + void *propval = apr_hash_this_val(hi); /* Copy all properties: - not matching the exclude pattern if provided OR @@ -572,8 +572,8 @@ write_revprops(int *filtered_count, for (hi = apr_hash_first(pool, rev_props); hi; hi = apr_hash_next(hi)) { - const char *propname = svn__apr_hash_index_key(hi); - const svn_string_t *propval = svn__apr_hash_index_val(hi); + const char *propname = apr_hash_this_key(hi); + const svn_string_t *propval = apr_hash_this_val(hi); svn_pool_clear(subpool); Modified: subversion/branches/move-tracking-2/subversion/svnsync/sync.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/svnsync/sync.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/svnsync/sync.c (original) +++ subversion/branches/move-tracking-2/subversion/svnsync/sync.c Wed Jul 30 11:23:49 2014 @@ -107,8 +107,8 @@ svnsync_normalize_revprops(apr_hash_t *r hi; hi = apr_hash_next(hi)) { - const char *propname = svn__apr_hash_index_key(hi); - const svn_string_t *propval = svn__apr_hash_index_val(hi); + const char *propname = apr_hash_this_key(hi); + const svn_string_t *propval = apr_hash_this_val(hi); if (svn_prop_needs_translation(propname)) { Modified: subversion/branches/move-tracking-2/subversion/tests/cmdline/entries-dump.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/tests/cmdline/entries-dump.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/tests/cmdline/entries-dump.c (original) +++ subversion/branches/move-tracking-2/subversion/tests/cmdline/entries-dump.c Wed Jul 30 11:23:49 2014 @@ -112,8 +112,8 @@ entries_dump(const char *dir_path, svn_w for (hi = apr_hash_first(pool, entries); hi; hi = apr_hash_next(hi)) { - const char *key = svn__apr_hash_index_key(hi); - const svn_wc_entry_t *entry = svn__apr_hash_index_val(hi); + const char *key = apr_hash_this_key(hi); + const svn_wc_entry_t *entry = apr_hash_this_val(hi); SVN_ERR_ASSERT(strcmp(key, entry->name) == 0); @@ -214,7 +214,7 @@ directory_dump_old(struct directory_walk scratch_pool, scratch_pool)); for (hi = apr_hash_first(scratch_pool, entries); hi; hi = apr_hash_next(hi)) { - const svn_wc_entry_t *entry = svn__apr_hash_index_val(hi); + const svn_wc_entry_t *entry = apr_hash_this_val(hi); const char *local_abspath; if (entry->deleted || entry->absent || entry->kind != svn_node_dir) Modified: subversion/branches/move-tracking-2/subversion/tests/libsvn_client/client-test.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/tests/libsvn_client/client-test.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/tests/libsvn_client/client-test.c (original) +++ subversion/branches/move-tracking-2/subversion/tests/libsvn_client/client-test.c Wed Jul 30 11:23:49 2014 @@ -31,7 +31,7 @@ #include "../../libsvn_client/client.h" #include "svn_pools.h" #include "svn_client.h" -#include "svn_client_mtcc.h" +#include "private/svn_client_mtcc.h" #include "svn_repos.h" #include "svn_subst.h" #include "private/svn_wc_private.h" @@ -776,7 +776,7 @@ test_suggest_mergesources(const svn_test { const char *repos_url; svn_client_ctx_t *ctx; - svn_client_mtcc_t *mtcc; + svn_client__mtcc_t *mtcc; apr_array_header_t *results; svn_opt_revision_t peg_rev; svn_opt_revision_t head_rev; @@ -789,9 +789,9 @@ test_suggest_mergesources(const svn_test SVN_ERR(svn_client_create_context(&ctx, pool)); - SVN_ERR(svn_client_mtcc_create(&mtcc, repos_url, -1, ctx, pool, pool)); - SVN_ERR(svn_client_mtcc_add_copy("A", 1, "AA", mtcc, pool)); - SVN_ERR(svn_client_mtcc_commit(NULL, NULL, NULL, mtcc, pool)); + SVN_ERR(svn_client__mtcc_create(&mtcc, repos_url, -1, ctx, pool, pool)); + SVN_ERR(svn_client__mtcc_add_copy("A", 1, "AA", mtcc, pool)); + SVN_ERR(svn_client__mtcc_commit(NULL, NULL, NULL, mtcc, pool)); SVN_ERR(svn_client_suggest_merge_sources( &results, @@ -912,7 +912,7 @@ test_remote_only_status(const svn_test_o const char *local_path; apr_file_t *local_file; svn_client_ctx_t *ctx; - svn_client_mtcc_t *mtcc; + svn_client__mtcc_t *mtcc; svn_opt_revision_t rev; svn_revnum_t result_rev; svn_string_t *contents = svn_string_create("modified\n", pool); @@ -931,23 +931,23 @@ test_remote_only_status(const svn_test_o SVN_ERR(svn_client_create_context(&ctx, pool)); /* Make some modifications in the repository, creating revision 2. */ - SVN_ERR(svn_client_mtcc_create(&mtcc, repos_url, -1, ctx, pool, pool)); + SVN_ERR(svn_client__mtcc_create(&mtcc, repos_url, -1, ctx, pool, pool)); SVN_ERR(svn_stream_seek(contentstream, start)); - SVN_ERR(svn_client_mtcc_add_add_file("A/epsilon", contentstream, NULL, - mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_add_file("A/epsilon", contentstream, NULL, + mtcc, pool)); SVN_ERR(svn_stream_seek(contentstream, start)); - SVN_ERR(svn_client_mtcc_add_update_file("A/mu", - contentstream, NULL, NULL, NULL, - mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_update_file("A/mu", + contentstream, NULL, NULL, NULL, + mtcc, pool)); SVN_ERR(svn_stream_seek(contentstream, start)); - SVN_ERR(svn_client_mtcc_add_add_file("A/D/epsilon", contentstream, NULL, - mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_add_file("A/D/epsilon", contentstream, NULL, + mtcc, pool)); SVN_ERR(svn_stream_seek(contentstream, start)); - SVN_ERR(svn_client_mtcc_add_update_file("A/B/lambda", - contentstream, NULL, NULL, NULL, - mtcc, pool)); - SVN_ERR(svn_client_mtcc_add_delete("A/C", mtcc, pool)); - SVN_ERR(svn_client_mtcc_commit(NULL, NULL, NULL, mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_update_file("A/B/lambda", + contentstream, NULL, NULL, NULL, + mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_delete("A/C", mtcc, pool)); + SVN_ERR(svn_client__mtcc_commit(NULL, NULL, NULL, mtcc, pool)); /* Check out a sparse root @r1 of the repository */ wc_path = svn_test_data_path("test-remote-only-status-wc", pool); Modified: subversion/branches/move-tracking-2/subversion/tests/libsvn_client/mtcc-test.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/tests/libsvn_client/mtcc-test.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/tests/libsvn_client/mtcc-test.c (original) +++ subversion/branches/move-tracking-2/subversion/tests/libsvn_client/mtcc-test.c Wed Jul 30 11:23:49 2014 @@ -24,7 +24,7 @@ #include "svn_pools.h" #include "svn_props.h" #include "svn_client.h" -#include "svn_client_mtcc.h" +#include "private/svn_client_mtcc.h" #include "../svn_test.h" #include "../svn_test_fs.h" @@ -57,7 +57,7 @@ cstr_stream(const char *data, apr_pool_t } static svn_error_t * -verify_mtcc_commit(svn_client_mtcc_t *mtcc, +verify_mtcc_commit(svn_client__mtcc_t *mtcc, svn_revnum_t expected_rev, apr_pool_t *pool) { @@ -65,7 +65,7 @@ verify_mtcc_commit(svn_client_mtcc_t *mt vcb.commit_info = NULL; vcb.result_pool = pool; - SVN_ERR(svn_client_mtcc_commit(NULL, verify_commit_callback, &vcb, mtcc, pool)); + SVN_ERR(svn_client__mtcc_commit(NULL, verify_commit_callback, &vcb, mtcc, pool)); SVN_TEST_ASSERT(vcb.commit_info != NULL); SVN_TEST_ASSERT(vcb.commit_info->revision == expected_rev); @@ -79,7 +79,7 @@ static svn_error_t * make_greek_tree(const char *repos_url, apr_pool_t *scratch_pool) { - svn_client_mtcc_t *mtcc; + svn_client__mtcc_t *mtcc; svn_client_ctx_t *ctx; apr_pool_t *subpool; int i; @@ -87,13 +87,13 @@ make_greek_tree(const char *repos_url, subpool = svn_pool_create(scratch_pool); SVN_ERR(svn_client_create_context2(&ctx, NULL, subpool)); - SVN_ERR(svn_client_mtcc_create(&mtcc, repos_url, 0, ctx, subpool, subpool)); + SVN_ERR(svn_client__mtcc_create(&mtcc, repos_url, 0, ctx, subpool, subpool)); for (i = 0; svn_test__greek_tree_nodes[i].path; i++) { if (svn_test__greek_tree_nodes[i].contents) { - SVN_ERR(svn_client_mtcc_add_add_file( + SVN_ERR(svn_client__mtcc_add_add_file( svn_test__greek_tree_nodes[i].path, cstr_stream( svn_test__greek_tree_nodes[i].contents, @@ -103,7 +103,7 @@ make_greek_tree(const char *repos_url, } else { - SVN_ERR(svn_client_mtcc_add_mkdir( + SVN_ERR(svn_client__mtcc_add_mkdir( svn_test__greek_tree_nodes[i].path, mtcc, subpool)); } @@ -119,7 +119,7 @@ static svn_error_t * test_mkdir(const svn_test_opts_t *opts, apr_pool_t *pool) { - svn_client_mtcc_t *mtcc; + svn_client__mtcc_t *mtcc; svn_client_ctx_t *ctx; const char *repos_abspath; const char *repos_url; @@ -131,14 +131,14 @@ test_mkdir(const svn_test_opts_t *opts, SVN_ERR(svn_test__create_repos(&repos, repos_abspath, opts, pool)); SVN_ERR(svn_client_create_context2(&ctx, NULL, pool)); - SVN_ERR(svn_client_mtcc_create(&mtcc, repos_url, 0, ctx, pool, pool)); + SVN_ERR(svn_client__mtcc_create(&mtcc, repos_url, 0, ctx, pool, pool)); - SVN_ERR(svn_client_mtcc_add_mkdir("branches", mtcc, pool)); - SVN_ERR(svn_client_mtcc_add_mkdir("trunk", mtcc, pool)); - SVN_ERR(svn_client_mtcc_add_mkdir("branches/1.x", mtcc, pool)); - SVN_ERR(svn_client_mtcc_add_mkdir("tags", mtcc, pool)); - SVN_ERR(svn_client_mtcc_add_mkdir("tags/1.0", mtcc, pool)); - SVN_ERR(svn_client_mtcc_add_mkdir("tags/1.1", mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_mkdir("branches", mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_mkdir("trunk", mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_mkdir("branches/1.x", mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_mkdir("tags", mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_mkdir("tags/1.0", mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_mkdir("tags/1.1", mtcc, pool)); SVN_ERR(verify_mtcc_commit(mtcc, 1, pool)); @@ -149,7 +149,7 @@ static svn_error_t * test_mkgreek(const svn_test_opts_t *opts, apr_pool_t *pool) { - svn_client_mtcc_t *mtcc; + svn_client__mtcc_t *mtcc; svn_client_ctx_t *ctx; const char *repos_abspath; const char *repos_url; @@ -163,9 +163,9 @@ test_mkgreek(const svn_test_opts_t *opts SVN_ERR(make_greek_tree(repos_url, pool)); SVN_ERR(svn_client_create_context2(&ctx, NULL, pool)); - SVN_ERR(svn_client_mtcc_create(&mtcc, repos_url, 1, ctx, pool, pool)); + SVN_ERR(svn_client__mtcc_create(&mtcc, repos_url, 1, ctx, pool, pool)); - SVN_ERR(svn_client_mtcc_add_copy("A", 1, "greek_A", mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_copy("A", 1, "greek_A", mtcc, pool)); SVN_ERR(verify_mtcc_commit(mtcc, 2, pool)); @@ -176,7 +176,7 @@ static svn_error_t * test_swap(const svn_test_opts_t *opts, apr_pool_t *pool) { - svn_client_mtcc_t *mtcc; + svn_client__mtcc_t *mtcc; svn_client_ctx_t *ctx; const char *repos_abspath; const char *repos_url; @@ -190,11 +190,11 @@ test_swap(const svn_test_opts_t *opts, SVN_ERR(make_greek_tree(repos_url, pool)); SVN_ERR(svn_client_create_context2(&ctx, NULL, pool)); - SVN_ERR(svn_client_mtcc_create(&mtcc, repos_url, 1, ctx, pool, pool)); + SVN_ERR(svn_client__mtcc_create(&mtcc, repos_url, 1, ctx, pool, pool)); - SVN_ERR(svn_client_mtcc_add_move("A/B", "B", mtcc, pool)); - SVN_ERR(svn_client_mtcc_add_move("A/D", "A/B", mtcc, pool)); - SVN_ERR(svn_client_mtcc_add_copy("A/B", 1, "A/D", mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_move("A/B", "B", mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_move("A/D", "A/B", mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_copy("A/B", 1, "A/D", mtcc, pool)); SVN_ERR(verify_mtcc_commit(mtcc, 2, pool)); @@ -205,7 +205,7 @@ static svn_error_t * test_propset(const svn_test_opts_t *opts, apr_pool_t *pool) { - svn_client_mtcc_t *mtcc; + svn_client__mtcc_t *mtcc; svn_client_ctx_t *ctx; const char *repos_abspath; const char *repos_url; @@ -219,55 +219,55 @@ test_propset(const svn_test_opts_t *opts SVN_ERR(make_greek_tree(repos_url, pool)); SVN_ERR(svn_client_create_context2(&ctx, NULL, pool)); - SVN_ERR(svn_client_mtcc_create(&mtcc, repos_url, 1, ctx, pool, pool)); + SVN_ERR(svn_client__mtcc_create(&mtcc, repos_url, 1, ctx, pool, pool)); - SVN_ERR(svn_client_mtcc_add_propset("iota", "key", - svn_string_create("val", pool), FALSE, - mtcc, pool)); - SVN_ERR(svn_client_mtcc_add_propset("A", "A-key", - svn_string_create("val-A", pool), FALSE, - mtcc, pool)); - SVN_ERR(svn_client_mtcc_add_propset("A/B", "B-key", - svn_string_create("val-B", pool), FALSE, - mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_propset("iota", "key", + svn_string_create("val", pool), FALSE, + mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_propset("A", "A-key", + svn_string_create("val-A", pool), FALSE, + mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_propset("A/B", "B-key", + svn_string_create("val-B", pool), FALSE, + mtcc, pool)); /* The repository ignores propdeletes of properties that aren't there, so this just works */ - SVN_ERR(svn_client_mtcc_add_propset("A/D", "D-key", NULL, FALSE, - mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_propset("A/D", "D-key", NULL, FALSE, + mtcc, pool)); SVN_ERR(verify_mtcc_commit(mtcc, 2, pool)); - SVN_ERR(svn_client_mtcc_create(&mtcc, repos_url, 2, ctx, pool, pool)); + SVN_ERR(svn_client__mtcc_create(&mtcc, repos_url, 2, ctx, pool, pool)); SVN_TEST_ASSERT_ERROR( - svn_client_mtcc_add_propset("A", SVN_PROP_MIME_TYPE, - svn_string_create("text/plain", pool), - FALSE, mtcc, pool), + svn_client__mtcc_add_propset("A", SVN_PROP_MIME_TYPE, + svn_string_create("text/plain", pool), + FALSE, mtcc, pool), SVN_ERR_ILLEGAL_TARGET); SVN_TEST_ASSERT_ERROR( - svn_client_mtcc_add_propset("iota", SVN_PROP_IGNORE, - svn_string_create("iota", pool), - FALSE, mtcc, pool), + svn_client__mtcc_add_propset("iota", SVN_PROP_IGNORE, + svn_string_create("iota", pool), + FALSE, mtcc, pool), SVN_ERR_ILLEGAL_TARGET); - SVN_ERR(svn_client_mtcc_add_propset("iota", SVN_PROP_EOL_STYLE, - svn_string_create("LF", pool), - FALSE, mtcc, pool)); - - SVN_ERR(svn_client_mtcc_add_add_file("ok", cstr_stream("line\nline\n", pool), - NULL, mtcc, pool)); - SVN_ERR(svn_client_mtcc_add_add_file("bad", cstr_stream("line\nno\r\n", pool), - NULL, mtcc, pool)); - - SVN_ERR(svn_client_mtcc_add_propset("ok", SVN_PROP_EOL_STYLE, - svn_string_create("LF", pool), - FALSE, mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_propset("iota", SVN_PROP_EOL_STYLE, + svn_string_create("LF", pool), + FALSE, mtcc, pool)); + + SVN_ERR(svn_client__mtcc_add_add_file("ok", cstr_stream("line\nline\n", pool), + NULL, mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_add_file("bad", cstr_stream("line\nno\r\n", pool), + NULL, mtcc, pool)); + + SVN_ERR(svn_client__mtcc_add_propset("ok", SVN_PROP_EOL_STYLE, + svn_string_create("LF", pool), + FALSE, mtcc, pool)); SVN_TEST_ASSERT_ERROR( - svn_client_mtcc_add_propset("bad", SVN_PROP_EOL_STYLE, - svn_string_create("LF", pool), - FALSE, mtcc, pool), + svn_client__mtcc_add_propset("bad", SVN_PROP_EOL_STYLE, + svn_string_create("LF", pool), + FALSE, mtcc, pool), SVN_ERR_ILLEGAL_TARGET); SVN_ERR(verify_mtcc_commit(mtcc, 3, pool)); @@ -279,7 +279,7 @@ static svn_error_t * test_update_files(const svn_test_opts_t *opts, apr_pool_t *pool) { - svn_client_mtcc_t *mtcc; + svn_client__mtcc_t *mtcc; svn_client_ctx_t *ctx; const char *repos_abspath; const char *repos_url; @@ -293,33 +293,33 @@ test_update_files(const svn_test_opts_t SVN_ERR(make_greek_tree(repos_url, pool)); SVN_ERR(svn_client_create_context2(&ctx, NULL, pool)); - SVN_ERR(svn_client_mtcc_create(&mtcc, repos_url, 1, ctx, pool, pool)); + SVN_ERR(svn_client__mtcc_create(&mtcc, repos_url, 1, ctx, pool, pool)); /* Update iota with knowledge of the old data */ - SVN_ERR(svn_client_mtcc_add_update_file(svn_test__greek_tree_nodes[0].path, - cstr_stream("new-iota", pool), - NULL, - cstr_stream( - svn_test__greek_tree_nodes[0] - .contents, - pool), - NULL, - mtcc, pool)); - - SVN_ERR(svn_client_mtcc_add_update_file("A/mu", - cstr_stream("new-MU", pool), - NULL, - NULL, NULL, - mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_update_file(svn_test__greek_tree_nodes[0].path, + cstr_stream("new-iota", pool), + NULL, + cstr_stream( + svn_test__greek_tree_nodes[0] + .contents, + pool), + NULL, + mtcc, pool)); + + SVN_ERR(svn_client__mtcc_add_update_file("A/mu", + cstr_stream("new-MU", pool), + NULL, + NULL, NULL, + mtcc, pool)); /* Set a property on the same node */ - SVN_ERR(svn_client_mtcc_add_propset("A/mu", "mu-key", - svn_string_create("mu-A", pool), FALSE, - mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_propset("A/mu", "mu-key", + svn_string_create("mu-A", pool), FALSE, + mtcc, pool)); /* And some other node */ - SVN_ERR(svn_client_mtcc_add_propset("A/B", "B-key", - svn_string_create("val-B", pool), FALSE, - mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_propset("A/B", "B-key", + svn_string_create("val-B", pool), FALSE, + mtcc, pool)); SVN_ERR(verify_mtcc_commit(mtcc, 2, pool)); return SVN_NO_ERROR; @@ -329,7 +329,7 @@ static svn_error_t * test_overwrite(const svn_test_opts_t *opts, apr_pool_t *pool) { - svn_client_mtcc_t *mtcc; + svn_client__mtcc_t *mtcc; svn_client_ctx_t *ctx; const char *repos_abspath; const char *repos_url; @@ -343,17 +343,17 @@ test_overwrite(const svn_test_opts_t *op SVN_ERR(make_greek_tree(repos_url, pool)); SVN_ERR(svn_client_create_context2(&ctx, NULL, pool)); - SVN_ERR(svn_client_mtcc_create(&mtcc, repos_url, 1, ctx, pool, pool)); + SVN_ERR(svn_client__mtcc_create(&mtcc, repos_url, 1, ctx, pool, pool)); - SVN_ERR(svn_client_mtcc_add_copy("A", 1, "AA", mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_copy("A", 1, "AA", mtcc, pool)); - SVN_TEST_ASSERT_ERROR(svn_client_mtcc_add_mkdir("AA/B", mtcc, pool), + SVN_TEST_ASSERT_ERROR(svn_client__mtcc_add_mkdir("AA/B", mtcc, pool), SVN_ERR_FS_ALREADY_EXISTS); - SVN_TEST_ASSERT_ERROR(svn_client_mtcc_add_mkdir("AA/D/H/chi", mtcc, pool), + SVN_TEST_ASSERT_ERROR(svn_client__mtcc_add_mkdir("AA/D/H/chi", mtcc, pool), SVN_ERR_FS_ALREADY_EXISTS); - SVN_ERR(svn_client_mtcc_add_mkdir("AA/BB", mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_mkdir("AA/BB", mtcc, pool)); SVN_ERR(verify_mtcc_commit(mtcc, 2, pool)); return SVN_NO_ERROR; @@ -363,7 +363,7 @@ static svn_error_t * test_anchoring(const svn_test_opts_t *opts, apr_pool_t *pool) { - svn_client_mtcc_t *mtcc; + svn_client__mtcc_t *mtcc; svn_client_ctx_t *ctx; const char *repos_abspath; const char *repos_url; @@ -379,70 +379,70 @@ test_anchoring(const svn_test_opts_t *op SVN_ERR(svn_client_create_context2(&ctx, NULL, pool)); /* Update a file as root operation */ - SVN_ERR(svn_client_mtcc_create(&mtcc, - svn_path_url_add_component2(repos_url, "iota", - pool), - 1, ctx, pool, pool)); - SVN_ERR(svn_client_mtcc_add_update_file("", - cstr_stream("new-iota", pool), - NULL, NULL, NULL, - mtcc, pool)); - SVN_ERR(svn_client_mtcc_add_propset("", "key", - svn_string_create("value", pool), - FALSE, mtcc, pool)); + SVN_ERR(svn_client__mtcc_create(&mtcc, + svn_path_url_add_component2(repos_url, "iota", + pool), + 1, ctx, pool, pool)); + SVN_ERR(svn_client__mtcc_add_update_file("", + cstr_stream("new-iota", pool), + NULL, NULL, NULL, + mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_propset("", "key", + svn_string_create("value", pool), + FALSE, mtcc, pool)); SVN_ERR(verify_mtcc_commit(mtcc, 2, pool)); /* Add a directory as root operation */ - SVN_ERR(svn_client_mtcc_create(&mtcc, - svn_path_url_add_component2(repos_url, "BB", - pool), - 2, ctx, pool, pool)); - SVN_ERR(svn_client_mtcc_add_mkdir("", mtcc, pool)); + SVN_ERR(svn_client__mtcc_create(&mtcc, + svn_path_url_add_component2(repos_url, "BB", + pool), + 2, ctx, pool, pool)); + SVN_ERR(svn_client__mtcc_add_mkdir("", mtcc, pool)); SVN_ERR(verify_mtcc_commit(mtcc, 3, pool)); /* Add a file as root operation */ - SVN_ERR(svn_client_mtcc_create(&mtcc, - svn_path_url_add_component2(repos_url, "new", - pool), - 3, ctx, pool, pool)); - SVN_ERR(svn_client_mtcc_add_add_file("", cstr_stream("new", pool), NULL, - mtcc, pool)); + SVN_ERR(svn_client__mtcc_create(&mtcc, + svn_path_url_add_component2(repos_url, "new", + pool), + 3, ctx, pool, pool)); + SVN_ERR(svn_client__mtcc_add_add_file("", cstr_stream("new", pool), NULL, + mtcc, pool)); SVN_ERR(verify_mtcc_commit(mtcc, 4, pool)); /* Delete as root operation */ - SVN_ERR(svn_client_mtcc_create(&mtcc, - svn_path_url_add_component2(repos_url, "new", - pool), - 4, ctx, pool, pool)); - SVN_ERR(svn_client_mtcc_add_delete("", mtcc, pool)); + SVN_ERR(svn_client__mtcc_create(&mtcc, + svn_path_url_add_component2(repos_url, "new", + pool), + 4, ctx, pool, pool)); + SVN_ERR(svn_client__mtcc_add_delete("", mtcc, pool)); SVN_ERR(verify_mtcc_commit(mtcc, 5, pool)); /* Propset file as root operation */ - SVN_ERR(svn_client_mtcc_create(&mtcc, - svn_path_url_add_component2(repos_url, "A/mu", - pool), - 5, ctx, pool, pool)); - SVN_ERR(svn_client_mtcc_add_propset("", "key", - svn_string_create("val", pool), - FALSE, mtcc, pool)); + SVN_ERR(svn_client__mtcc_create(&mtcc, + svn_path_url_add_component2(repos_url, "A/mu", + pool), + 5, ctx, pool, pool)); + SVN_ERR(svn_client__mtcc_add_propset("", "key", + svn_string_create("val", pool), + FALSE, mtcc, pool)); SVN_ERR(verify_mtcc_commit(mtcc, 6, pool)); /* Propset dir as root operation */ - SVN_ERR(svn_client_mtcc_create(&mtcc, - svn_path_url_add_component2(repos_url, "A", - pool), - 6, ctx, pool, pool)); - SVN_ERR(svn_client_mtcc_add_propset("", "key", - svn_string_create("val", pool), - FALSE, mtcc, pool)); + SVN_ERR(svn_client__mtcc_create(&mtcc, + svn_path_url_add_component2(repos_url, "A", + pool), + 6, ctx, pool, pool)); + SVN_ERR(svn_client__mtcc_add_propset("", "key", + svn_string_create("val", pool), + FALSE, mtcc, pool)); SVN_ERR(verify_mtcc_commit(mtcc, 7, pool)); /* Propset reposroot as root operation */ - SVN_ERR(svn_client_mtcc_create(&mtcc, repos_url, 7, ctx, pool, pool)); - SVN_ERR(svn_client_mtcc_add_propset("", "key", - svn_string_create("val", pool), - FALSE, mtcc, pool)); + SVN_ERR(svn_client__mtcc_create(&mtcc, repos_url, 7, ctx, pool, pool)); + SVN_ERR(svn_client__mtcc_add_propset("", "key", + svn_string_create("val", pool), + FALSE, mtcc, pool)); SVN_ERR(verify_mtcc_commit(mtcc, 8, pool)); return SVN_NO_ERROR; @@ -452,7 +452,7 @@ static svn_error_t * test_replace_tree(const svn_test_opts_t *opts, apr_pool_t *pool) { - svn_client_mtcc_t *mtcc; + svn_client__mtcc_t *mtcc; svn_client_ctx_t *ctx; const char *repos_abspath; const char *repos_url; @@ -468,16 +468,16 @@ test_replace_tree(const svn_test_opts_t SVN_ERR(svn_client_create_context2(&ctx, NULL, pool)); /* Update a file as root operation */ - SVN_ERR(svn_client_mtcc_create(&mtcc, repos_url, 1, ctx, pool, pool)); + SVN_ERR(svn_client__mtcc_create(&mtcc, repos_url, 1, ctx, pool, pool)); - SVN_ERR(svn_client_mtcc_add_delete("A", mtcc, pool)); - SVN_ERR(svn_client_mtcc_add_delete("iota", mtcc, pool)); - SVN_ERR(svn_client_mtcc_add_mkdir("A", mtcc, pool)); - SVN_ERR(svn_client_mtcc_add_mkdir("A/B", mtcc, pool)); - SVN_ERR(svn_client_mtcc_add_mkdir("A/B/C", mtcc, pool)); - SVN_ERR(svn_client_mtcc_add_mkdir("M", mtcc, pool)); - SVN_ERR(svn_client_mtcc_add_mkdir("M/N", mtcc, pool)); - SVN_ERR(svn_client_mtcc_add_mkdir("M/N/O", mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_delete("A", mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_delete("iota", mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_mkdir("A", mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_mkdir("A/B", mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_mkdir("A/B/C", mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_mkdir("M", mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_mkdir("M/N", mtcc, pool)); + SVN_ERR(svn_client__mtcc_add_mkdir("M/N/O", mtcc, pool)); SVN_ERR(verify_mtcc_commit(mtcc, 2, pool)); Modified: subversion/branches/move-tracking-2/subversion/tests/libsvn_fs/locks-test.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/tests/libsvn_fs/locks-test.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/tests/libsvn_fs/locks-test.c (original) +++ subversion/branches/move-tracking-2/subversion/tests/libsvn_fs/locks-test.c Wed Jul 30 11:23:49 2014 @@ -946,7 +946,7 @@ lock_multiple_paths(const svn_test_opts_ /* Unlock without force and wrong tokens. */ for (hi = apr_hash_first(pool, lock_paths); hi; hi = apr_hash_next(hi)) - svn_hash_sets(unlock_paths, svn__apr_hash_index_key(hi), "wrong-token"); + svn_hash_sets(unlock_paths, apr_hash_this_key(hi), "wrong-token"); apr_hash_clear(baton.results); SVN_ERR(svn_fs_unlock_many(fs, unlock_paths, FALSE, lock_many_cb, &baton, pool, pool)); @@ -963,7 +963,7 @@ lock_multiple_paths(const svn_test_opts_ /* Force unlock. */ for (hi = apr_hash_first(pool, lock_paths); hi; hi = apr_hash_next(hi)) - svn_hash_sets(unlock_paths, svn__apr_hash_index_key(hi), ""); + svn_hash_sets(unlock_paths, apr_hash_this_key(hi), ""); apr_hash_clear(baton.results); SVN_ERR(svn_fs_unlock_many(fs, unlock_paths, TRUE, lock_many_cb, &baton, pool, pool)); @@ -997,8 +997,8 @@ lock_multiple_paths(const svn_test_opts_ /* Unlock without force. */ for (hi = apr_hash_first(pool, baton.results); hi; hi = apr_hash_next(hi)) { - struct lock_result_t *result = svn__apr_hash_index_val(hi); - svn_hash_sets(unlock_paths, svn__apr_hash_index_key(hi), + struct lock_result_t *result = apr_hash_this_val(hi); + svn_hash_sets(unlock_paths, apr_hash_this_key(hi), result->lock ? result->lock->token : "non-existent-token"); } apr_hash_clear(baton.results); Modified: subversion/branches/move-tracking-2/subversion/tests/libsvn_ra/ra-test.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/tests/libsvn_ra/ra-test.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/tests/libsvn_ra/ra-test.c (original) +++ subversion/branches/move-tracking-2/subversion/tests/libsvn_ra/ra-test.c Wed Jul 30 11:23:49 2014 @@ -513,7 +513,7 @@ lock_test(const svn_test_opts_t *opts, /* Unlock without force and wrong lock tokens */ for (hi = apr_hash_first(pool, lock_targets); hi; hi = apr_hash_next(hi)) - svn_hash_sets(unlock_targets, svn__apr_hash_index_key(hi), "wrong-token"); + svn_hash_sets(unlock_targets, apr_hash_this_key(hi), "wrong-token"); apr_hash_clear(baton.results); SVN_ERR(svn_ra_unlock(session, unlock_targets, FALSE, lock_cb, &baton, pool)); @@ -525,7 +525,7 @@ lock_test(const svn_test_opts_t *opts, /* Force unlock */ for (hi = apr_hash_first(pool, lock_targets); hi; hi = apr_hash_next(hi)) - svn_hash_sets(unlock_targets, svn__apr_hash_index_key(hi), ""); + svn_hash_sets(unlock_targets, apr_hash_this_key(hi), ""); apr_hash_clear(baton.results); SVN_ERR(svn_ra_unlock(session, unlock_targets, TRUE, lock_cb, &baton, pool)); @@ -548,8 +548,8 @@ lock_test(const svn_test_opts_t *opts, for (hi = apr_hash_first(pool, baton.results); hi; hi = apr_hash_next(hi)) { - result = svn__apr_hash_index_val(hi); - svn_hash_sets(unlock_targets, svn__apr_hash_index_key(hi), + result = apr_hash_this_val(hi); + svn_hash_sets(unlock_targets, apr_hash_this_key(hi), result->lock ? result->lock->token : "non-existent-token"); } apr_hash_clear(baton.results); Modified: subversion/branches/move-tracking-2/subversion/tests/libsvn_subr/dirent_uri-test.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/tests/libsvn_subr/dirent_uri-test.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/tests/libsvn_subr/dirent_uri-test.c (original) +++ subversion/branches/move-tracking-2/subversion/tests/libsvn_subr/dirent_uri-test.c Wed Jul 30 11:23:49 2014 @@ -1987,8 +1987,8 @@ test_dirent_get_absolute_from_lc_drive(a for (hi = apr_hash_first(pool, dirents); hi; hi = apr_hash_next(hi)) { - const char *dir = svn__apr_hash_index_key(hi); - svn_io_dirent2_t *de = svn__apr_hash_index_val(hi); + const char *dir = apr_hash_this_key(hi); + svn_io_dirent2_t *de = apr_hash_this_val(hi); if (de->kind == svn_node_dir && strcmp(dir, current_dir_on_C)) Modified: subversion/branches/move-tracking-2/subversion/tests/libsvn_wc/op-depth-test.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/tests/libsvn_wc/op-depth-test.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/tests/libsvn_wc/op-depth-test.c (original) +++ subversion/branches/move-tracking-2/subversion/tests/libsvn_wc/op-depth-test.c Wed Jul 30 11:23:49 2014 @@ -441,7 +441,7 @@ check_db_conflicts(svn_test__sandbox_t * for (hi = apr_hash_first(b->pool, found_hash); hi; hi = apr_hash_next(hi)) { svn_skel_t *conflict; - conflict_info_t *info = svn__apr_hash_index_val(hi); + conflict_info_t *info = apr_hash_this_val(hi); const char *local_abspath; svn_pool_clear(iterpool); @@ -2050,7 +2050,7 @@ check_db_actual(svn_test__sandbox_t* b, if (apr_hash_count(path_hash)) { const char *local_relpath - = svn__apr_hash_index_key(apr_hash_first(b->pool, path_hash)); + = apr_hash_this_key(apr_hash_first(b->pool, path_hash)); return svn_error_createf(SVN_ERR_TEST_FAILED, svn_sqlite__reset(stmt), "actual '%s' expected", local_relpath); } @@ -2651,7 +2651,7 @@ check_hash_keys(apr_hash_t *hash, for (hi = apr_hash_first(scratch_pool, hash); hi; hi = apr_hash_next(hi)) { - const char *name = svn__apr_hash_index_key(hi); + const char *name = apr_hash_this_key(hi); err = svn_error_compose_create( err, svn_error_createf(SVN_ERR_TEST_FAILED, NULL, _("Found, not expected: '%s'"), name)); Modified: subversion/branches/move-tracking-2/subversion/tests/svn_test_fs.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/tests/svn_test_fs.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/subversion/tests/svn_test_fs.c (original) +++ subversion/branches/move-tracking-2/subversion/tests/svn_test_fs.c Wed Jul 30 11:23:49 2014 @@ -548,23 +548,23 @@ svn_test__validate_changes(svn_fs_root_t { int i; for (i=0, hi = apr_hash_first(pool, expected); hi; hi = apr_hash_next(hi)) - SVN_DBG(("expected[%d] = '%s'\n", i++, svn__apr_hash_index_key(hi))); + SVN_DBG(("expected[%d] = '%s'\n", i++, apr_hash_this_key(hi))); for (i=0, hi = apr_hash_first(pool, actual); hi; hi = apr_hash_next(hi)) - SVN_DBG(("actual[%d] = '%s'\n", i++, svn__apr_hash_index_key(hi))); + SVN_DBG(("actual[%d] = '%s'\n", i++, apr_hash_this_key(hi))); } #endif for (hi = apr_hash_first(pool, expected); hi; hi = apr_hash_next(hi)) - if (NULL == svn_hash_gets(actual, svn__apr_hash_index_key(hi))) + if (NULL == svn_hash_gets(actual, apr_hash_this_key(hi))) return svn_error_createf(SVN_ERR_TEST_FAILED, NULL, "Path '%s' missing from actual changed-paths", - (const char *)svn__apr_hash_index_key(hi)); + (const char *)apr_hash_this_key(hi)); for (hi = apr_hash_first(pool, actual); hi; hi = apr_hash_next(hi)) - if (NULL == svn_hash_gets(expected, svn__apr_hash_index_key(hi))) + if (NULL == svn_hash_gets(expected, apr_hash_this_key(hi))) return svn_error_createf(SVN_ERR_TEST_FAILED, NULL, "Path '%s' missing from expected changed-paths", - (const char *)svn__apr_hash_index_key(hi)); + (const char *)apr_hash_this_key(hi)); return SVN_NO_ERROR; } Modified: subversion/branches/move-tracking-2/tools/client-side/svn-bench/null-info-cmd.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/tools/client-side/svn-bench/null-info-cmd.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/tools/client-side/svn-bench/null-info-cmd.c (original) +++ subversion/branches/move-tracking-2/tools/client-side/svn-bench/null-info-cmd.c Wed Jul 30 11:23:49 2014 @@ -80,8 +80,8 @@ push_dir_info(svn_ra_session_t *ra_sessi for (hi = apr_hash_first(pool, tmpdirents); hi; hi = apr_hash_next(hi)) { const char *path; - const char *name = svn__apr_hash_index_key(hi); - svn_dirent_t *the_ent = svn__apr_hash_index_val(hi); + const char *name = apr_hash_this_key(hi); + svn_dirent_t *the_ent = apr_hash_this_val(hi); svn_client__pathrev_t *child_pathrev; svn_pool_clear(subpool); Modified: subversion/branches/move-tracking-2/tools/dev/gdb-py/svndbg/printers.py URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/tools/dev/gdb-py/svndbg/printers.py?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/tools/dev/gdb-py/svndbg/printers.py (original) +++ subversion/branches/move-tracking-2/tools/dev/gdb-py/svndbg/printers.py Wed Jul 30 11:23:49 2014 @@ -145,8 +145,8 @@ cstringType = gdb.lookup_type('char').po apr_hash_count = InferiorFunction('apr_hash_count') apr_hash_first = InferiorFunction('apr_hash_first') apr_hash_next = InferiorFunction('apr_hash_next') -svn__apr_hash_index_key = InferiorFunction('svn__apr_hash_index_key') -svn__apr_hash_index_val = InferiorFunction('svn__apr_hash_index_val') +apr_hash_this_key = InferiorFunction('apr_hash_this_key') +apr_hash_this_val = InferiorFunction('apr_hash_this_val') def children_of_apr_hash(hash_p, value_type=None): """Iterate over an 'apr_hash_t *' GDB value, in the way required for a @@ -156,9 +156,9 @@ def children_of_apr_hash(hash_p, value_t """ hi = apr_hash_first(0, hash_p) while (hi): - k = svn__apr_hash_index_key(hi).reinterpret_cast(cstringType) + k = apr_hash_this_key(hi).reinterpret_cast(cstringType) if value_type: - val = svn__apr_hash_index_val(hi).reinterpret_cast(value_type) + val = apr_hash_this_val(hi).reinterpret_cast(value_type) else: val = '...' try: Modified: subversion/branches/move-tracking-2/tools/server-side/svn-rep-sharing-stats.c URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/tools/server-side/svn-rep-sharing-stats.c?rev=1614616&r1=1614615&r2=1614616&view=diff ============================================================================== --- subversion/branches/move-tracking-2/tools/server-side/svn-rep-sharing-stats.c (original) +++ subversion/branches/move-tracking-2/tools/server-side/svn-rep-sharing-stats.c Wed Jul 30 11:23:49 2014 @@ -282,8 +282,8 @@ process_one_revision(svn_fs_t *fs, node_revision_t *node_rev; - path = svn__apr_hash_index_key(hi); - change = svn__apr_hash_index_val(hi); + path = apr_hash_this_key(hi); + change = apr_hash_this_val(hi); if (! quiet) SVN_ERR(svn_cmdline_fprintf(stderr, scratch_pool, "processing r%ld:%s\n", revnum, path)); @@ -341,7 +341,7 @@ pretty_print(const char *name, SVN_ERR(cancel_func(NULL)); - value = svn__apr_hash_index_val(hi); + value = apr_hash_this_val(hi); SVN_ERR(svn_cmdline_printf(scratch_pool, "%s %" APR_UINT64_T_FMT " %s\n", name, value->refcount, svn_checksum_to_cstring_display(
