subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From i...@apache.org
Subject svn commit: r1614851 [1/5] - in /subversion/branches/remove-log-addressing: ./ build/ subversion/bindings/javahl/native/ subversion/bindings/swig/python/svn/ subversion/include/ subversion/include/private/ subversion/libsvn_client/ subversion/libsvn_de...
Date Thu, 31 Jul 2014 10:44:21 GMT
Author: ivan
Date: Thu Jul 31 10:44:15 2014
New Revision: 1614851

URL: http://svn.apache.org/r1614851
Log:
On remove-log-addressing branch: Merge changes from trunk.

Added:
    subversion/branches/remove-log-addressing/subversion/include/private/svn_client_mtcc.h
      - copied unchanged from r1614845, subversion/trunk/subversion/include/private/svn_client_mtcc.h
    subversion/branches/remove-log-addressing/tools/dev/benchmarks/RepoPerf/
      - copied from r1614845, subversion/trunk/tools/dev/benchmarks/RepoPerf/
Removed:
    subversion/branches/remove-log-addressing/subversion/include/svn_client_mtcc.h
Modified:
    subversion/branches/remove-log-addressing/   (props changed)
    subversion/branches/remove-log-addressing/LICENSE
    subversion/branches/remove-log-addressing/Makefile.in
    subversion/branches/remove-log-addressing/NOTICE
    subversion/branches/remove-log-addressing/build.conf
    subversion/branches/remove-log-addressing/build/run_tests.py
    subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/CreateJ.cpp
    subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/LogMessageCallback.cpp
    subversion/branches/remove-log-addressing/subversion/bindings/swig/python/svn/core.py
    subversion/branches/remove-log-addressing/subversion/include/private/svn_io_private.h
    subversion/branches/remove-log-addressing/subversion/include/private/svn_named_atomic.h
    subversion/branches/remove-log-addressing/subversion/include/svn_fs.h
    subversion/branches/remove-log-addressing/subversion/include/svn_repos.h
    subversion/branches/remove-log-addressing/subversion/include/svn_string.h
    subversion/branches/remove-log-addressing/subversion/include/svn_types.h
    subversion/branches/remove-log-addressing/subversion/libsvn_client/add.c
    subversion/branches/remove-log-addressing/subversion/libsvn_client/blame.c
    subversion/branches/remove-log-addressing/subversion/libsvn_client/commit.c
    subversion/branches/remove-log-addressing/subversion/libsvn_client/commit_util.c
    subversion/branches/remove-log-addressing/subversion/libsvn_client/copy_foreign.c
    subversion/branches/remove-log-addressing/subversion/libsvn_client/delete.c
    subversion/branches/remove-log-addressing/subversion/libsvn_client/deprecated.c
    subversion/branches/remove-log-addressing/subversion/libsvn_client/diff_summarize.c
    subversion/branches/remove-log-addressing/subversion/libsvn_client/export.c
    subversion/branches/remove-log-addressing/subversion/libsvn_client/externals.c
    subversion/branches/remove-log-addressing/subversion/libsvn_client/import.c
    subversion/branches/remove-log-addressing/subversion/libsvn_client/info.c
    subversion/branches/remove-log-addressing/subversion/libsvn_client/iprops.c
    subversion/branches/remove-log-addressing/subversion/libsvn_client/list.c
    subversion/branches/remove-log-addressing/subversion/libsvn_client/locking_commands.c
    subversion/branches/remove-log-addressing/subversion/libsvn_client/merge.c
    subversion/branches/remove-log-addressing/subversion/libsvn_client/mergeinfo.c
    subversion/branches/remove-log-addressing/subversion/libsvn_client/mtcc.c
    subversion/branches/remove-log-addressing/subversion/libsvn_client/patch.c
    subversion/branches/remove-log-addressing/subversion/libsvn_client/prop_commands.c
    subversion/branches/remove-log-addressing/subversion/libsvn_client/ra.c
    subversion/branches/remove-log-addressing/subversion/libsvn_client/relocate.c
    subversion/branches/remove-log-addressing/subversion/libsvn_client/repos_diff.c
    subversion/branches/remove-log-addressing/subversion/libsvn_client/upgrade.c
    subversion/branches/remove-log-addressing/subversion/libsvn_delta/compat.c
    subversion/branches/remove-log-addressing/subversion/libsvn_delta/debug_editor.c
    subversion/branches/remove-log-addressing/subversion/libsvn_delta/debug_editor.h
    subversion/branches/remove-log-addressing/subversion/libsvn_diff/util.c
    subversion/branches/remove-log-addressing/subversion/libsvn_fs/editor.c
    subversion/branches/remove-log-addressing/subversion/libsvn_fs/fs-loader.c
    subversion/branches/remove-log-addressing/subversion/libsvn_fs/fs-loader.h
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_base/fs.c
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_base/lock.c
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_base/tree.c
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_fs/cached_data.c
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_fs/fs.c
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_fs/fs_fs.c
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_fs/hotcopy.c
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_fs/hotcopy.h
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_fs/lock.c
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_fs/recovery.c
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_fs/temp_serializer.c
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_fs/transaction.c
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_util/fs-util.c
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/   (props changed)
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/cached_data.c
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/fs.c
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/lock.c
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/temp_serializer.c
    subversion/branches/remove-log-addressing/subversion/libsvn_fs_x/transaction.c
    subversion/branches/remove-log-addressing/subversion/libsvn_ra/compat.c
    subversion/branches/remove-log-addressing/subversion/libsvn_ra/ra_loader.c
    subversion/branches/remove-log-addressing/subversion/libsvn_ra_local/ra_plugin.c
    subversion/branches/remove-log-addressing/subversion/libsvn_ra_serf/commit.c
    subversion/branches/remove-log-addressing/subversion/libsvn_ra_serf/inherited_props.c
    subversion/branches/remove-log-addressing/subversion/libsvn_ra_serf/lock.c
    subversion/branches/remove-log-addressing/subversion/libsvn_ra_serf/serf.c
    subversion/branches/remove-log-addressing/subversion/libsvn_ra_serf/update.c
    subversion/branches/remove-log-addressing/subversion/libsvn_ra_svn/client.c
    subversion/branches/remove-log-addressing/subversion/libsvn_repos/authz_pool.c
    subversion/branches/remove-log-addressing/subversion/libsvn_repos/delta.c
    subversion/branches/remove-log-addressing/subversion/libsvn_repos/fs-wrap.c
    subversion/branches/remove-log-addressing/subversion/libsvn_repos/hooks.c
    subversion/branches/remove-log-addressing/subversion/libsvn_repos/load-fs-vtable.c
    subversion/branches/remove-log-addressing/subversion/libsvn_repos/log.c
    subversion/branches/remove-log-addressing/subversion/libsvn_repos/replay.c
    subversion/branches/remove-log-addressing/subversion/libsvn_repos/reporter.c
    subversion/branches/remove-log-addressing/subversion/libsvn_repos/repos.c
    subversion/branches/remove-log-addressing/subversion/libsvn_repos/rev_hunt.c
    subversion/branches/remove-log-addressing/subversion/libsvn_subr/cache-membuffer.c
    subversion/branches/remove-log-addressing/subversion/libsvn_subr/config_auth.c
    subversion/branches/remove-log-addressing/subversion/libsvn_subr/debug.c
    subversion/branches/remove-log-addressing/subversion/libsvn_subr/hash.c
    subversion/branches/remove-log-addressing/subversion/libsvn_subr/io.c
    subversion/branches/remove-log-addressing/subversion/libsvn_subr/iter.c
    subversion/branches/remove-log-addressing/subversion/libsvn_subr/log.c
    subversion/branches/remove-log-addressing/subversion/libsvn_subr/mergeinfo.c
    subversion/branches/remove-log-addressing/subversion/libsvn_subr/named_atomic.c
    subversion/branches/remove-log-addressing/subversion/libsvn_subr/object_pool.c
    subversion/branches/remove-log-addressing/subversion/libsvn_subr/string.c
    subversion/branches/remove-log-addressing/subversion/libsvn_wc/adm_crawler.c
    subversion/branches/remove-log-addressing/subversion/libsvn_wc/adm_ops.c
    subversion/branches/remove-log-addressing/subversion/libsvn_wc/conflicts.c
    subversion/branches/remove-log-addressing/subversion/libsvn_wc/copy.c
    subversion/branches/remove-log-addressing/subversion/libsvn_wc/deprecated.c
    subversion/branches/remove-log-addressing/subversion/libsvn_wc/entries.c
    subversion/branches/remove-log-addressing/subversion/libsvn_wc/info.c
    subversion/branches/remove-log-addressing/subversion/libsvn_wc/lock.c
    subversion/branches/remove-log-addressing/subversion/libsvn_wc/node.c
    subversion/branches/remove-log-addressing/subversion/libsvn_wc/old-and-busted.c
    subversion/branches/remove-log-addressing/subversion/libsvn_wc/props.c
    subversion/branches/remove-log-addressing/subversion/libsvn_wc/status.c
    subversion/branches/remove-log-addressing/subversion/libsvn_wc/update_editor.c
    subversion/branches/remove-log-addressing/subversion/libsvn_wc/upgrade.c
    subversion/branches/remove-log-addressing/subversion/libsvn_wc/wc_db.c
    subversion/branches/remove-log-addressing/subversion/libsvn_wc/wc_db_pristine.c
    subversion/branches/remove-log-addressing/subversion/libsvn_wc/wc_db_wcroot.c
    subversion/branches/remove-log-addressing/subversion/mod_dav_svn/reports/inherited-props.c
    subversion/branches/remove-log-addressing/subversion/mod_dav_svn/reports/update.c
    subversion/branches/remove-log-addressing/subversion/mod_dav_svn/util.c
    subversion/branches/remove-log-addressing/subversion/mod_dav_svn/version.c
    subversion/branches/remove-log-addressing/subversion/svn/log-cmd.c
    subversion/branches/remove-log-addressing/subversion/svn/notify.c
    subversion/branches/remove-log-addressing/subversion/svn/propget-cmd.c
    subversion/branches/remove-log-addressing/subversion/svn/status-cmd.c
    subversion/branches/remove-log-addressing/subversion/svn/svn.c
    subversion/branches/remove-log-addressing/subversion/svnadmin/svnadmin.c
    subversion/branches/remove-log-addressing/subversion/svndumpfilter/svndumpfilter.c
    subversion/branches/remove-log-addressing/subversion/svnlook/svnlook.c
    subversion/branches/remove-log-addressing/subversion/svnmucc/svnmucc.c
    subversion/branches/remove-log-addressing/subversion/svnrdump/dump_editor.c
    subversion/branches/remove-log-addressing/subversion/svnrdump/load_editor.c
    subversion/branches/remove-log-addressing/subversion/svnrdump/util.c
    subversion/branches/remove-log-addressing/subversion/svnserve/serve.c
    subversion/branches/remove-log-addressing/subversion/svnsync/svnsync.c
    subversion/branches/remove-log-addressing/subversion/svnsync/sync.c
    subversion/branches/remove-log-addressing/subversion/tests/cmdline/entries-dump.c
    subversion/branches/remove-log-addressing/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
    subversion/branches/remove-log-addressing/subversion/tests/cmdline/svnadmin_tests.py
    subversion/branches/remove-log-addressing/subversion/tests/cmdline/svnlook_tests.py
    subversion/branches/remove-log-addressing/subversion/tests/cmdline/tree_conflict_tests.py
    subversion/branches/remove-log-addressing/subversion/tests/libsvn_client/client-test.c
    subversion/branches/remove-log-addressing/subversion/tests/libsvn_client/mtcc-test.c
    subversion/branches/remove-log-addressing/subversion/tests/libsvn_fs/locks-test.c
    subversion/branches/remove-log-addressing/subversion/tests/libsvn_ra/ra-test.c
    subversion/branches/remove-log-addressing/subversion/tests/libsvn_repos/dump-load-test.c
    subversion/branches/remove-log-addressing/subversion/tests/libsvn_repos/repos-test.c
    subversion/branches/remove-log-addressing/subversion/tests/libsvn_subr/dirent_uri-test.c
    subversion/branches/remove-log-addressing/subversion/tests/libsvn_subr/string-test.c
    subversion/branches/remove-log-addressing/subversion/tests/libsvn_wc/op-depth-test.c
    subversion/branches/remove-log-addressing/subversion/tests/svn_test_fs.c
    subversion/branches/remove-log-addressing/tools/client-side/svn-bench/null-info-cmd.c
    subversion/branches/remove-log-addressing/tools/dev/gdb-py/svndbg/printers.py
    subversion/branches/remove-log-addressing/tools/server-side/svn-rep-sharing-stats.c

