Author: julianfoad
Date: Wed Jul 30 11:23:49 2014
New Revision: 1614616
URL: http://svn.apache.org/r1614616
Log:
On the 'move-tracking-2' branch: catch up with trunk@1614615.
Added:
subversion/branches/move-tracking-2/subversion/include/private/svn_client_mtcc.h
- copied unchanged from r1614611,
subversion/trunk/subversion/include/private/svn_client_mtcc.h
Removed:
subversion/branches/move-tracking-2/subversion/include/svn_client_mtcc.h
Modified:
subversion/branches/move-tracking-2/ (props changed)
subversion/branches/move-tracking-2/build.conf
subversion/branches/move-tracking-2/subversion/bindings/javahl/native/CreateJ.cpp
subversion/branches/move-tracking-2/subversion/bindings/javahl/native/LogMessageCallback.cpp
subversion/branches/move-tracking-2/subversion/bindings/swig/python/svn/core.py
subversion/branches/move-tracking-2/subversion/include/svn_types.h
subversion/branches/move-tracking-2/subversion/libsvn_client/add.c
subversion/branches/move-tracking-2/subversion/libsvn_client/blame.c
subversion/branches/move-tracking-2/subversion/libsvn_client/commit.c
subversion/branches/move-tracking-2/subversion/libsvn_client/commit_util.c
subversion/branches/move-tracking-2/subversion/libsvn_client/copy_foreign.c
subversion/branches/move-tracking-2/subversion/libsvn_client/delete.c
subversion/branches/move-tracking-2/subversion/libsvn_client/deprecated.c
subversion/branches/move-tracking-2/subversion/libsvn_client/diff_summarize.c
subversion/branches/move-tracking-2/subversion/libsvn_client/export.c
subversion/branches/move-tracking-2/subversion/libsvn_client/externals.c
subversion/branches/move-tracking-2/subversion/libsvn_client/import.c
subversion/branches/move-tracking-2/subversion/libsvn_client/info.c
subversion/branches/move-tracking-2/subversion/libsvn_client/iprops.c
subversion/branches/move-tracking-2/subversion/libsvn_client/list.c
subversion/branches/move-tracking-2/subversion/libsvn_client/locking_commands.c
subversion/branches/move-tracking-2/subversion/libsvn_client/merge.c
subversion/branches/move-tracking-2/subversion/libsvn_client/mergeinfo.c
subversion/branches/move-tracking-2/subversion/libsvn_client/mtcc.c
subversion/branches/move-tracking-2/subversion/libsvn_client/patch.c
subversion/branches/move-tracking-2/subversion/libsvn_client/prop_commands.c
subversion/branches/move-tracking-2/subversion/libsvn_client/ra.c
subversion/branches/move-tracking-2/subversion/libsvn_client/relocate.c
subversion/branches/move-tracking-2/subversion/libsvn_client/repos_diff.c
subversion/branches/move-tracking-2/subversion/libsvn_client/upgrade.c
subversion/branches/move-tracking-2/subversion/libsvn_delta/compat.c
subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3.c
subversion/branches/move-tracking-2/subversion/libsvn_diff/util.c
subversion/branches/move-tracking-2/subversion/libsvn_fs/editor.c
subversion/branches/move-tracking-2/subversion/libsvn_fs/fs-loader.c
subversion/branches/move-tracking-2/subversion/libsvn_fs_base/lock.c
subversion/branches/move-tracking-2/subversion/libsvn_fs_base/tree.c
subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/cached_data.c
subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/lock.c
subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/recovery.c
subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/temp_serializer.c
subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/transaction.c
subversion/branches/move-tracking-2/subversion/libsvn_fs_util/fs-util.c
subversion/branches/move-tracking-2/subversion/libsvn_fs_x/ (props
changed)
subversion/branches/move-tracking-2/subversion/libsvn_fs_x/cached_data.c
subversion/branches/move-tracking-2/subversion/libsvn_fs_x/lock.c
subversion/branches/move-tracking-2/subversion/libsvn_fs_x/temp_serializer.c
subversion/branches/move-tracking-2/subversion/libsvn_fs_x/transaction.c
subversion/branches/move-tracking-2/subversion/libsvn_ra/compat.c
subversion/branches/move-tracking-2/subversion/libsvn_ra/ra_loader.c
subversion/branches/move-tracking-2/subversion/libsvn_ra_local/ra_plugin.c
subversion/branches/move-tracking-2/subversion/libsvn_ra_serf/commit.c
subversion/branches/move-tracking-2/subversion/libsvn_ra_serf/inherited_props.c
subversion/branches/move-tracking-2/subversion/libsvn_ra_serf/lock.c
subversion/branches/move-tracking-2/subversion/libsvn_ra_serf/update.c
subversion/branches/move-tracking-2/subversion/libsvn_ra_svn/client.c
subversion/branches/move-tracking-2/subversion/libsvn_repos/delta.c
subversion/branches/move-tracking-2/subversion/libsvn_repos/fs-wrap.c
subversion/branches/move-tracking-2/subversion/libsvn_repos/hooks.c
subversion/branches/move-tracking-2/subversion/libsvn_repos/load-fs-vtable.c
subversion/branches/move-tracking-2/subversion/libsvn_repos/log.c
subversion/branches/move-tracking-2/subversion/libsvn_repos/replay.c
subversion/branches/move-tracking-2/subversion/libsvn_repos/reporter.c
subversion/branches/move-tracking-2/subversion/libsvn_repos/rev_hunt.c
subversion/branches/move-tracking-2/subversion/libsvn_subr/config_auth.c
subversion/branches/move-tracking-2/subversion/libsvn_subr/debug.c
subversion/branches/move-tracking-2/subversion/libsvn_subr/hash.c
subversion/branches/move-tracking-2/subversion/libsvn_subr/io.c
subversion/branches/move-tracking-2/subversion/libsvn_subr/iter.c
subversion/branches/move-tracking-2/subversion/libsvn_subr/log.c
subversion/branches/move-tracking-2/subversion/libsvn_subr/mergeinfo.c
subversion/branches/move-tracking-2/subversion/libsvn_subr/object_pool.c
subversion/branches/move-tracking-2/subversion/libsvn_wc/adm_crawler.c
subversion/branches/move-tracking-2/subversion/libsvn_wc/adm_ops.c
subversion/branches/move-tracking-2/subversion/libsvn_wc/conflicts.c
subversion/branches/move-tracking-2/subversion/libsvn_wc/copy.c
subversion/branches/move-tracking-2/subversion/libsvn_wc/deprecated.c
subversion/branches/move-tracking-2/subversion/libsvn_wc/entries.c
subversion/branches/move-tracking-2/subversion/libsvn_wc/info.c
subversion/branches/move-tracking-2/subversion/libsvn_wc/lock.c
subversion/branches/move-tracking-2/subversion/libsvn_wc/node.c
subversion/branches/move-tracking-2/subversion/libsvn_wc/old-and-busted.c
subversion/branches/move-tracking-2/subversion/libsvn_wc/props.c
subversion/branches/move-tracking-2/subversion/libsvn_wc/status.c
subversion/branches/move-tracking-2/subversion/libsvn_wc/update_editor.c
subversion/branches/move-tracking-2/subversion/libsvn_wc/upgrade.c
subversion/branches/move-tracking-2/subversion/libsvn_wc/wc_db.c
subversion/branches/move-tracking-2/subversion/libsvn_wc/wc_db_wcroot.c
subversion/branches/move-tracking-2/subversion/mod_dav_svn/reports/inherited-props.c
subversion/branches/move-tracking-2/subversion/mod_dav_svn/version.c
subversion/branches/move-tracking-2/subversion/svn/log-cmd.c
subversion/branches/move-tracking-2/subversion/svn/propget-cmd.c
subversion/branches/move-tracking-2/subversion/svn/status-cmd.c
subversion/branches/move-tracking-2/subversion/svn/svn.c
subversion/branches/move-tracking-2/subversion/svnadmin/svnadmin.c
subversion/branches/move-tracking-2/subversion/svndumpfilter/svndumpfilter.c
subversion/branches/move-tracking-2/subversion/svnlook/svnlook.c
subversion/branches/move-tracking-2/subversion/svnmucc/svnmucc.c
subversion/branches/move-tracking-2/subversion/svnrdump/dump_editor.c
subversion/branches/move-tracking-2/subversion/svnrdump/load_editor.c
subversion/branches/move-tracking-2/subversion/svnrdump/util.c
subversion/branches/move-tracking-2/subversion/svnserve/serve.c
subversion/branches/move-tracking-2/subversion/svnsync/svnsync.c
subversion/branches/move-tracking-2/subversion/svnsync/sync.c
subversion/branches/move-tracking-2/subversion/tests/cmdline/entries-dump.c
subversion/branches/move-tracking-2/subversion/tests/libsvn_client/client-test.c
subversion/branches/move-tracking-2/subversion/tests/libsvn_client/mtcc-test.c
subversion/branches/move-tracking-2/subversion/tests/libsvn_fs/locks-test.c
subversion/branches/move-tracking-2/subversion/tests/libsvn_ra/ra-test.c
subversion/branches/move-tracking-2/subversion/tests/libsvn_subr/dirent_uri-test.c
subversion/branches/move-tracking-2/subversion/tests/libsvn_wc/op-depth-test.c
subversion/branches/move-tracking-2/subversion/tests/svn_test_fs.c
subversion/branches/move-tracking-2/tools/client-side/svn-bench/null-info-cmd.c
subversion/branches/move-tracking-2/tools/dev/gdb-py/svndbg/printers.py
subversion/branches/move-tracking-2/tools/server-side/svn-rep-sharing-stats.c
Propchange: subversion/branches/move-tracking-2/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1614386-1614615
Modified: subversion/branches/move-tracking-2/build.conf
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/build.conf?rev=1614616&r1=1614615&r2=1614616&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/build.conf (original)
+++ subversion/branches/move-tracking-2/build.conf Wed Jul 30 11:23:49 2014
@@ -242,7 +242,7 @@ type = lib
path = subversion/libsvn_client
libs = libsvn_wc libsvn_ra libsvn_delta libsvn_diff libsvn_subr apriconv apr
install = lib
-msvc-export = svn_client.h svn_client_mtcc.h private/svn_client_private.h
+msvc-export = svn_client.h private/svn_client_mtcc.h
private/svn_client_private.h
# Routines for binary diffing and tree-deltas
[libsvn_delta]
Modified:
subversion/branches/move-tracking-2/subversion/bindings/javahl/native/CreateJ.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/bindings/javahl/native/CreateJ.cpp?rev=1614616&r1=1614615&r2=1614616&view=diff
==============================================================================
---
subversion/branches/move-tracking-2/subversion/bindings/javahl/native/CreateJ.cpp
(original)
+++
subversion/branches/move-tracking-2/subversion/bindings/javahl/native/CreateJ.cpp
Wed Jul 30 11:23:49 2014
@@ -523,8 +523,8 @@ CreateJ::LockMap(const apr_hash_t *locks
for (hi = apr_hash_first(pool, (apr_hash_t *) locks); hi;
hi = apr_hash_next(hi), ++i)
{
- const char *key = (const char *) svn__apr_hash_index_key(hi);
- const svn_lock_t *lock = (const svn_lock_t *)
svn__apr_hash_index_val(hi);
+ const char *key = (const char *) apr_hash_this_key(hi);
+ const svn_lock_t *lock = (const svn_lock_t *) apr_hash_this_val(hi);
jstring jpath = JNIUtil::makeJString(key);
if (JNIUtil::isJavaExceptionThrown())
Modified:
subversion/branches/move-tracking-2/subversion/bindings/javahl/native/LogMessageCallback.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/bindings/javahl/native/LogMessageCallback.cpp?rev=1614616&r1=1614615&r2=1614616&view=diff
==============================================================================
---
subversion/branches/move-tracking-2/subversion/bindings/javahl/native/LogMessageCallback.cpp
(original)
+++
subversion/branches/move-tracking-2/subversion/bindings/javahl/native/LogMessageCallback.cpp
Wed Jul 30 11:23:49 2014
@@ -103,9 +103,9 @@ LogMessageCallback::singleMessage(svn_lo
hi = apr_hash_next(hi))
{
const char *path =
- reinterpret_cast<const char *>(svn__apr_hash_index_key(hi));
+ reinterpret_cast<const char *>(apr_hash_this_key(hi));
svn_log_changed_path2_t *log_item =
- reinterpret_cast<svn_log_changed_path2_t
*>(svn__apr_hash_index_val(hi));
+ reinterpret_cast<svn_log_changed_path2_t *>(apr_hash_this_val(hi));
jobject cp = CreateJ::ChangedPath(path, log_item);
Modified:
subversion/branches/move-tracking-2/subversion/bindings/swig/python/svn/core.py
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/bindings/swig/python/svn/core.py?rev=1614616&r1=1614615&r2=1614616&view=diff
==============================================================================
---
subversion/branches/move-tracking-2/subversion/bindings/swig/python/svn/core.py
(original)
+++
subversion/branches/move-tracking-2/subversion/bindings/swig/python/svn/core.py
Wed Jul 30 11:23:49 2014
@@ -316,7 +316,6 @@ def run_app(func, *args, **kw):
# 'apr_pool_clear' 'apr_pool_destroy' 'apr_pool_t'
# 'apr_time_ansi_put'
# 'run_app'
-# 'svn__apr_hash_index_key' 'svn__apr_hash_index_klen'
'svn__apr_hash_index_val'
# 'svn_relpath__internal_style' 'svn_uri__is_ancestor'
# 'svn_tristate__from_word' 'svn_tristate__to_word'
__all__ = filter(lambda s: (s.startswith('svn_')
Modified: subversion/branches/move-tracking-2/subversion/include/svn_types.h
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/include/svn_types.h?rev=1614616&r1=1614615&r2=1614616&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/include/svn_types.h
(original)
+++ subversion/branches/move-tracking-2/subversion/include/svn_types.h Wed Jul
30 11:23:49 2014
@@ -32,6 +32,7 @@
#include <limits.h> /* for ULONG_MAX */
#include <apr.h> /* for apr_size_t, apr_int64_t, ... */
+#include <apr_version.h>
#include <apr_errno.h> /* for apr_status_t */
#include <apr_pools.h> /* for apr_pool_t */
#include <apr_hash.h> /* for apr_hash_t */
@@ -245,21 +246,26 @@ typedef struct svn_version_t svn_version
* These functions enable the caller to dereference an APR hash table index
* without type casts or temporary variables.
*
- * ### These are private, and may go away when APR implements them natively.
+ * These functions are provided by APR itself from version 1.5.
+ * Definitions are provided here for when using older versions of APR.
* @{
*/
+#if !APR_VERSION_AT_LEAST(1, 5, 0)
+
/** Return the key of the hash table entry indexed by @a hi. */
const void *
-svn__apr_hash_index_key(const apr_hash_index_t *hi);
+apr_hash_this_key(apr_hash_index_t *hi);
/** Return the key length of the hash table entry indexed by @a hi. */
apr_ssize_t
-svn__apr_hash_index_klen(const apr_hash_index_t *hi);
+apr_hash_this_key_len(apr_hash_index_t *hi);
/** Return the value of the hash table entry indexed by @a hi. */
void *
-svn__apr_hash_index_val(const apr_hash_index_t *hi);
+apr_hash_this_val(apr_hash_index_t *hi);
+
+#endif
/** @} */
Modified: subversion/branches/move-tracking-2/subversion/libsvn_client/add.c
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_client/add.c?rev=1614616&r1=1614615&r2=1614616&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_client/add.c
(original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_client/add.c Wed Jul
30 11:23:49 2014
@@ -169,8 +169,8 @@ get_auto_props_for_pattern(apr_hash_t *p
hi != NULL;
hi = apr_hash_next(hi))
{
- const char *propname = svn__apr_hash_index_key(hi);
- const char *propval = svn__apr_hash_index_val(hi);
+ const char *propname = apr_hash_this_key(hi);
+ const char *propval = apr_hash_this_val(hi);
svn_string_t *propval_str =
svn_string_create_empty(apr_hash_pool_get(properties));
@@ -207,8 +207,8 @@ svn_client__get_paths_auto_props(apr_has
hi != NULL;
hi = apr_hash_next(hi))
{
- const char *pattern = svn__apr_hash_index_key(hi);
- apr_hash_t *propvals = svn__apr_hash_index_val(hi);
+ const char *pattern = apr_hash_this_key(hi);
+ apr_hash_t *propvals = apr_hash_this_val(hi);
get_auto_props_for_pattern(*properties, mimetype, &have_executable,
svn_dirent_basename(path, scratch_pool),
@@ -427,8 +427,8 @@ add_dir_recursive(const char *dir_abspat
version control. */
for (hi = apr_hash_first(scratch_pool, dirents); hi; hi = apr_hash_next(hi))
{
- const char *name = svn__apr_hash_index_key(hi);
- svn_io_dirent2_t *dirent = svn__apr_hash_index_val(hi);
+ const char *name = apr_hash_this_key(hi);
+ svn_io_dirent2_t *dirent = apr_hash_this_val(hi);
const char *abspath;
svn_pool_clear(iterpool);
Modified: subversion/branches/move-tracking-2/subversion/libsvn_client/blame.c
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_client/blame.c?rev=1614616&r1=1614615&r2=1614616&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_client/blame.c
(original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_client/blame.c Wed
Jul 30 11:23:49 2014
@@ -689,7 +689,7 @@ svn_client_blame5(const char *target,
/* Should only be one value */
SVN_ERR_ASSERT(apr_hash_count(props) == 1);
- value = svn__apr_hash_index_val(hi);
+ value = apr_hash_this_val(hi);
if (value && svn_mime_type_is_binary(value->data))
return svn_error_createf
(SVN_ERR_CLIENT_IS_BINARY_FILE, 0,
Modified: subversion/branches/move-tracking-2/subversion/libsvn_client/commit.c
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_client/commit.c?rev=1614616&r1=1614615&r2=1614616&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_client/commit.c
(original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_client/commit.c Wed
Jul 30 11:23:49 2014
@@ -205,8 +205,8 @@ collect_lock_tokens(apr_hash_t **result,
for (hi = apr_hash_first(pool, all_tokens); hi; hi = apr_hash_next(hi))
{
- const char *url = svn__apr_hash_index_key(hi);
- const char *token = svn__apr_hash_index_val(hi);
+ const char *url = apr_hash_this_key(hi);
+ const char *token = apr_hash_this_val(hi);
const char *relpath = svn_uri_skip_ancestor(base_url, url, pool);
if (relpath)
@@ -353,8 +353,8 @@ determine_lock_targets(apr_array_header_
hi = apr_hash_next(hi))
{
const char *common;
- const char *wcroot_abspath = svn__apr_hash_index_key(hi);
- apr_array_header_t *wc_targets = svn__apr_hash_index_val(hi);
+ const char *wcroot_abspath = apr_hash_this_key(hi);
+ apr_array_header_t *wc_targets = apr_hash_this_val(hi);
svn_pool_clear(iterpool);
@@ -680,7 +680,7 @@ svn_client_commit6(const apr_array_heade
apr_hash_index_t *hi = apr_hash_first(iterpool,
committables->by_repository);
- commit_items = svn__apr_hash_index_val(hi);
+ commit_items = apr_hash_this_val(hi);
}
/* If our array of targets contains only locks (and no actual file
Modified:
subversion/branches/move-tracking-2/subversion/libsvn_client/commit_util.c
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_client/commit_util.c?rev=1614616&r1=1614615&r2=1614616&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_client/commit_util.c
(original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_client/commit_util.c
Wed Jul 30 11:23:49 2014
@@ -1257,13 +1257,13 @@ svn_client__harvest_committables(svn_cli
/* Make sure that every path in danglers is part of the commit. */
for (hi = apr_hash_first(scratch_pool, danglers); hi; hi = apr_hash_next(hi))
{
- const char *dangling_parent = svn__apr_hash_index_key(hi);
+ const char *dangling_parent = apr_hash_this_key(hi);
svn_pool_clear(iterpool);
if (! look_up_committable(*committables, dangling_parent, iterpool))
{
- const char *dangling_child = svn__apr_hash_index_val(hi);
+ const char *dangling_child = apr_hash_this_val(hi);
if (ctx->notify_func2 != NULL)
{
@@ -1887,7 +1887,7 @@ svn_client__do_commit(const char *base_u
hi;
hi = apr_hash_next(hi))
{
- struct file_mod_t *mod = svn__apr_hash_index_val(hi);
+ struct file_mod_t *mod = apr_hash_this_val(hi);
const svn_client_commit_item3_t *item = mod->item;
const svn_checksum_t *new_text_base_md5_checksum;
const svn_checksum_t *new_text_base_sha1_checksum;
Modified:
subversion/branches/move-tracking-2/subversion/libsvn_client/copy_foreign.c
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_client/copy_foreign.c?rev=1614616&r1=1614615&r2=1614616&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_client/copy_foreign.c
(original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_client/copy_foreign.c
Wed Jul 30 11:23:49 2014
@@ -528,7 +528,7 @@ svn_client__copy_foreign(const char *url
for (hi = apr_hash_first(scratch_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);
if (svn_property_kind2(name) != svn_prop_regular_kind
|| ! strcmp(name, SVN_PROP_MERGEINFO))
Modified: subversion/branches/move-tracking-2/subversion/libsvn_client/delete.c
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_client/delete.c?rev=1614616&r1=1614615&r2=1614616&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_client/delete.c
(original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_client/delete.c Wed
Jul 30 11:23:49 2014
@@ -305,7 +305,7 @@ delete_urls_multi_repos(const apr_array_
for (hi = apr_hash_first(pool, deletables); hi; hi = apr_hash_next(hi))
{
- const char *repos_root = svn__apr_hash_index_key(hi);
+ const char *repos_root = apr_hash_this_key(hi);
repos_relpath = svn_uri_skip_ancestor(repos_root, uri, pool);
if (repos_relpath)
@@ -313,7 +313,7 @@ delete_urls_multi_repos(const apr_array_
/* Great! We've found another URI underneath this
session. We'll pick out the related RA session for
use later, store the new target, and move on. */
- repos_deletables = svn__apr_hash_index_val(hi);
+ repos_deletables = apr_hash_this_val(hi);
APR_ARRAY_PUSH(repos_deletables->target_uris, const char *) =
apr_pstrdup(pool, uri);
break;
@@ -370,7 +370,7 @@ delete_urls_multi_repos(const apr_array_
iterpool = svn_pool_create(pool);
for (hi = apr_hash_first(pool, deletables); hi; hi = apr_hash_next(hi))
{
- struct repos_deletables_t *repos_deletables =
svn__apr_hash_index_val(hi);
+ struct repos_deletables_t *repos_deletables = apr_hash_this_val(hi);
const char *base_uri;
apr_array_header_t *target_relpaths;
@@ -582,7 +582,7 @@ svn_client_delete4(const apr_array_heade
for (hi = apr_hash_first(pool, wcroots); hi; hi = apr_hash_next(hi))
{
const char *root_abspath;
- const apr_array_header_t *targets = svn__apr_hash_index_val(hi);
+ const apr_array_header_t *targets = apr_hash_this_val(hi);
svn_pool_clear(iterpool);
Modified:
subversion/branches/move-tracking-2/subversion/libsvn_client/deprecated.c
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_client/deprecated.c?rev=1614616&r1=1614615&r2=1614616&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_client/deprecated.c
(original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_client/deprecated.c
Wed Jul 30 11:23:49 2014
@@ -1971,8 +1971,8 @@ svn_client_propget3(apr_hash_t **props,
for (hi = apr_hash_first(pool, temp_props); hi;
hi = apr_hash_next(hi))
{
- const char *abspath = svn__apr_hash_index_key(hi);
- svn_string_t *value = svn__apr_hash_index_val(hi);
+ const char *abspath = apr_hash_this_key(hi);
+ svn_string_t *value = apr_hash_this_val(hi);
const char *relpath = svn_dirent_join(path_or_url,
svn_dirent_skip_ancestor(target, abspath),
pool);
@@ -2032,9 +2032,9 @@ string_hash_dup(apr_hash_t *hash, apr_po
for (hi = apr_hash_first(pool, hash); hi; hi = apr_hash_next(hi))
{
- const char *key = apr_pstrdup(pool, svn__apr_hash_index_key(hi));
- apr_ssize_t klen = svn__apr_hash_index_klen(hi);
- svn_string_t *val = svn_string_dup(svn__apr_hash_index_val(hi), pool);
+ const char *key = apr_pstrdup(pool, apr_hash_this_key(hi));
+ apr_ssize_t klen = apr_hash_this_key_len(hi);
+ svn_string_t *val = svn_string_dup(apr_hash_this_val(hi), pool);
apr_hash_set(new_hash, key, klen, val);
}
Modified:
subversion/branches/move-tracking-2/subversion/libsvn_client/diff_summarize.c
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_client/diff_summarize.c?rev=1614616&r1=1614615&r2=1614616&view=diff
==============================================================================
---
subversion/branches/move-tracking-2/subversion/libsvn_client/diff_summarize.c
(original)
+++
subversion/branches/move-tracking-2/subversion/libsvn_client/diff_summarize.c
Wed Jul 30 11:23:49 2014
@@ -90,7 +90,7 @@ props_changed_hash(apr_hash_t *props,
for (hi = apr_hash_first(scratch_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);
if (svn_property_kind2(name) == svn_prop_regular_kind)
{
Modified: subversion/branches/move-tracking-2/subversion/libsvn_client/export.c
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_client/export.c?rev=1614616&r1=1614615&r2=1614616&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_client/export.c
(original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_client/export.c Wed
Jul 30 11:23:49 2014
@@ -1274,8 +1274,8 @@ export_file(const char *from_path_or_url
* with information. */
for (hi = apr_hash_first(scratch_pool, 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_ERR(change_file_prop(fb, propname, propval, scratch_pool));
}
@@ -1542,7 +1542,7 @@ svn_client_export5(svn_revnum_t *result_
hi;
hi = apr_hash_next(hi))
{
- const char *external_abspath = svn__apr_hash_index_key(hi);
+ const char *external_abspath = apr_hash_this_key(hi);
const char *relpath;
const char *target_abspath;
Modified:
subversion/branches/move-tracking-2/subversion/libsvn_client/externals.c
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_client/externals.c?rev=1614616&r1=1614615&r2=1614616&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_client/externals.c
(original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_client/externals.c
Wed Jul 30 11:23:49 2014
@@ -959,8 +959,8 @@ svn_client__handle_externals(apr_hash_t
hi;
hi = apr_hash_next(hi))
{
- const char *local_abspath = svn__apr_hash_index_key(hi);
- const char *desc_text = svn__apr_hash_index_val(hi);
+ const char *local_abspath = apr_hash_this_key(hi);
+ const char *desc_text = apr_hash_this_val(hi);
svn_depth_t ambient_depth = svn_depth_infinity;
svn_pool_clear(iterpool);
@@ -970,7 +970,7 @@ svn_client__handle_externals(apr_hash_t
const char *ambient_depth_w;
ambient_depth_w = apr_hash_get(ambient_depths, local_abspath,
- svn__apr_hash_index_klen(hi));
+ apr_hash_this_key_len(hi));
if (ambient_depth_w == NULL)
{
@@ -997,8 +997,8 @@ svn_client__handle_externals(apr_hash_t
hi;
hi = apr_hash_next(hi))
{
- const char *item_abspath = svn__apr_hash_index_key(hi);
- const char *defining_abspath = svn__apr_hash_index_val(hi);
+ const char *item_abspath = apr_hash_this_key(hi);
+ const char *defining_abspath = apr_hash_this_val(hi);
const char *parent_abspath;
svn_pool_clear(iterpool);
@@ -1072,8 +1072,8 @@ svn_client__export_externals(apr_hash_t
hi;
hi = apr_hash_next(hi))
{
- const char *local_abspath = svn__apr_hash_index_key(hi);
- const char *desc_text = svn__apr_hash_index_val(hi);
+ const char *local_abspath = apr_hash_this_key(hi);
+ const char *desc_text = apr_hash_this_val(hi);
const char *local_relpath;
const char *dir_url;
apr_array_header_t *items;
Modified: subversion/branches/move-tracking-2/subversion/libsvn_client/import.c
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_client/import.c?rev=1614616&r1=1614615&r2=1614616&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_client/import.c
(original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_client/import.c Wed
Jul 30 11:23:49 2014
@@ -228,8 +228,8 @@ import_file(const svn_delta_editor_t *ed
{
for (hi = apr_hash_first(pool, properties); 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);
SVN_ERR(editor->change_file_prop(file_baton, pname, pval, pool));
}
@@ -302,8 +302,8 @@ get_filtered_children(apr_hash_t **child
for (hi = apr_hash_first(scratch_pool, dirents); hi; hi = apr_hash_next(hi))
{
- const char *base_name = svn__apr_hash_index_key(hi);
- const svn_io_dirent2_t *dirent = svn__apr_hash_index_val(hi);
+ const char *base_name = apr_hash_this_key(hi);
+ const svn_io_dirent2_t *dirent = apr_hash_this_val(hi);
const char *local_abspath;
svn_pool_clear(iterpool);
Modified: subversion/branches/move-tracking-2/subversion/libsvn_client/info.c
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_client/info.c?rev=1614616&r1=1614615&r2=1614616&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_client/info.c
(original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_client/info.c Wed Jul
30 11:23:49 2014
@@ -203,8 +203,8 @@ push_dir_info(svn_ra_session_t *ra_sessi
const char *path, *fs_path;
svn_lock_t *lock;
svn_client_info2_t *info;
- 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/subversion/libsvn_client/iprops.c
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_client/iprops.c?rev=1614616&r1=1614615&r2=1614616&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_client/iprops.c
(original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_client/iprops.c Wed
Jul 30 11:23:49 2014
@@ -176,8 +176,8 @@ get_inheritable_props(apr_hash_t **wcroo
hi;
hi = apr_hash_next(hi))
{
- const char *child_abspath = svn__apr_hash_index_key(hi);
- const char *child_repos_relpath = svn__apr_hash_index_val(hi);
+ const char *child_abspath = apr_hash_this_key(hi);
+ const char *child_repos_relpath = apr_hash_this_val(hi);
const char *url;
apr_array_header_t *inherited_props;
svn_error_t *err;
Modified: subversion/branches/move-tracking-2/subversion/libsvn_client/list.c
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_client/list.c?rev=1614616&r1=1614615&r2=1614616&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_client/list.c
(original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_client/list.c Wed Jul
30 11:23:49 2014
@@ -426,8 +426,8 @@ list_externals(apr_hash_t *externals,
hi;
hi = apr_hash_next(hi))
{
- const char *externals_parent_url = svn__apr_hash_index_key(hi);
- svn_string_t *externals_desc = svn__apr_hash_index_val(hi);
+ const char *externals_parent_url = apr_hash_this_key(hi);
+ svn_string_t *externals_desc = apr_hash_this_val(hi);
apr_array_header_t *external_items;
svn_pool_clear(iterpool);
Modified:
subversion/branches/move-tracking-2/subversion/libsvn_client/locking_commands.c
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_client/locking_commands.c?rev=1614616&r1=1614615&r2=1614616&view=diff
==============================================================================
---
subversion/branches/move-tracking-2/subversion/libsvn_client/locking_commands.c
(original)
+++
subversion/branches/move-tracking-2/subversion/libsvn_client/locking_commands.c
Wed Jul 30 11:23:49 2014
@@ -327,7 +327,7 @@ organize_lock_targets(apr_array_header_t
hi = apr_hash_next(hi))
{
const char *lock_abspath;
- apr_array_header_t *paths = svn__apr_hash_index_val(hi);
+ apr_array_header_t *paths = apr_hash_this_val(hi);
/* Use parent dir of a single file target */
if (paths->nelts == 1)
@@ -354,7 +354,7 @@ organize_lock_targets(apr_array_header_t
hi;
hi = apr_hash_next(hi))
{
- apr_array_header_t *wc_targets = svn__apr_hash_index_val(hi);
+ apr_array_header_t *wc_targets = apr_hash_this_val(hi);
for (i = 0; i < wc_targets->nelts; i++)
{
@@ -411,8 +411,8 @@ organize_lock_targets(apr_array_header_t
hi;
hi = apr_hash_next(hi))
{
- const char *local_abspath = svn__apr_hash_index_key(hi);
- struct wc_lock_item_t *wli = svn__apr_hash_index_val(hi);
+ const char *local_abspath = apr_hash_this_key(hi);
+ struct wc_lock_item_t *wli = apr_hash_this_val(hi);
const char *rel_url;
svn_pool_clear(iterpool);
@@ -484,7 +484,7 @@ fetch_tokens(svn_ra_session_t *ra_sessio
for (hi = apr_hash_first(pool, path_tokens); hi; hi = apr_hash_next(hi))
{
- const char *path = svn__apr_hash_index_key(hi);
+ const char *path = apr_hash_this_key(hi);
svn_lock_t *lock;
svn_pool_clear(iterpool);
Modified: subversion/branches/move-tracking-2/subversion/libsvn_client/merge.c
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_client/merge.c?rev=1614616&r1=1614615&r2=1614616&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_client/merge.c
(original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_client/merge.c Wed
Jul 30 11:23:49 2014
@@ -632,8 +632,8 @@ split_mergeinfo_on_revision(svn_mergeinf
for (hi = apr_hash_first(pool, *mergeinfo); hi; hi = apr_hash_next(hi))
{
int i;
- const char *merge_source_path = svn__apr_hash_index_key(hi);
- svn_rangelist_t *rangelist = svn__apr_hash_index_val(hi);
+ const char *merge_source_path = apr_hash_this_key(hi);
+ svn_rangelist_t *rangelist = apr_hash_this_val(hi);
svn_pool_clear(iterpool);
@@ -862,8 +862,8 @@ filter_self_referential_mergeinfo(apr_ar
hi; hi = apr_hash_next(hi))
{
int j;
- const char *source_path = svn__apr_hash_index_key(hi);
- svn_rangelist_t *rangelist = svn__apr_hash_index_val(hi);
+ const char *source_path = apr_hash_this_key(hi);
+ svn_rangelist_t *rangelist = apr_hash_this_val(hi);
const char *merge_source_url;
svn_rangelist_t *adjusted_rangelist =
apr_array_make(iterpool, 0, sizeof(svn_merge_range_t *));
@@ -1529,14 +1529,14 @@ handle_pending_notifications(merge_cmd_b
hi;
hi = apr_hash_next(hi))
{
- const char *del_abspath = svn__apr_hash_index_key(hi);
+ const char *del_abspath = apr_hash_this_key(hi);
svn_wc_notify_t *notify;
notify = svn_wc_create_notify(del_abspath,
svn_wc_notify_update_delete,
scratch_pool);
notify->kind = svn_node_kind_from_word(
- svn__apr_hash_index_val(hi));
+ apr_hash_this_val(hi));
(*merge_b->ctx->notify_func2)(merge_b->ctx->notify_baton2,
notify, scratch_pool);
@@ -5145,8 +5145,8 @@ update_wc_mergeinfo(svn_mergeinfo_catalo
the WC with its on-disk mergeinfo. */
for (hi = apr_hash_first(scratch_pool, merges); hi; hi = apr_hash_next(hi))
{
- const char *local_abspath = svn__apr_hash_index_key(hi);
- svn_rangelist_t *ranges = svn__apr_hash_index_val(hi);
+ const char *local_abspath = apr_hash_this_key(hi);
+ svn_rangelist_t *ranges = apr_hash_this_val(hi);
svn_rangelist_t *rangelist;
svn_error_t *err;
const char *local_abspath_rel_to_target;
@@ -5297,7 +5297,7 @@ record_skips_in_mergeinfo(const char *me
for (hi = apr_hash_first(scratch_pool, merge_b->skipped_abspaths); hi;
hi = apr_hash_next(hi))
{
- const char *skipped_abspath = svn__apr_hash_index_key(hi);
+ const char *skipped_abspath = apr_hash_this_key(hi);
svn_wc_notify_state_t obstruction_state;
svn_pool_clear(iterpool);
@@ -6159,7 +6159,7 @@ pre_merge_status_cb(void *baton,
hi;
hi = apr_hash_next(hi))
{
- const char *missing_root_path = svn__apr_hash_index_key(hi);
+ const char *missing_root_path = apr_hash_this_key(hi);
if (svn_dirent_is_ancestor(missing_root_path,
local_abspath))
@@ -6217,8 +6217,8 @@ get_wc_explicit_mergeinfo_catalog(apr_ha
hi;
hi = apr_hash_next(hi))
{
- const char *wc_path = svn__apr_hash_index_key(hi);
- svn_string_t *mergeinfo_string = svn__apr_hash_index_val(hi);
+ const char *wc_path = apr_hash_this_key(hi);
+ svn_string_t *mergeinfo_string = apr_hash_this_val(hi);
svn_mergeinfo_t mergeinfo;
svn_error_t *err;
@@ -6331,8 +6331,8 @@ get_mergeinfo_paths(apr_array_header_t *
hi;
hi = apr_hash_next(hi))
{
- const char *wc_path = svn__apr_hash_index_key(hi);
- svn_mergeinfo_t mergeinfo = svn__apr_hash_index_val(hi);
+ const char *wc_path = apr_hash_this_key(hi);
+ svn_mergeinfo_t mergeinfo = apr_hash_this_val(hi);
svn_client__merge_path_t *mergeinfo_child =
svn_client__merge_path_create(wc_path, result_pool);
@@ -6400,7 +6400,7 @@ get_mergeinfo_paths(apr_array_header_t *
svn_pool_clear(iterpool);
svn_stringbuf_appendcstr(missing_subtree_err_buf,
svn_dirent_local_style(
- svn__apr_hash_index_key(hi), iterpool));
+ apr_hash_this_key(hi), iterpool));
svn_stringbuf_appendcstr(missing_subtree_err_buf, "\n");
}
@@ -6416,7 +6416,7 @@ get_mergeinfo_paths(apr_array_header_t *
hi;
hi = apr_hash_next(hi))
{
- const char *wc_path = svn__apr_hash_index_key(hi);
+ const char *wc_path = apr_hash_this_key(hi);
svn_client__merge_path_t *child = get_child_with_mergeinfo(
children_with_mergeinfo, wc_path);
@@ -6444,8 +6444,8 @@ get_mergeinfo_paths(apr_array_header_t *
hi = apr_hash_next(hi))
{
svn_boolean_t new_shallow_child = FALSE;
- const char *wc_path = svn__apr_hash_index_key(hi);
- svn_depth_t *child_depth = svn__apr_hash_index_val(hi);
+ const char *wc_path = apr_hash_this_key(hi);
+ svn_depth_t *child_depth = apr_hash_this_val(hi);
svn_client__merge_path_t *shallow_child = get_child_with_mergeinfo(
children_with_mergeinfo, wc_path);
@@ -6499,7 +6499,7 @@ get_mergeinfo_paths(apr_array_header_t *
hi;
hi = apr_hash_next(hi))
{
- const char *wc_path = svn__apr_hash_index_key(hi);
+ const char *wc_path = apr_hash_this_key(hi);
svn_client__merge_path_t *child = get_child_with_mergeinfo(
children_with_mergeinfo, wc_path);
@@ -7755,7 +7755,7 @@ process_children_with_new_mergeinfo(merg
hi;
hi = apr_hash_next(hi))
{
- const char *abspath_with_new_mergeinfo = svn__apr_hash_index_key(hi);
+ const char *abspath_with_new_mergeinfo = apr_hash_this_key(hi);
svn_mergeinfo_t path_inherited_mergeinfo;
svn_mergeinfo_t path_explicit_mergeinfo;
svn_client__merge_path_t *new_child;
@@ -7858,7 +7858,7 @@ path_is_subtree(const char *local_abspat
for (hi = apr_hash_first(pool, subtrees);
hi; hi = apr_hash_next(hi))
{
- const char *path_touched_by_merge = svn__apr_hash_index_key(hi);
+ const char *path_touched_by_merge = apr_hash_this_key(hi);
if (svn_dirent_is_ancestor(local_abspath, path_touched_by_merge))
return TRUE;
}
@@ -7973,8 +7973,8 @@ log_find_operative_subtree_revs(void *ba
hi;
hi = apr_hash_next(hi))
{
- const char *path = svn__apr_hash_index_key(hi);
- svn_log_changed_path2_t *change = svn__apr_hash_index_val(hi);
+ const char *path = apr_hash_this_key(hi);
+ svn_log_changed_path2_t *change = apr_hash_this_val(hi);
{
const char *child;
@@ -8659,7 +8659,7 @@ record_mergeinfo_for_added_subtrees(
iterpool = svn_pool_create(pool);
for (hi = apr_hash_first(pool, added_abspaths); hi; hi = apr_hash_next(hi))
{
- const char *added_abspath = svn__apr_hash_index_key(hi);
+ const char *added_abspath = apr_hash_this_key(hi);
const char *dir_abspath;
svn_mergeinfo_t parent_mergeinfo;
svn_mergeinfo_t added_path_mergeinfo;
@@ -8868,7 +8868,7 @@ log_noop_revs(void *baton,
hi;
hi = apr_hash_next(hi))
{
- const char *fspath = svn__apr_hash_index_key(hi);
+ const char *fspath = apr_hash_this_key(hi);
const char *rel_path;
const char *cwmi_abspath;
svn_rangelist_t *paths_explicit_rangelist = NULL;
@@ -10695,7 +10695,7 @@ log_find_operative_revs(void *baton,
hi = apr_hash_next(hi))
{
const char *subtree_missing_this_rev;
- const char *path = svn__apr_hash_index_key(hi);
+ const char *path = apr_hash_this_key(hi);
const char *rel_path;
const char *source_rel_path;
svn_boolean_t in_catalog;
@@ -10823,7 +10823,7 @@ find_unsynced_ranges(const svn_client__p
hi_catalog;
hi_catalog = apr_hash_next(hi_catalog))
{
- svn_mergeinfo_t mergeinfo = svn__apr_hash_index_val(hi_catalog);
+ svn_mergeinfo_t mergeinfo = apr_hash_this_val(hi_catalog);
SVN_ERR(svn_rangelist__merge_many(potentially_unmerged_ranges,
mergeinfo,
@@ -11029,8 +11029,8 @@ find_unmerged_mergeinfo(svn_mergeinfo_ca
hi;
hi = apr_hash_next(hi))
{
- const char *target_path = svn__apr_hash_index_key(hi);
- svn_mergeinfo_t target_history_as_mergeinfo =
svn__apr_hash_index_val(hi);
+ const char *target_path = apr_hash_this_key(hi);
+ svn_mergeinfo_t target_history_as_mergeinfo = apr_hash_this_val(hi);
const char *path_rel_to_session
= svn_relpath_skip_ancestor(target_repos_rel_path, target_path);
const char *source_path;
@@ -11114,11 +11114,11 @@ find_unmerged_mergeinfo(svn_mergeinfo_ca
hi;
hi = apr_hash_next(hi))
{
- const char *source_path = svn__apr_hash_index_key(hi);
+ const char *source_path = apr_hash_this_key(hi);
const char *path_rel_to_session =
svn_relpath_skip_ancestor(source_repos_rel_path, source_path);
const char *source_url;
- svn_mergeinfo_t source_mergeinfo = svn__apr_hash_index_val(hi);
+ svn_mergeinfo_t source_mergeinfo = apr_hash_this_val(hi);
svn_mergeinfo_t filtered_mergeinfo;
svn_client__pathrev_t *target_pathrev;
svn_mergeinfo_t target_history_as_mergeinfo;
@@ -11267,7 +11267,7 @@ calculate_left_hand_side(svn_client__pat
hi;
hi = apr_hash_next(hi))
{
- const char *local_abspath = svn__apr_hash_index_key(hi);
+ const char *local_abspath = apr_hash_this_key(hi);
svn_client__pathrev_t *target_child;
const char *repos_relpath;
svn_mergeinfo_t target_history_as_mergeinfo;
@@ -11914,8 +11914,8 @@ location_on_branch_at_rev(const branch_h
for (hi = apr_hash_first(scratch_pool, branch_history->history); hi;
hi = apr_hash_next(hi))
{
- const char *fspath = svn__apr_hash_index_key(hi);
- svn_rangelist_t *rangelist = svn__apr_hash_index_val(hi);
+ const char *fspath = apr_hash_this_key(hi);
+ svn_rangelist_t *rangelist = apr_hash_this_val(hi);
int i;
for (i = 0; i < rangelist->nelts; i++)
Modified:
subversion/branches/move-tracking-2/subversion/libsvn_client/mergeinfo.c
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_client/mergeinfo.c?rev=1614616&r1=1614615&r2=1614616&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_client/mergeinfo.c
(original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_client/mergeinfo.c
Wed Jul 30 11:23:49 2014
@@ -430,8 +430,8 @@ svn_client__get_wc_mergeinfo_catalog(svn
hi;
hi = apr_hash_next(hi))
{
- const char *node_abspath = svn__apr_hash_index_key(hi);
- svn_string_t *propval = svn__apr_hash_index_val(hi);
+ const char *node_abspath = apr_hash_this_key(hi);
+ svn_string_t *propval = apr_hash_this_val(hi);
svn_mergeinfo_t subtree_mergeinfo;
const char *repos_relpath;
@@ -483,7 +483,7 @@ svn_client__get_repos_mergeinfo(svn_merg
descendants. So if there is anything in the catalog it is the
mergeinfo for REL_PATH. */
*target_mergeinfo =
- svn__apr_hash_index_val(apr_hash_first(pool, tgt_mergeinfo_cat));
+ apr_hash_this_val(apr_hash_first(pool, tgt_mergeinfo_cat));
}
@@ -583,7 +583,7 @@ svn_client__get_wc_or_repos_mergeinfo(sv
so we can peek into our catalog, but it ought to be the only
thing in the catalog, so we'll just fetch the first hash item. */
*target_mergeinfo =
- svn__apr_hash_index_val(apr_hash_first(pool, tgt_mergeinfo_cat));
+ apr_hash_this_val(apr_hash_first(pool, tgt_mergeinfo_cat));
}
@@ -1343,8 +1343,8 @@ filter_log_entry_with_rangelist(void *ba
hi = apr_hash_next(hi))
{
int i;
- const char *path = svn__apr_hash_index_key(hi);
- svn_log_changed_path2_t *change = svn__apr_hash_index_val(hi);
+ const char *path = apr_hash_this_key(hi);
+ svn_log_changed_path2_t *change = apr_hash_this_val(hi);
const char *target_fspath_affected;
svn_mergeinfo_t nearest_ancestor_mergeinfo;
svn_boolean_t found_this_revision = FALSE;
@@ -1428,8 +1428,8 @@ filter_log_entry_with_rangelist(void *ba
hi2;
hi2 = apr_hash_next(hi2))
{
- const char *mergeinfo_path = svn__apr_hash_index_key(hi2);
- svn_rangelist_t *rangelist = svn__apr_hash_index_val(hi2);
+ const char *mergeinfo_path = apr_hash_this_key(hi2);
+ svn_rangelist_t *rangelist = apr_hash_this_val(hi2);
/* Does the mergeinfo for PATH reflect if
LOG_ENTRY->REVISION was previously merged
@@ -1606,8 +1606,8 @@ mergeinfo_relpaths_to_urls(apr_hash_t **
for (hi = apr_hash_first(scratch_pool, mergeinfo);
hi; hi = apr_hash_next(hi))
{
- const char *key = svn__apr_hash_index_key(hi);
- void *val = svn__apr_hash_index_val(hi);
+ const char *key = apr_hash_this_key(hi);
+ void *val = apr_hash_this_val(hi);
svn_hash_sets(full_path_mergeinfo,
svn_path_url_add_component2(repos_root_url, key + 1,
@@ -1925,14 +1925,14 @@ svn_client__mergeinfo_log(svn_boolean_t
hi_catalog;
hi_catalog = apr_hash_next(hi_catalog))
{
- svn_mergeinfo_t subtree_mergeinfo = svn__apr_hash_index_val(hi_catalog);
+ svn_mergeinfo_t subtree_mergeinfo = apr_hash_this_val(hi_catalog);
svn_mergeinfo_t subtree_history;
svn_mergeinfo_t subtree_source_history;
svn_mergeinfo_t subtree_inheritable_mergeinfo;
svn_mergeinfo_t subtree_noninheritable_mergeinfo;
svn_mergeinfo_t merged_noninheritable;
svn_mergeinfo_t merged;
- const char *subtree_path = svn__apr_hash_index_key(hi_catalog);
+ const char *subtree_path = apr_hash_this_key(hi_catalog);
svn_boolean_t is_subtree = strcmp(subtree_path,
target_repos_relpath) != 0;
svn_pool_clear(iterpool);
@@ -2055,8 +2055,7 @@ svn_client__mergeinfo_log(svn_boolean_t
{
svn_rangelist_t *deleted_rangelist;
svn_rangelist_t *added_rangelist;
- svn_rangelist_t *subtree_merged_rangelist =
- svn__apr_hash_index_val(hi);
+ svn_rangelist_t *subtree_merged_rangelist = apr_hash_this_val(hi);
svn_pool_clear(iterpool);
@@ -2138,9 +2137,8 @@ svn_client__mergeinfo_log(svn_boolean_t
hi;
hi = apr_hash_next(hi))
{
- const char *key = svn__apr_hash_index_key(hi);
- svn_rangelist_t *subtree_merged_rangelist =
- svn__apr_hash_index_val(hi);
+ const char *key = apr_hash_this_key(hi);
+ svn_rangelist_t *subtree_merged_rangelist = apr_hash_this_val(hi);
svn_rangelist_t *intersecting_rangelist;
svn_pool_clear(iterpool);
@@ -2261,8 +2259,8 @@ svn_client_suggest_merge_sources(apr_arr
/* We asked only for the PATH_OR_URL's mergeinfo, not any of its
descendants. So if there is anything in the catalog it is the
mergeinfo for PATH_OR_URL. */
- mergeinfo = svn__apr_hash_index_val(apr_hash_first(session_pool,
- mergeinfo_cat));
+ mergeinfo = apr_hash_this_val(apr_hash_first(session_pool,
+ mergeinfo_cat));
}
else
{
@@ -2286,7 +2284,7 @@ svn_client_suggest_merge_sources(apr_arr
hi;
hi = apr_hash_next(hi))
{
- const char *rel_path = svn__apr_hash_index_key(hi);
+ const char *rel_path = apr_hash_this_key(hi);
if (copyfrom_path == NULL || strcmp(rel_path, copyfrom_path) != 0)
APR_ARRAY_PUSH(list, const char *) = \
Modified: subversion/branches/move-tracking-2/subversion/libsvn_client/mtcc.c
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_client/mtcc.c?rev=1614616&r1=1614615&r2=1614616&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_client/mtcc.c
(original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_client/mtcc.c Wed Jul
30 11:23:49 2014
@@ -29,7 +29,7 @@
#include "svn_pools.h"
#include "svn_subst.h"
-#include "svn_client_mtcc.h"
+#include "private/svn_client_mtcc.h"
#include "svn_private_config.h"
@@ -40,22 +40,22 @@
#define SVN_PATH_IS_EMPTY(s) ((s)[0] == '\0')
-/* The kind of operation to perform in an svn_client_mtcc_op_t */
-typedef enum svn_client_mtcc_kind_t
+/* The kind of operation to perform in an mtcc_op_t */
+typedef enum mtcc_kind_t
{
OP_OPEN_DIR,
OP_OPEN_FILE,
OP_ADD_DIR,
OP_ADD_FILE,
OP_DELETE,
-} svn_client_mtcc_kind_t;
+} mtcc_kind_t;
-typedef struct svn_client_mtcc_op_t
+typedef struct mtcc_op_t
{
const char *name; /* basename of operation */
- svn_client_mtcc_kind_t kind; /* editor operation */
+ mtcc_kind_t kind; /* editor operation */
- apr_array_header_t *children; /* List of svn_client_mtcc_op_t * */
+ apr_array_header_t *children; /* List of mtcc_op_t * */
const char *src_relpath; /* For ADD_DIR, ADD_FILE */
svn_revnum_t src_rev; /* For ADD_DIR, ADD_FILE */
@@ -68,7 +68,7 @@ typedef struct svn_client_mtcc_op_t
List of svn_prop_t */
svn_boolean_t performed_stat; /* Verified kind with repository */
-} svn_client_mtcc_op_t;
+} mtcc_op_t;
/* Check if the mtcc doesn't contain any modifications yet */
#define MTCC_UNMODIFIED(mtcc) \
@@ -79,7 +79,7 @@ typedef struct svn_client_mtcc_op_t
&& (mtcc->root_op->children == NULL \
|| !mtcc->root_op->children->nelts))
-struct svn_client_mtcc_t
+struct svn_client__mtcc_t
{
apr_pool_t *pool;
svn_revnum_t head_revision;
@@ -88,16 +88,16 @@ struct svn_client_mtcc_t
svn_ra_session_t *ra_session;
svn_client_ctx_t *ctx;
- svn_client_mtcc_op_t *root_op;
+ mtcc_op_t *root_op;
};
-static svn_client_mtcc_op_t *
+static mtcc_op_t *
mtcc_op_create(const char *name,
svn_boolean_t add,
svn_boolean_t directory,
apr_pool_t *result_pool)
{
- svn_client_mtcc_op_t *op;
+ mtcc_op_t *op;
op = apr_pcalloc(result_pool, sizeof(*op));
op->name = name ? apr_pstrdup(result_pool, name) : "";
@@ -108,8 +108,7 @@ mtcc_op_create(const char *name,
op->kind = directory ? OP_OPEN_DIR : OP_OPEN_FILE;
if (directory)
- op->children = apr_array_make(result_pool, 4,
- sizeof(svn_client_mtcc_op_t *));
+ op->children = apr_array_make(result_pool, 4, sizeof(mtcc_op_t *));
op->src_rev = SVN_INVALID_REVNUM;
@@ -117,10 +116,10 @@ mtcc_op_create(const char *name,
}
static svn_error_t *
-mtcc_op_find(svn_client_mtcc_op_t **op,
+mtcc_op_find(mtcc_op_t **op,
svn_boolean_t *created,
const char *relpath,
- svn_client_mtcc_op_t *base_op,
+ mtcc_op_t *base_op,
svn_boolean_t find_existing,
svn_boolean_t find_deletes,
svn_boolean_t create_file,
@@ -171,9 +170,9 @@ mtcc_op_find(svn_client_mtcc_op_t **op,
for (i = base_op->children->nelts-1; i >= 0 ; i--)
{
- svn_client_mtcc_op_t *cop;
+ mtcc_op_t *cop;
- cop = APR_ARRAY_IDX(base_op->children, i, svn_client_mtcc_op_t *);
+ cop = APR_ARRAY_IDX(base_op->children, i, mtcc_op_t *);
if (! strcmp(cop->name, name)
&& (find_deletes || cop->kind != OP_DELETE))
@@ -192,11 +191,11 @@ mtcc_op_find(svn_client_mtcc_op_t **op,
}
{
- svn_client_mtcc_op_t *cop;
+ mtcc_op_t *cop;
cop = mtcc_op_create(name, FALSE, child || !create_file, result_pool);
- APR_ARRAY_PUSH(base_op->children, svn_client_mtcc_op_t *) = cop;
+ APR_ARRAY_PUSH(base_op->children, mtcc_op_t *) = cop;
if (!child)
{
@@ -218,7 +217,7 @@ static svn_error_t *
get_origin(svn_boolean_t *done,
const char **origin_relpath,
svn_revnum_t *rev,
- svn_client_mtcc_op_t *op,
+ mtcc_op_t *op,
const char *relpath,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
@@ -251,9 +250,9 @@ get_origin(svn_boolean_t *done,
for (i = op->children->nelts-1; i >= 0; i--)
{
- svn_client_mtcc_op_t *cop;
+ mtcc_op_t *cop;
- cop = APR_ARRAY_IDX(op->children, i, svn_client_mtcc_op_t *);
+ cop = APR_ARRAY_IDX(op->children, i, mtcc_op_t *);
if (! strcmp(cop->name, name))
{
@@ -297,7 +296,7 @@ mtcc_get_origin(const char **origin_relp
svn_revnum_t *rev,
const char *relpath,
svn_boolean_t ignore_enoent,
- svn_client_mtcc_t *mtcc,
+ svn_client__mtcc_t *mtcc,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
@@ -325,12 +324,12 @@ mtcc_get_origin(const char **origin_relp
}
svn_error_t *
-svn_client_mtcc_create(svn_client_mtcc_t **mtcc,
- const char *anchor_url,
- svn_revnum_t base_revision,
- svn_client_ctx_t *ctx,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool)
+svn_client__mtcc_create(svn_client__mtcc_t **mtcc,
+ const char *anchor_url,
+ svn_revnum_t base_revision,
+ svn_client_ctx_t *ctx,
+ apr_pool_t *result_pool,
+ apr_pool_t *scratch_pool)
{
apr_pool_t *mtcc_pool;
@@ -362,7 +361,7 @@ svn_client_mtcc_create(svn_client_mtcc_t
}
static svn_error_t *
-update_copy_src(svn_client_mtcc_op_t *op,
+update_copy_src(mtcc_op_t *op,
const char *add_relpath,
apr_pool_t *result_pool)
{
@@ -377,9 +376,9 @@ update_copy_src(svn_client_mtcc_op_t *op
for (i = 0; i < op->children->nelts; i++)
{
- svn_client_mtcc_op_t *cop;
+ mtcc_op_t *cop;
- cop = APR_ARRAY_IDX(op->children, i, svn_client_mtcc_op_t *);
+ cop = APR_ARRAY_IDX(op->children, i, mtcc_op_t *);
SVN_ERR(update_copy_src(cop, add_relpath, result_pool));
}
@@ -389,7 +388,7 @@ update_copy_src(svn_client_mtcc_op_t *op
static svn_error_t *
mtcc_reparent(const char *new_anchor_url,
- svn_client_mtcc_t *mtcc,
+ svn_client__mtcc_t *mtcc,
apr_pool_t *scratch_pool)
{
const char *session_url;
@@ -419,15 +418,14 @@ mtcc_reparent(const char *new_anchor_url
/* Create directory open operations for new ancestors */
while (*up)
{
- svn_client_mtcc_op_t *root_op;
+ mtcc_op_t *root_op;
mtcc->root_op->name = svn_relpath_basename(up, mtcc->pool);
up = svn_relpath_dirname(up, scratch_pool);
root_op = mtcc_op_create(NULL, FALSE, TRUE, mtcc->pool);
- APR_ARRAY_PUSH(root_op->children,
- svn_client_mtcc_op_t *) = mtcc->root_op;
+ APR_ARRAY_PUSH(root_op->children, mtcc_op_t *) = mtcc->root_op;
mtcc->root_op = root_op;
}
@@ -438,7 +436,7 @@ mtcc_reparent(const char *new_anchor_url
/* Check if it is safe to create a new node at NEW_RELPATH. Return a proper
error if it is not */
static svn_error_t *
-mtcc_verify_create(svn_client_mtcc_t *mtcc,
+mtcc_verify_create(svn_client__mtcc_t *mtcc,
const char *new_relpath,
apr_pool_t *scratch_pool)
{
@@ -446,7 +444,7 @@ mtcc_verify_create(svn_client_mtcc_t *mt
if (*new_relpath || !MTCC_UNMODIFIED(mtcc))
{
- svn_client_mtcc_op_t *op;
+ mtcc_op_t *op;
SVN_ERR(mtcc_op_find(&op, NULL, new_relpath, mtcc->root_op, TRUE, FALSE,
FALSE, mtcc->pool, scratch_pool));
@@ -465,8 +463,8 @@ mtcc_verify_create(svn_client_mtcc_t *mt
/* mod_dav_svn allows overwriting existing directories. Let's hide that
for users of this api */
- SVN_ERR(svn_client_mtcc_check_path(&kind, new_relpath, FALSE,
- mtcc, scratch_pool));
+ SVN_ERR(svn_client__mtcc_check_path(&kind, new_relpath, FALSE,
+ mtcc, scratch_pool));
if (kind != svn_node_none)
return svn_error_createf(SVN_ERR_FS_ALREADY_EXISTS, NULL,
@@ -478,13 +476,13 @@ mtcc_verify_create(svn_client_mtcc_t *mt
svn_error_t *
-svn_client_mtcc_add_add_file(const char *relpath,
- svn_stream_t *src_stream,
- const svn_checksum_t *src_checksum,
- svn_client_mtcc_t *mtcc,
- apr_pool_t *scratch_pool)
+svn_client__mtcc_add_add_file(const char *relpath,
+ svn_stream_t *src_stream,
+ const svn_checksum_t *src_checksum,
+ svn_client__mtcc_t *mtcc,
+ apr_pool_t *scratch_pool)
{
- svn_client_mtcc_op_t *op;
+ mtcc_op_t *op;
svn_boolean_t created;
SVN_ERR_ASSERT(svn_relpath_is_canonical(relpath) && src_stream);
@@ -517,13 +515,13 @@ svn_client_mtcc_add_add_file(const char
}
svn_error_t *
-svn_client_mtcc_add_copy(const char *src_relpath,
- svn_revnum_t revision,
- const char *dst_relpath,
- svn_client_mtcc_t *mtcc,
- apr_pool_t *scratch_pool)
+svn_client__mtcc_add_copy(const char *src_relpath,
+ svn_revnum_t revision,
+ const char *dst_relpath,
+ svn_client__mtcc_t *mtcc,
+ apr_pool_t *scratch_pool)
{
- svn_client_mtcc_op_t *op;
+ mtcc_op_t *op;
svn_boolean_t created;
svn_node_kind_t kind;
@@ -569,18 +567,18 @@ svn_client_mtcc_add_copy(const char *src
}
svn_error_t *
-svn_client_mtcc_add_delete(const char *relpath,
- svn_client_mtcc_t *mtcc,
- apr_pool_t *scratch_pool)
+svn_client__mtcc_add_delete(const char *relpath,
+ svn_client__mtcc_t *mtcc,
+ apr_pool_t *scratch_pool)
{
- svn_client_mtcc_op_t *op;
+ mtcc_op_t *op;
svn_boolean_t created;
svn_node_kind_t kind;
SVN_ERR_ASSERT(svn_relpath_is_canonical(relpath));
- SVN_ERR(svn_client_mtcc_check_path(&kind, relpath, FALSE,
- mtcc, scratch_pool));
+ SVN_ERR(svn_client__mtcc_check_path(&kind, relpath, FALSE,
+ mtcc, scratch_pool));
if (kind == svn_node_none)
return svn_error_createf(SVN_ERR_FS_NOT_FOUND, NULL,
@@ -614,11 +612,11 @@ svn_client_mtcc_add_delete(const char *r
}
svn_error_t *
-svn_client_mtcc_add_mkdir(const char *relpath,
- svn_client_mtcc_t *mtcc,
- apr_pool_t *scratch_pool)
+svn_client__mtcc_add_mkdir(const char *relpath,
+ svn_client__mtcc_t *mtcc,
+ apr_pool_t *scratch_pool)
{
- svn_client_mtcc_op_t *op;
+ mtcc_op_t *op;
svn_boolean_t created;
SVN_ERR_ASSERT(svn_relpath_is_canonical(relpath));
@@ -648,10 +646,10 @@ svn_client_mtcc_add_mkdir(const char *re
}
svn_error_t *
-svn_client_mtcc_add_move(const char *src_relpath,
- const char *dst_relpath,
- svn_client_mtcc_t *mtcc,
- apr_pool_t *scratch_pool)
+svn_client__mtcc_add_move(const char *src_relpath,
+ const char *dst_relpath,
+ svn_client__mtcc_t *mtcc,
+ apr_pool_t *scratch_pool)
{
const char *origin_relpath;
svn_revnum_t origin_rev;
@@ -660,9 +658,9 @@ svn_client_mtcc_add_move(const char *src
src_relpath, FALSE, mtcc,
scratch_pool, scratch_pool));
- SVN_ERR(svn_client_mtcc_add_copy(src_relpath, mtcc->base_revision,
- dst_relpath, mtcc, scratch_pool));
- SVN_ERR(svn_client_mtcc_add_delete(src_relpath, mtcc, scratch_pool));
+ SVN_ERR(svn_client__mtcc_add_copy(src_relpath, mtcc->base_revision,
+ dst_relpath, mtcc, scratch_pool));
+ SVN_ERR(svn_client__mtcc_add_delete(src_relpath, mtcc, scratch_pool));
return SVN_NO_ERROR;
}
@@ -670,7 +668,7 @@ svn_client_mtcc_add_move(const char *src
/* Baton for mtcc_prop_getter */
struct mtcc_prop_get_baton
{
- svn_client_mtcc_t *mtcc;
+ svn_client__mtcc_t *mtcc;
const char *relpath;
svn_cancel_func_t cancel_func;
void *cancel_baton;
@@ -688,7 +686,7 @@ mtcc_prop_getter(const svn_string_t **mi
svn_revnum_t origin_rev;
apr_hash_t *props = NULL;
- svn_client_mtcc_op_t *op;
+ mtcc_op_t *op;
if (mime_type)
*mime_type = NULL;
@@ -765,14 +763,14 @@ mtcc_prop_getter(const svn_string_t **mi
}
svn_error_t *
-svn_client_mtcc_add_propset(const char *relpath,
- const char *propname,
- const svn_string_t *propval,
- svn_boolean_t skip_checks,
- svn_client_mtcc_t *mtcc,
- apr_pool_t *scratch_pool)
+svn_client__mtcc_add_propset(const char *relpath,
+ const char *propname,
+ const svn_string_t *propval,
+ svn_boolean_t skip_checks,
+ svn_client__mtcc_t *mtcc,
+ apr_pool_t *scratch_pool)
{
- svn_client_mtcc_op_t *op;
+ mtcc_op_t *op;
SVN_ERR_ASSERT(svn_relpath_is_canonical(relpath));
if (! svn_prop_name_is_valid(propname))
@@ -805,8 +803,8 @@ svn_client_mtcc_add_propset(const char *
{
struct mtcc_prop_get_baton mpbg;
svn_node_kind_t kind;
- SVN_ERR(svn_client_mtcc_check_path(&kind, relpath, FALSE, mtcc,
- scratch_pool));
+ SVN_ERR(svn_client__mtcc_check_path(&kind, relpath, FALSE, mtcc,
+ scratch_pool));
mpbg.mtcc = mtcc;
mpbg.relpath = relpath;
@@ -826,8 +824,8 @@ svn_client_mtcc_add_propset(const char *
/* Probing the node for an unmodified root will fix the node type to
a file if necessary */
- SVN_ERR(svn_client_mtcc_check_path(&kind, relpath, FALSE,
- mtcc, scratch_pool));
+ SVN_ERR(svn_client__mtcc_check_path(&kind, relpath, FALSE,
+ mtcc, scratch_pool));
if (kind == svn_node_none)
return svn_error_createf(SVN_ERR_ILLEGAL_TARGET, NULL,
@@ -849,8 +847,8 @@ svn_client_mtcc_add_propset(const char *
/* ### TODO: Check if this node is within a newly copied directory,
and update origin values accordingly */
- SVN_ERR(svn_client_mtcc_check_path(&kind, relpath, FALSE,
- mtcc, scratch_pool));
+ SVN_ERR(svn_client__mtcc_check_path(&kind, relpath, FALSE,
+ mtcc, scratch_pool));
if (kind == svn_node_none)
return svn_error_createf(SVN_ERR_ILLEGAL_TARGET, NULL,
@@ -884,21 +882,21 @@ svn_client_mtcc_add_propset(const char *
}
svn_error_t *
-svn_client_mtcc_add_update_file(const char *relpath,
- svn_stream_t *src_stream,
- const svn_checksum_t *src_checksum,
- svn_stream_t *base_stream,
- const svn_checksum_t *base_checksum,
- svn_client_mtcc_t *mtcc,
- apr_pool_t *scratch_pool)
+svn_client__mtcc_add_update_file(const char *relpath,
+ svn_stream_t *src_stream,
+ const svn_checksum_t *src_checksum,
+ svn_stream_t *base_stream,
+ const svn_checksum_t *base_checksum,
+ svn_client__mtcc_t *mtcc,
+ apr_pool_t *scratch_pool)
{
- svn_client_mtcc_op_t *op;
+ mtcc_op_t *op;
svn_boolean_t created;
svn_node_kind_t kind;
SVN_ERR_ASSERT(svn_relpath_is_canonical(relpath) && src_stream);
- SVN_ERR(svn_client_mtcc_check_path(&kind, relpath, FALSE,
- mtcc, scratch_pool));
+ SVN_ERR(svn_client__mtcc_check_path(&kind, relpath, FALSE,
+ mtcc, scratch_pool));
if (kind != svn_node_file)
return svn_error_createf(SVN_ERR_FS_NOT_FILE, NULL,
@@ -929,15 +927,15 @@ svn_client_mtcc_add_update_file(const ch
}
svn_error_t *
-svn_client_mtcc_check_path(svn_node_kind_t *kind,
- const char *relpath,
- svn_boolean_t check_repository,
- svn_client_mtcc_t *mtcc,
- apr_pool_t *scratch_pool)
+svn_client__mtcc_check_path(svn_node_kind_t *kind,
+ const char *relpath,
+ svn_boolean_t check_repository,
+ svn_client__mtcc_t *mtcc,
+ apr_pool_t *scratch_pool)
{
const char *origin_relpath;
svn_revnum_t origin_rev;
- svn_client_mtcc_op_t *op;
+ mtcc_op_t *op;
SVN_ERR_ASSERT(svn_relpath_is_canonical(relpath));
@@ -1018,7 +1016,7 @@ svn_client_mtcc_check_path(svn_node_kind
static svn_error_t *
commit_properties(const svn_delta_editor_t *editor,
- const svn_client_mtcc_op_t *op,
+ const mtcc_op_t *op,
void *node_baton,
apr_pool_t *scratch_pool)
{
@@ -1050,7 +1048,7 @@ commit_properties(const svn_delta_editor
/* Handles updating a file to a delta editor and then closes it */
static svn_error_t *
commit_file(const svn_delta_editor_t *editor,
- svn_client_mtcc_op_t *op,
+ mtcc_op_t *op,
void *file_baton,
const char *session_url,
const char *relpath,
@@ -1127,7 +1125,7 @@ commit_file(const svn_delta_editor_t *ed
/* Handles updating a directory to a delta editor and then closes it */
static svn_error_t *
commit_directory(const svn_delta_editor_t *editor,
- svn_client_mtcc_op_t *op,
+ mtcc_op_t *op,
const char *relpath,
svn_revnum_t base_rev,
void *dir_baton,
@@ -1144,11 +1142,11 @@ commit_directory(const svn_delta_editor_
for (i = 0; i < op->children->nelts; i++)
{
- svn_client_mtcc_op_t *cop;
+ mtcc_op_t *cop;
const char * child_relpath;
void *child_baton;
- cop = APR_ARRAY_IDX(op->children, i, svn_client_mtcc_op_t *);
+ cop = APR_ARRAY_IDX(op->children, i, mtcc_op_t *);
svn_pool_clear(iterpool);
@@ -1219,7 +1217,7 @@ commit_directory(const svn_delta_editor_
/* Helper function to recursively create svn_client_commit_item3_t items
to provide to the log message callback */
static svn_error_t *
-add_commit_items(svn_client_mtcc_op_t *op,
+add_commit_items(mtcc_op_t *op,
const char *session_url,
const char *url,
apr_array_header_t *commit_items,
@@ -1278,10 +1276,10 @@ add_commit_items(svn_client_mtcc_op_t *o
for (i = 0; i < op->children->nelts; i++)
{
- svn_client_mtcc_op_t *cop;
+ mtcc_op_t *cop;
const char * child_url;
- cop = APR_ARRAY_IDX(op->children, i, svn_client_mtcc_op_t *);
+ cop = APR_ARRAY_IDX(op->children, i, mtcc_op_t *);
svn_pool_clear(iterpool);
@@ -1298,11 +1296,11 @@ add_commit_items(svn_client_mtcc_op_t *o
}
svn_error_t *
-svn_client_mtcc_commit(apr_hash_t *revprop_table,
- svn_commit_callback2_t commit_callback,
- void *commit_baton,
- svn_client_mtcc_t *mtcc,
- apr_pool_t *scratch_pool)
+svn_client__mtcc_commit(apr_hash_t *revprop_table,
+ svn_commit_callback2_t commit_callback,
+ void *commit_baton,
+ svn_client__mtcc_t *mtcc,
+ apr_pool_t *scratch_pool)
{
const svn_delta_editor_t *editor;
void *edit_baton;
Modified: subversion/branches/move-tracking-2/subversion/libsvn_client/patch.c
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_client/patch.c?rev=1614616&r1=1614615&r2=1614616&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_client/patch.c
(original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_client/patch.c Wed
Jul 30 11:23:49 2014
@@ -1001,7 +1001,7 @@ init_patch_target(patch_target_t **patch
hi;
hi = apr_hash_next(hi))
{
- svn_prop_patch_t *prop_patch = svn__apr_hash_index_val(hi);
+ svn_prop_patch_t *prop_patch = apr_hash_this_val(hi);
if (! has_prop_changes)
has_prop_changes = prop_patch->hunks->nelts > 0;
else
@@ -1205,8 +1205,8 @@ init_patch_target(patch_target_t **patch
hi;
hi = apr_hash_next(hi))
{
- const char *prop_name = svn__apr_hash_index_key(hi);
- svn_prop_patch_t *prop_patch = svn__apr_hash_index_val(hi);
+ const char *prop_name = apr_hash_this_key(hi);
+ svn_prop_patch_t *prop_patch = apr_hash_this_val(hi);
prop_patch_target_t *prop_target;
SVN_ERR(init_prop_target(&prop_target,
@@ -2106,7 +2106,7 @@ send_patch_notification(const patch_targ
{
prop_patch_target_t *prop_target;
- prop_target = svn__apr_hash_index_val(hash_index);
+ prop_target = apr_hash_this_val(hash_index);
for (i = 0; i < prop_target->content->hunks->nelts; i++)
{
@@ -2264,8 +2264,8 @@ apply_one_patch(patch_target_t **patch_t
const char *prop_name;
prop_patch_target_t *prop_target;
- prop_name = svn__apr_hash_index_key(hash_index);
- prop_patch = svn__apr_hash_index_val(hash_index);
+ prop_name = apr_hash_this_key(hash_index);
+ prop_patch = apr_hash_this_val(hash_index);
if (! strcmp(prop_name, SVN_PROP_SPECIAL))
target->is_special = TRUE;
@@ -2311,7 +2311,7 @@ apply_one_patch(patch_target_t **patch_t
{
prop_patch_target_t *prop_target;
- prop_target = svn__apr_hash_index_val(hash_index);
+ prop_target = apr_hash_this_val(hash_index);
for (i = 0; i < prop_target->content->hunks->nelts; i++)
{
@@ -2750,7 +2750,7 @@ install_patched_prop_targets(patch_targe
hi;
hi = apr_hash_next(hi))
{
- prop_patch_target_t *prop_target = svn__apr_hash_index_val(hi);
+ prop_patch_target_t *prop_target = apr_hash_this_val(hi);
const svn_string_t *prop_val;
svn_error_t *err;
Modified:
subversion/branches/move-tracking-2/subversion/libsvn_client/prop_commands.c
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_client/prop_commands.c?rev=1614616&r1=1614615&r2=1614616&view=diff
==============================================================================
---
subversion/branches/move-tracking-2/subversion/libsvn_client/prop_commands.c
(original)
+++
subversion/branches/move-tracking-2/subversion/libsvn_client/prop_commands.c
Wed Jul 30 11:23:49 2014
@@ -654,8 +654,8 @@ remote_propget(apr_hash_t *props,
hi;
hi = apr_hash_next(hi))
{
- const char *this_name = svn__apr_hash_index_key(hi);
- svn_dirent_t *this_ent = svn__apr_hash_index_val(hi);
+ const char *this_name = apr_hash_this_key(hi);
+ svn_dirent_t *this_ent = apr_hash_this_val(hi);
const char *new_target_relative;
svn_depth_t depth_below_here = depth;
@@ -708,7 +708,7 @@ recursive_propget_receiver(void *baton,
{
apr_hash_index_t *hi = apr_hash_first(scratch_pool, props);
svn_hash_sets(b->props, apr_pstrdup(b->pool, local_abspath),
- svn_string_dup(svn__apr_hash_index_val(hi), b->pool));
+ svn_string_dup(apr_hash_this_val(hi), b->pool));
}
return SVN_NO_ERROR;
@@ -1132,8 +1132,8 @@ remote_proplist(const char *target_prefi
hi;
hi = apr_hash_next(hi))
{
- const char *name = svn__apr_hash_index_key(hi);
- apr_ssize_t klen = svn__apr_hash_index_klen(hi);
+ const char *name = apr_hash_this_key(hi);
+ apr_ssize_t klen = apr_hash_this_key_len(hi);
svn_prop_kind_t prop_kind;
prop_kind = svn_property_kind2(name);
@@ -1158,8 +1158,8 @@ remote_proplist(const char *target_prefi
hi;
hi = apr_hash_next(hi))
{
- const char *this_name = svn__apr_hash_index_key(hi);
- svn_dirent_t *this_ent = svn__apr_hash_index_val(hi);
+ const char *this_name = apr_hash_this_key(hi);
+ svn_dirent_t *this_ent = apr_hash_this_val(hi);
const char *new_target_relative;
if (cancel_func)
Modified: subversion/branches/move-tracking-2/subversion/libsvn_client/ra.c
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_client/ra.c?rev=1614616&r1=1614615&r2=1614616&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_client/ra.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_client/ra.c Wed Jul
30 11:23:49 2014
@@ -940,9 +940,9 @@ svn_client__calc_youngest_common_ancesto
remembering the youngest matching location. */
for (hi = apr_hash_first(scratch_pool, history1); hi; hi = apr_hash_next(hi))
{
- const char *path = svn__apr_hash_index_key(hi);
- apr_ssize_t path_len = svn__apr_hash_index_klen(hi);
- svn_rangelist_t *ranges1 = svn__apr_hash_index_val(hi);
+ const char *path = apr_hash_this_key(hi);
+ apr_ssize_t path_len = apr_hash_this_key_len(hi);
+ svn_rangelist_t *ranges1 = apr_hash_this_val(hi);
svn_rangelist_t *ranges2, *common;
ranges2 = apr_hash_get(history2, path, path_len);
Modified:
subversion/branches/move-tracking-2/subversion/libsvn_client/relocate.c
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_client/relocate.c?rev=1614616&r1=1614615&r2=1614616&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_client/relocate.c
(original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_client/relocate.c Wed
Jul 30 11:23:49 2014
@@ -269,8 +269,8 @@ svn_client_relocate2(const char *wcroot_
hi != NULL;
hi = apr_hash_next(hi))
{
- const char *this_abspath = svn__apr_hash_index_key(hi);
- const char *value = svn__apr_hash_index_val(hi);
+ const char *this_abspath = apr_hash_this_key(hi);
+ const char *value = apr_hash_this_val(hi);
apr_array_header_t *ext_desc;
svn_pool_clear(iterpool);
Modified:
subversion/branches/move-tracking-2/subversion/libsvn_client/repos_diff.c
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_client/repos_diff.c?rev=1614616&r1=1614615&r2=1614616&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_client/repos_diff.c
(original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_client/repos_diff.c
Wed Jul 30 11:23:49 2014
@@ -581,8 +581,8 @@ diff_deleted_dir(const char *path,
hi = apr_hash_next(hi))
{
const char *child_path;
- const char *name = svn__apr_hash_index_key(hi);
- svn_dirent_t *dirent = svn__apr_hash_index_val(hi);
+ const char *name = apr_hash_this_key(hi);
+ svn_dirent_t *dirent = apr_hash_this_val(hi);
svn_pool_clear(iterpool);
Modified: subversion/branches/move-tracking-2/subversion/libsvn_client/upgrade.c
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_client/upgrade.c?rev=1614616&r1=1614615&r2=1614616&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_client/upgrade.c
(original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_client/upgrade.c Wed
Jul 30 11:23:49 2014
@@ -131,8 +131,8 @@ svn_client_upgrade(const char *path,
const char *externals_parent_url;
const char *externals_parent_repos_root_url;
const char *externals_parent_repos_relpath;
- const char *externals_parent = svn__apr_hash_index_key(hi);
- svn_string_t *external_desc = svn__apr_hash_index_val(hi);
+ const char *externals_parent = apr_hash_this_key(hi);
+ svn_string_t *external_desc = apr_hash_this_val(hi);
apr_array_header_t *externals_p;
svn_error_t *err;
Modified: subversion/branches/move-tracking-2/subversion/libsvn_delta/compat.c
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_delta/compat.c?rev=1614616&r1=1614615&r2=1614616&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_delta/compat.c
(original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_delta/compat.c Wed
Jul 30 11:23:49 2014
@@ -295,7 +295,7 @@ get_children(struct ev2_edit_baton *eb,
for (hi = apr_hash_first(pool, eb->changes); hi; hi = apr_hash_next(hi))
{
- const char *repos_relpath = svn__apr_hash_index_key(hi);
+ const char *repos_relpath = apr_hash_this_key(hi);
const char *child;
/* Find potential children. */
Modified: subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3.c
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3.c?rev=1614616&r1=1614615&r2=1614616&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3.c
(original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3.c Wed
Jul 30 11:23:49 2014
@@ -317,8 +317,8 @@ insert_change(change_node_t **change_p,
for (hi = apr_hash_first(scratch_pool, changes);
hi; hi = apr_hash_next(hi))
{
- const char *this_relpath = svn__apr_hash_index_key(hi);
- change_node_t *this_change = svn__apr_hash_index_val(hi);
+ const char *this_relpath = apr_hash_this_key(hi);
+ change_node_t *this_change = apr_hash_this_val(hi);
const char *r = svn_relpath_skip_ancestor(relpath, this_relpath);
if (r && r[0])
@@ -415,7 +415,7 @@ insert_change_ev1_rules(change_node_t **
for (hi = apr_hash_first(scratch_pool, changes);
hi; hi = apr_hash_next(hi))
{
- const char *this_relpath = svn__apr_hash_index_key(hi);
+ const char *this_relpath = apr_hash_this_key(hi);
const char *r = svn_relpath_skip_ancestor(relpath, this_relpath);
if (r && r[0])
@@ -467,8 +467,8 @@ duplicate_child_changes(apr_hash_t *chan
for (hi = apr_hash_first(scratch_pool, changes);
hi; hi = apr_hash_next(hi))
{
- const char *this_path = svn__apr_hash_index_key(hi);
- change_node_t *this_change = svn__apr_hash_index_val(hi);
+ const char *this_path = apr_hash_this_key(hi);
+ change_node_t *this_change = apr_hash_this_val(hi);
const char *r = svn_relpath_skip_ancestor(from_path, this_path);
/* ... at a child path strictly below FROM_PATH ... */
@@ -1514,8 +1514,8 @@ find_move(apr_hash_t *moves,
for (hi = apr_hash_first(scratch_pool, moves);
hi; hi = apr_hash_next(hi))
{
- const char *this_from_relpath = svn__apr_hash_index_key(hi);
- const char *this_to_relpath = svn__apr_hash_index_val(hi);
+ const char *this_from_relpath = apr_hash_this_key(hi);
+ const char *this_to_relpath = apr_hash_this_val(hi);
const char *r
= svn_relpath_skip_ancestor(this_from_relpath, initial_relpath);
@@ -1587,7 +1587,7 @@ get_unsorted_paths(apr_hash_t *changes,
the Ev1 drive. */
for (hi = apr_hash_first(scratch_pool, changes); hi; hi = apr_hash_next(hi))
{
- const char *this_path = svn__apr_hash_index_key(hi);
+ const char *this_path = apr_hash_this_key(hi);
APR_ARRAY_PUSH(paths, const char *)
= svn_relpath_skip_ancestor(base_relpath, this_path);
Modified: subversion/branches/move-tracking-2/subversion/libsvn_diff/util.c
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_diff/util.c?rev=1614616&r1=1614615&r2=1614616&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_diff/util.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_diff/util.c Wed Jul
30 11:23:49 2014
@@ -465,8 +465,8 @@ display_mergeinfo_diff(const char *old_m
for (hi = apr_hash_first(pool, deleted);
hi; hi = apr_hash_next(hi))
{
- const char *from_path = svn__apr_hash_index_key(hi);
- svn_rangelist_t *merge_revarray = svn__apr_hash_index_val(hi);
+ const char *from_path = apr_hash_this_key(hi);
+ svn_rangelist_t *merge_revarray = apr_hash_this_val(hi);
svn_string_t *merge_revstr;
svn_pool_clear(iterpool);
@@ -482,8 +482,8 @@ display_mergeinfo_diff(const char *old_m
for (hi = apr_hash_first(pool, added);
hi; hi = apr_hash_next(hi))
{
- const char *from_path = svn__apr_hash_index_key(hi);
- svn_rangelist_t *merge_revarray = svn__apr_hash_index_val(hi);
+ const char *from_path = apr_hash_this_key(hi);
+ svn_rangelist_t *merge_revarray = apr_hash_this_val(hi);
svn_string_t *merge_revstr;
svn_pool_clear(iterpool);
Modified: subversion/branches/move-tracking-2/subversion/libsvn_fs/editor.c
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_fs/editor.c?rev=1614616&r1=1614615&r2=1614616&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_fs/editor.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_fs/editor.c Wed Jul
30 11:23:49 2014
@@ -94,8 +94,8 @@ add_new_props(svn_fs_root_t *root,
for (hi = apr_hash_first(scratch_pool, props); hi;
hi = apr_hash_next(hi))
{
- const char *name = svn__apr_hash_index_key(hi);
- const svn_string_t *value = svn__apr_hash_index_val(hi);
+ const char *name = apr_hash_this_key(hi);
+ const svn_string_t *value = apr_hash_this_val(hi);
svn_pool_clear(iterpool);