Propchange: subversion/branches/remove-log-addressing/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1607901-1614845

Modified: subversion/branches/remove-log-addressing/LICENSE
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/LICENSE?rev=1614851&r1=1614850&r2=1614851&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/LICENSE (original)
+++ subversion/branches/remove-log-addressing/LICENSE Thu Jul 31 10:44:15 2014
@@ -268,3 +268,67 @@ For the file subversion/libsvn_subr/utf_
  * Permission to use, copy, modify, and distribute this software
  * for any purpose and without fee is hereby granted. The author
  * disclaims all warranties with regard to this software.
+
+For the (modified) utf8proc library in subversion/libsvn_subr/utf8proc
+
+  Copyright (c) 2009 Public Software Group e. V., Berlin, Germany
+
+  Permission is hereby granted, free of charge, to any person obtaining a
+  copy of this software and associated documentation files (the "Software"),
+  to deal in the Software without restriction, including without limitation
+  the rights to use, copy, modify, merge, publish, distribute, sublicense,
+  and/or sell copies of the Software, and to permit persons to whom the
+  Software is furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+  DEALINGS IN THE SOFTWARE.
+
+
+  This software distribution contains derived data from a modified version of
+  the Unicode data files. The following license applies to that data:
+
+  COPYRIGHT AND PERMISSION NOTICE
+
+  Copyright (c) 1991-2007 Unicode, Inc. All rights reserved. Distributed
+  under the Terms of Use in http://www.unicode.org/copyright.html.
+
+  Permission is hereby granted, free of charge, to any person obtaining a
+  copy of the Unicode data files and any associated documentation (the "Data
+  Files") or Unicode software and any associated documentation (the
+  "Software") to deal in the Data Files or Software without restriction,
+  including without limitation the rights to use, copy, modify, merge,
+  publish, distribute, and/or sell copies of the Data Files or Software, and
+  to permit persons to whom the Data Files or Software are furnished to do
+  so, provided that (a) the above copyright notice(s) and this permission
+  notice appear with all copies of the Data Files or Software, (b) both the
+  above copyright notice(s) and this permission notice appear in associated
+  documentation, and (c) there is clear notice in each modified Data File or
+  in the Software as well as in the documentation associated with the Data
+  File(s) or Software that the data or software has been modified.
+
+  THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+  KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+  THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
+  INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR
+  CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
+  USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+  PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+
+  Except as contained in this notice, the name of a copyright holder shall
+  not be used in advertising or otherwise to promote the sale, use or other
+  dealings in these Data Files or Software without prior written
+  authorization of the copyright holder.
+
+  Unicode and the Unicode logo are trademarks of Unicode, Inc., and may be
+  registered in some jurisdictions. All other trademarks and registered
+  trademarks mentioned herein are the property of their respective owners.

Modified: subversion/branches/remove-log-addressing/Makefile.in
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/Makefile.in?rev=1614851&r1=1614850&r2=1614851&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/Makefile.in (original)
+++ subversion/branches/remove-log-addressing/Makefile.in Thu Jul 31 10:44:15 2014
@@ -525,6 +525,9 @@ check: bin @TRANSFORM_LIBTOOL_SCRIPTS@ $
 	  if test "$(BASE_URL)" != ""; then                                  \
 	    flags="--url $(BASE_URL) $$flags";                               \
 	  fi;                                                                \
+	  if test "$(SKIP_C_TESTS)" != ""; then                              \
+	    flags="--skip-c-tests $$flags";                                  \
+	  fi;                                                                \
 	  if test "$(FS_TYPE)" != ""; then                                   \
 	    flags="--fs-type $(FS_TYPE) $$flags";                            \
 	  fi;                                                                \

Modified: subversion/branches/remove-log-addressing/NOTICE
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/NOTICE?rev=1614851&r1=1614850&r2=1614851&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/NOTICE (original)
+++ subversion/branches/remove-log-addressing/NOTICE Thu Jul 31 10:44:15 2014
@@ -21,3 +21,5 @@ Inc. MD5 Message-Digest Algorithm, inclu
 modifications by Spyglass Inc., Carnegie Mellon University, and
 Bell Communications Research, Inc (Bellcore).
 
+This product includes software developed by Public Software Group e. V.
+under a permissive license, see LICENSE.
\ No newline at end of file

Modified: subversion/branches/remove-log-addressing/build.conf
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/build.conf?rev=1614851&r1=1614850&r2=1614851&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/build.conf (original)
+++ subversion/branches/remove-log-addressing/build.conf Thu Jul 31 10:44:15 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/remove-log-addressing/build/run_tests.py
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/build/run_tests.py?rev=1614851&r1=1614850&r2=1614851&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/build/run_tests.py (original)
+++ subversion/branches/remove-log-addressing/build/run_tests.py Thu Jul 31 10:44:15 2014
@@ -128,7 +128,7 @@ class TestHarness:
                milestone_filter=None, set_log_level=None, ssl_cert=None,
                http_proxy=None, http_proxy_username=None,
                http_proxy_password=None, exclusive_wc_locks=None,
-               memcached_server=None):
+               memcached_server=None, skip_c_tests=None):
     '''Construct a TestHarness instance.
 
     ABS_SRCDIR and ABS_BUILDDIR are the source and build directories.
@@ -189,6 +189,7 @@ class TestHarness:
     self.memcached_server = memcached_server
     if not sys.stdout.isatty() or sys.platform == 'win32':
       TextColors.disable()
+    self.skip_c_tests = (not not skip_c_tests)
 
   def run(self, list):
     '''Run all test programs given in LIST. Print a summary of results, if
@@ -196,6 +197,16 @@ class TestHarness:
     self._open_log('w')
     failed = 0
 
+    # Only run the C tests when testing ra_local
+    if self.skip_c_tests:
+      filtered_list = []
+      for cnt, prog in enumerate(list):
+        progpath, nums = self._split_nums(prog)
+        if not progpath.endswith('.py'):
+          continue
+        filtered_list.append(prog)
+      list = filtered_list
+
     for cnt, prog in enumerate(list):
       failed = self._run_test(prog, cnt, len(list)) or failed
 
@@ -578,6 +589,12 @@ class TestHarness:
 
     return failed
 
+  def _split_nums(self, prog):
+    test_nums = None
+    if '#' in prog:
+      prog, test_nums = prog.split('#')
+    return prog, test_nums
+
   def _run_test(self, prog, test_nr, total_tests):
     "Run a single test. Return the test's exit code."
 
@@ -586,10 +603,7 @@ class TestHarness:
     else:
       log = sys.stdout
 
-    test_nums = None
-    if '#' in prog:
-      prog, test_nums = prog.split('#')
-
+    prog, test_nums = self._split_nums(prog)
     progdir, progbase = os.path.split(prog)
     if self.log:
       # Using write here because we don't want even a trailing space
@@ -668,6 +682,7 @@ def main():
   try:
     opts, args = my_getopt(sys.argv[1:], 'u:f:vc',
                            ['url=', 'fs-type=', 'verbose', 'cleanup',
+                            'skip-c-tests', 'skip-C-tests',
                             'http-library=', 'server-minor-version=',
                             'fsfs-packing', 'fsfs-sharding=',
                             'enable-sasl', 'parallel=', 'config-file=',
@@ -683,13 +698,15 @@ def main():
     print(__doc__)
     sys.exit(2)
 
-  base_url, fs_type, verbose, cleanup, enable_sasl, http_library, \
-    server_minor_version, fsfs_sharding, fsfs_packing, parallel, \
-    config_file, log_to_stdout, list_tests, mode_filter, milestone_filter, \
-    set_log_level, ssl_cert, http_proxy, http_proxy_username, \
-    http_proxy_password, exclusive_wc_locks, memcached_server = \
-            None, None, None, None, None, None, None, None, None, None, None, \
-            None, None, None, None, None, None, None, None, None, None, None
+  base_url, fs_type, verbose, cleanup, skip_c_tests, enable_sasl, \
+    http_library, server_minor_version, fsfs_sharding, fsfs_packing, \
+    parallel, config_file, log_to_stdout, list_tests, mode_filter, \
+    milestone_filter, set_log_level, ssl_cert, http_proxy, \
+    http_proxy_username, http_proxy_password, exclusive_wc_locks, \
+    memcached_server = \
+            None, None, None, None, None, None, None, None, None, None, \
+            None, None, None, None, None, None, None, None, None, None, \
+            None, None, None
   for opt, val in opts:
     if opt in ['-u', '--url']:
       base_url = val
@@ -707,6 +724,8 @@ def main():
       verbose = 1
     elif opt in ['-c', '--cleanup']:
       cleanup = 1
+    elif opt in ['--skip-c-tests', '--skip-C-tests']:
+      skip_c_tests = 1
     elif opt in ['--enable-sasl']:
       enable_sasl = 1
     elif opt in ['--parallel']:
@@ -755,7 +774,8 @@ def main():
                    http_proxy_username=http_proxy_username,
                    http_proxy_password=http_proxy_password,
                    exclusive_wc_locks=exclusive_wc_locks,
-                   memcached_server=memcached_server)
+                   memcached_server=memcached_server,
+                   skip_c_tests=skip_c_tests)
 
   failed = th.run(args[2:])
   if failed:

Modified: subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/CreateJ.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/CreateJ.cpp?rev=1614851&r1=1614850&r2=1614851&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/CreateJ.cpp (original)
+++ subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/CreateJ.cpp Thu Jul 31 10:44:15 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/remove-log-addressing/subversion/bindings/javahl/native/LogMessageCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/LogMessageCallback.cpp?rev=1614851&r1=1614850&r2=1614851&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/LogMessageCallback.cpp (original)
+++ subversion/branches/remove-log-addressing/subversion/bindings/javahl/native/LogMessageCallback.cpp Thu Jul 31 10:44:15 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/remove-log-addressing/subversion/bindings/swig/python/svn/core.py
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/bindings/swig/python/svn/core.py?rev=1614851&r1=1614850&r2=1614851&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/bindings/swig/python/svn/core.py (original)
+++ subversion/branches/remove-log-addressing/subversion/bindings/swig/python/svn/core.py Thu Jul 31 10:44:15 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/remove-log-addressing/subversion/include/private/svn_io_private.h
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/include/private/svn_io_private.h?rev=1614851&r1=1614850&r2=1614851&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/include/private/svn_io_private.h (original)
+++ subversion/branches/remove-log-addressing/subversion/include/private/svn_io_private.h Thu Jul 31 10:44:15 2014
@@ -73,6 +73,18 @@ svn_io__is_finfo_read_only(svn_boolean_t
                            apr_pool_t *pool);
 
 
+/**
+ * Lock file at @a lock_file. If that file does not exist, create an empty
+ * file.
+ *
+ * Lock will be automatically released when @a pool is cleared or destroyed.
+ * Use @a pool for memory allocations.
+ */
+svn_error_t *
+svn_io__file_lock_autocreate(const char *lock_file,
+                             apr_pool_t *pool);
+
+
 /** Buffer test handler function for a generic stream. @see svn_stream_t
  * and svn_stream__is_buffered().
  *

Modified: subversion/branches/remove-log-addressing/subversion/include/private/svn_named_atomic.h
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/include/private/svn_named_atomic.h?rev=1614851&r1=1614850&r2=1614851&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/include/private/svn_named_atomic.h (original)
+++ subversion/branches/remove-log-addressing/subversion/include/private/svn_named_atomic.h Thu Jul 31 10:44:15 2014
@@ -77,6 +77,9 @@ svn_named_atomic__is_efficient(void);
  *
  * The access object will be allocated in @a result_pool and atomics gotten
  * from this object will become invalid when the pool is being cleared.
+ *
+ * @note Although we use shared memory here, the management around it will
+ * take up a few kB of memory per call (until @a result_pool gets cleared).
  */
 svn_error_t *
 svn_atomic_namespace__create(svn_atomic_namespace__t **ns,

Modified: subversion/branches/remove-log-addressing/subversion/include/svn_fs.h
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/include/svn_fs.h?rev=1614851&r1=1614850&r2=1614851&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/include/svn_fs.h (original)
+++ subversion/branches/remove-log-addressing/subversion/include/svn_fs.h Thu Jul 31 10:44:15 2014
@@ -446,6 +446,16 @@ svn_error_t *
 svn_fs_delete_fs(const char *path,
                  apr_pool_t *pool);
 
+/** The type of a hotcopy notification function.  @a start_revision and
+ * @a end_revision indicate the copied revision range.  @a baton is the
+ * corresponding baton for the notification function, and @a pool can be
+ * used for temporary allocations, but will be cleared between invocations.
+ */
+typedef void (*svn_fs_hotcopy_notify_t)(void *baton,
+                                        svn_revnum_t start_revision,
+                                        svn_revnum_t end_revision,
+                                        apr_pool_t *pool);
+
 /**
  * Copy a possibly live Subversion filesystem from @a src_path to
  * @a dest_path.  If @a clean is @c TRUE, perform cleanup on the
@@ -458,10 +468,35 @@ svn_fs_delete_fs(const char *path,
  * incremental hotcopy is not implemented, raise
  * #SVN_ERR_UNSUPPORTED_FEATURE.
  *
+ * For each revision range copied, @a notify_func will be called with
+ * staring and ending revision numbers (both inclusive and not necessarily
+ * different) and with the @a notify_baton.  Currently, this notification
+ * is only supported in the FSFS backend.  @a notify_func may be @c NULL
+ * if this notification is not required.
+ *
  * Use @a scratch_pool for temporary allocations.
  *
+ * @since New in 1.9.
+ */
+svn_error_t *
+svn_fs_hotcopy3(const char *src_path,
+                const char *dest_path,
+                svn_boolean_t clean,
+                svn_boolean_t incremental,
+                svn_fs_hotcopy_notify_t notify_func,
+                void *notify_baton,
+                svn_cancel_func_t cancel_func,
+                void *cancel_baton,
+                apr_pool_t *scratch_pool);
+
+/**
+ * Like svn_fs_hotcopy3(), but with @a notify_func and @a notify_baton
+ * always passed as @c NULL.
+ *
+ * @deprecated Provided for backward compatibility with the 1.8 API.
  * @since New in 1.8.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_fs_hotcopy2(const char *src_path,
                 const char *dest_path,

Modified: subversion/branches/remove-log-addressing/subversion/include/svn_repos.h
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/include/svn_repos.h?rev=1614851&r1=1614850&r2=1614851&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/include/svn_repos.h (original)
+++ subversion/branches/remove-log-addressing/subversion/include/svn_repos.h Thu Jul 31 10:44:15 2014
@@ -244,7 +244,10 @@ typedef enum svn_repos_notify_action_t
   svn_repos_notify_cleanup_revprops,
 
   /** The repository format got bumped. @since New in 1.9. */
-  svn_repos_notify_format_bumped
+  svn_repos_notify_format_bumped,
+
+  /** A revision range was copied. @since New in 1.9. */
+  svn_repos_notify_hotcopy_rev_range
 } svn_repos_notify_action_t;
 
 /** The type of error occurring.
@@ -343,6 +346,16 @@ typedef struct svn_repos_notify_t
       @since New in 1.9. */
   svn_error_t *err;
 
+  /** For #svn_repos_notify_hotcopy_rev_range, the start of the copied
+      revision range.
+      @since New in 1.9. */
+  svn_revnum_t start_revision;
+
+  /** For #svn_repos_notify_hotcopy_rev_range, the end of the copied
+      revision range (might be the same as @a start_revision).
+      @since New in 1.9. */
+  svn_revnum_t end_revision;
+
   /* NOTE: Add new fields at the end to preserve binary compatibility.
      Also, if you add fields here, you have to update
      svn_repos_notify_create(). */
@@ -626,8 +639,35 @@ svn_repos_fs_type(svn_repos_t *repos, ap
  * already present in the destination. If incremental hotcopy is not
  * implemented by the filesystem backend, raise SVN_ERR_UNSUPPORTED_FEATURE.
  *
+ * For each revision range copied, the @a notify_func function will be
+ * called with the @a notify_baton and a notification structure containing
+ * appropriate values in @c start_revision and @c end_revision (both
+ * inclusive). @c start_revision might be equal to @c end_revision in
+ * case the copied range consists of a single revision. Currently, this
+ * notification is only supported for FSFS repositories. @a notify_func
+ * may be @c NULL if this notification is not required.
+ *
+ * @since New in 1.9.
+ */
+svn_error_t *
+svn_repos_hotcopy3(const char *src_path,
+                   const char *dst_path,
+                   svn_boolean_t clean_logs,
+                   svn_boolean_t incremental,
+                   svn_repos_notify_func_t notify_func,
+                   void *notify_baton,
+                   svn_cancel_func_t cancel_func,
+                   void *cancel_baton,
+                   apr_pool_t *pool);
+
+/**
+ * Like svn_repos_hotcopy3(), but with @a notify_func and @a notify_baton
+ * always passed as @c NULL.
+ *
  * @since New in 1.8.
+ * @deprecated Provided for backward compatibility with the 1.8 API.
  */
+SVN_DEPRECATED
 svn_error_t *
 svn_repos_hotcopy2(const char *src_path,
                    const char *dst_path,

Modified: subversion/branches/remove-log-addressing/subversion/include/svn_string.h
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/include/svn_string.h?rev=1614851&r1=1614850&r2=1614851&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/include/svn_string.h (original)
+++ subversion/branches/remove-log-addressing/subversion/include/svn_string.h Thu Jul 31 10:44:15 2014
@@ -586,6 +586,16 @@ svn_cstring_atoui64(apr_uint64_t *n, con
 svn_error_t *
 svn_cstring_atoui(unsigned int *n, const char *str);
 
+/**
+ * Skip the common prefix @a prefix from the C string @a str, and return
+ * a pointer to the next character after the prefix.
+ * Return @c NULL if @a str does not start with @a prefix.
+ *
+ * @since New in 1.9.
+ */
+const char *
+svn_cstring_skip_prefix(const char *str, const char *prefix);
+
 /** @} */
 
 /** @} */

Modified: subversion/branches/remove-log-addressing/subversion/include/svn_types.h
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/include/svn_types.h?rev=1614851&r1=1614850&r2=1614851&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/include/svn_types.h (original)
+++ subversion/branches/remove-log-addressing/subversion/include/svn_types.h Thu Jul 31 10:44:15 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/remove-log-addressing/subversion/libsvn_client/add.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_client/add.c?rev=1614851&r1=1614850&r2=1614851&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_client/add.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_client/add.c Thu Jul 31 10:44:15 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/remove-log-addressing/subversion/libsvn_client/blame.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_client/blame.c?rev=1614851&r1=1614850&r2=1614851&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_client/blame.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_client/blame.c Thu Jul 31 10:44:15 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/remove-log-addressing/subversion/libsvn_client/commit.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_client/commit.c?rev=1614851&r1=1614850&r2=1614851&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_client/commit.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_client/commit.c Thu Jul 31 10:44:15 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/remove-log-addressing/subversion/libsvn_client/commit_util.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_client/commit_util.c?rev=1614851&r1=1614850&r2=1614851&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_client/commit_util.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_client/commit_util.c Thu Jul 31 10:44:15 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/remove-log-addressing/subversion/libsvn_client/copy_foreign.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_client/copy_foreign.c?rev=1614851&r1=1614850&r2=1614851&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_client/copy_foreign.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_client/copy_foreign.c Thu Jul 31 10:44:15 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/remove-log-addressing/subversion/libsvn_client/delete.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_client/delete.c?rev=1614851&r1=1614850&r2=1614851&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_client/delete.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_client/delete.c Thu Jul 31 10:44:15 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/remove-log-addressing/subversion/libsvn_client/deprecated.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_client/deprecated.c?rev=1614851&r1=1614850&r2=1614851&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_client/deprecated.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_client/deprecated.c Thu Jul 31 10:44:15 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/remove-log-addressing/subversion/libsvn_client/diff_summarize.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_client/diff_summarize.c?rev=1614851&r1=1614850&r2=1614851&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_client/diff_summarize.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_client/diff_summarize.c Thu Jul 31 10:44:15 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/remove-log-addressing/subversion/libsvn_client/export.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_client/export.c?rev=1614851&r1=1614850&r2=1614851&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_client/export.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_client/export.c Thu Jul 31 10:44:15 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/remove-log-addressing/subversion/libsvn_client/externals.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_client/externals.c?rev=1614851&r1=1614850&r2=1614851&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_client/externals.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_client/externals.c Thu Jul 31 10:44:15 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/remove-log-addressing/subversion/libsvn_client/import.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_client/import.c?rev=1614851&r1=1614850&r2=1614851&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_client/import.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_client/import.c Thu Jul 31 10:44:15 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);
@@ -1001,7 +1001,7 @@ svn_client_import5(const char *path,
     {
       return svn_error_compose_create(
                     err,
-                    editor->abort_edit(edit_baton, iterpool));
+                    editor->abort_edit(edit_baton, scratch_pool));
     }
 
   return SVN_NO_ERROR;

Modified: subversion/branches/remove-log-addressing/subversion/libsvn_client/info.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_client/info.c?rev=1614851&r1=1614850&r2=1614851&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_client/info.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_client/info.c Thu Jul 31 10:44:15 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/remove-log-addressing/subversion/libsvn_client/iprops.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_client/iprops.c?rev=1614851&r1=1614850&r2=1614851&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_client/iprops.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_client/iprops.c Thu Jul 31 10:44:15 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/remove-log-addressing/subversion/libsvn_client/list.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_client/list.c?rev=1614851&r1=1614850&r2=1614851&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_client/list.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_client/list.c Thu Jul 31 10:44:15 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/remove-log-addressing/subversion/libsvn_client/locking_commands.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_client/locking_commands.c?rev=1614851&r1=1614850&r2=1614851&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_client/locking_commands.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_client/locking_commands.c Thu Jul 31 10:44:15 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/remove-log-addressing/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_client/merge.c?rev=1614851&r1=1614850&r2=1614851&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_client/merge.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_client/merge.c Thu Jul 31 10:44:15 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/remove-log-addressing/subversion/libsvn_client/mergeinfo.c
URL: http://svn.apache.org/viewvc/subversion/branches/remove-log-addressing/subversion/libsvn_client/mergeinfo.c?rev=1614851&r1=1614850&r2=1614851&view=diff
==============================================================================
--- subversion/branches/remove-log-addressing/subversion/libsvn_client/mergeinfo.c (original)
+++ subversion/branches/remove-log-addressing/subversion/libsvn_client/mergeinfo.c Thu Jul 31 10:44:15 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 *) = \



Mime
View raw message