Author: ivan
Date: Fri Nov 14 13:17:55 2014
New Revision: 1639628
URL: http://svn.apache.org/r1639628
Log:
On svn-auth-x509 branch: Synced with trunk to r1639627.
Added:
subversion/branches/svn-auth-x509/notes/api-errata/1.9/
- copied from r1639627, subversion/trunk/notes/api-errata/1.9/
subversion/branches/svn-auth-x509/subversion/bindings/javahl/native/deprecated.cpp
- copied unchanged from r1639627,
subversion/trunk/subversion/bindings/javahl/native/deprecated.cpp
subversion/branches/svn-auth-x509/subversion/include/private/svn_fs_fs_private.h
- copied unchanged from r1639627,
subversion/trunk/subversion/include/private/svn_fs_fs_private.h
subversion/branches/svn-auth-x509/subversion/libsvn_fs_fs/dump-index.c
- copied unchanged from r1639627,
subversion/trunk/subversion/libsvn_fs_fs/dump-index.c
subversion/branches/svn-auth-x509/subversion/libsvn_fs_fs/load-index.c
- copied unchanged from r1639627,
subversion/trunk/subversion/libsvn_fs_fs/load-index.c
subversion/branches/svn-auth-x509/subversion/libsvn_fs_fs/stats.c
- copied unchanged from r1639627,
subversion/trunk/subversion/libsvn_fs_fs/stats.c
subversion/branches/svn-auth-x509/subversion/libsvn_fs_x/rev_file.c
- copied unchanged from r1639627,
subversion/trunk/subversion/libsvn_fs_x/rev_file.c
subversion/branches/svn-auth-x509/subversion/libsvn_fs_x/rev_file.h
- copied unchanged from r1639627,
subversion/trunk/subversion/libsvn_fs_x/rev_file.h
subversion/branches/svn-auth-x509/subversion/svn-bench/
- copied from r1639627, subversion/trunk/subversion/svn-bench/
subversion/branches/svn-auth-x509/subversion/svnfsfs/
- copied from r1639627, subversion/trunk/subversion/svnfsfs/
subversion/branches/svn-auth-x509/subversion/tests/libsvn_fs_fs/fs-fs-fuzzy-test.c
- copied unchanged from r1639627,
subversion/trunk/subversion/tests/libsvn_fs_fs/fs-fs-fuzzy-test.c
subversion/branches/svn-auth-x509/subversion/tests/libsvn_fs_fs/fs-fs-private-test.c
- copied unchanged from r1639627,
subversion/trunk/subversion/tests/libsvn_fs_fs/fs-fs-private-test.c
subversion/branches/svn-auth-x509/subversion/tests/templates/
- copied from r1639627, subversion/trunk/subversion/tests/templates/
subversion/branches/svn-auth-x509/tools/buildbot/slaves/svn-x64-macosx/
- copied from r1639627,
subversion/trunk/tools/buildbot/slaves/svn-x64-macosx/
subversion/branches/svn-auth-x509/tools/client-side/svn-vendor.py
- copied unchanged from r1639627,
subversion/trunk/tools/client-side/svn-vendor.py
Removed:
subversion/branches/svn-auth-x509/subversion/include/private/svn_file.h
subversion/branches/svn-auth-x509/subversion/include/private/svn_named_atomic.h
subversion/branches/svn-auth-x509/subversion/libsvn_subr/file.c
subversion/branches/svn-auth-x509/subversion/libsvn_subr/named_atomic.c
subversion/branches/svn-auth-x509/subversion/svn/client_errors.h
subversion/branches/svn-auth-x509/subversion/tests/libsvn_subr/named_atomic-test-common.h
subversion/branches/svn-auth-x509/subversion/tests/libsvn_subr/named_atomic-test-proc.c
subversion/branches/svn-auth-x509/subversion/tests/libsvn_subr/named_atomic-test.c
subversion/branches/svn-auth-x509/tools/client-side/showchange.pl
subversion/branches/svn-auth-x509/tools/client-side/svn-bench/
subversion/branches/svn-auth-x509/tools/server-side/svn-rep-sharing-stats.c
subversion/branches/svn-auth-x509/tools/server-side/svnfsfs/
Modified:
subversion/branches/svn-auth-x509/ (props changed)
subversion/branches/svn-auth-x509/COMMITTERS
subversion/branches/svn-auth-x509/autogen.sh
subversion/branches/svn-auth-x509/build.conf
subversion/branches/svn-auth-x509/build/buildcheck.sh
subversion/branches/svn-auth-x509/build/generator/gen_win_dependencies.py
subversion/branches/svn-auth-x509/build/run_tests.py
subversion/branches/svn-auth-x509/configure.ac
subversion/branches/svn-auth-x509/notes/ (props changed)
subversion/branches/svn-auth-x509/notes/api-errata/1.8/fs001.txt
(contents, props changed)
subversion/branches/svn-auth-x509/notes/knobs
subversion/branches/svn-auth-x509/notes/wc-ng/conflict-storage-2.0
subversion/branches/svn-auth-x509/subversion/bindings/ctypes-python/README
(props changed)
subversion/branches/svn-auth-x509/subversion/bindings/cxxhl/README (props
changed)
subversion/branches/svn-auth-x509/subversion/bindings/javahl/native/SVNClient.cpp
subversion/branches/svn-auth-x509/subversion/bindings/javahl/native/SVNRepos.cpp
subversion/branches/svn-auth-x509/subversion/bindings/javahl/native/SVNRepos.h
subversion/branches/svn-auth-x509/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNRepos.cpp
subversion/branches/svn-auth-x509/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_DiffLib.cpp
subversion/branches/svn-auth-x509/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRepos.java
subversion/branches/svn-auth-x509/subversion/bindings/javahl/src/org/apache/subversion/javahl/ReposNotifyInformation.java
subversion/branches/svn-auth-x509/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNRepos.java
subversion/branches/svn-auth-x509/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
subversion/branches/svn-auth-x509/subversion/bindings/swig/include/svn_string.swg
subversion/branches/svn-auth-x509/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
subversion/branches/svn-auth-x509/subversion/bindings/swig/python/svn/core.py
subversion/branches/svn-auth-x509/subversion/bindings/swig/ruby/test/test_ra.rb
subversion/branches/svn-auth-x509/subversion/bindings/swig/svn_wc.i
subversion/branches/svn-auth-x509/subversion/include/private/README
(props changed)
subversion/branches/svn-auth-x509/subversion/include/private/svn_cert.h
(props changed)
subversion/branches/svn-auth-x509/subversion/include/private/svn_dep_compat.h
subversion/branches/svn-auth-x509/subversion/include/private/svn_diff_private.h
subversion/branches/svn-auth-x509/subversion/include/private/svn_diff_tree.h
subversion/branches/svn-auth-x509/subversion/include/private/svn_mutex.h
subversion/branches/svn-auth-x509/subversion/include/private/svn_opt_private.h
subversion/branches/svn-auth-x509/subversion/include/private/svn_string_private.h
subversion/branches/svn-auth-x509/subversion/include/private/svn_wc_private.h
subversion/branches/svn-auth-x509/subversion/include/svn_client.h
subversion/branches/svn-auth-x509/subversion/include/svn_cmdline.h
subversion/branches/svn-auth-x509/subversion/include/svn_config.h
subversion/branches/svn-auth-x509/subversion/include/svn_delta.h
subversion/branches/svn-auth-x509/subversion/include/svn_diff.h
subversion/branches/svn-auth-x509/subversion/include/svn_error_codes.h
subversion/branches/svn-auth-x509/subversion/include/svn_fs.h
subversion/branches/svn-auth-x509/subversion/include/svn_io.h
subversion/branches/svn-auth-x509/subversion/include/svn_opt.h
subversion/branches/svn-auth-x509/subversion/include/svn_repos.h
subversion/branches/svn-auth-x509/subversion/include/svn_string.h
subversion/branches/svn-auth-x509/subversion/include/svn_types.h
subversion/branches/svn-auth-x509/subversion/include/svn_wc.h
subversion/branches/svn-auth-x509/subversion/libsvn_client/checkout.c
subversion/branches/svn-auth-x509/subversion/libsvn_client/cleanup.c
subversion/branches/svn-auth-x509/subversion/libsvn_client/client.h
subversion/branches/svn-auth-x509/subversion/libsvn_client/cmdline.c
subversion/branches/svn-auth-x509/subversion/libsvn_client/commit.c
subversion/branches/svn-auth-x509/subversion/libsvn_client/commit_util.c
subversion/branches/svn-auth-x509/subversion/libsvn_client/copy.c
subversion/branches/svn-auth-x509/subversion/libsvn_client/diff.c
subversion/branches/svn-auth-x509/subversion/libsvn_client/diff_local.c
subversion/branches/svn-auth-x509/subversion/libsvn_client/export.c
subversion/branches/svn-auth-x509/subversion/libsvn_client/externals.c
subversion/branches/svn-auth-x509/subversion/libsvn_client/import.c
subversion/branches/svn-auth-x509/subversion/libsvn_client/merge.c
subversion/branches/svn-auth-x509/subversion/libsvn_client/mtcc.c
subversion/branches/svn-auth-x509/subversion/libsvn_client/patch.c
subversion/branches/svn-auth-x509/subversion/libsvn_client/prop_commands.c
subversion/branches/svn-auth-x509/subversion/libsvn_client/ra.c
subversion/branches/svn-auth-x509/subversion/libsvn_client/relocate.c
subversion/branches/svn-auth-x509/subversion/libsvn_client/resolved.c
subversion/branches/svn-auth-x509/subversion/libsvn_client/revert.c
subversion/branches/svn-auth-x509/subversion/libsvn_client/status.c
subversion/branches/svn-auth-x509/subversion/libsvn_client/switch.c
subversion/branches/svn-auth-x509/subversion/libsvn_client/update.c
subversion/branches/svn-auth-x509/subversion/libsvn_client/upgrade.c
subversion/branches/svn-auth-x509/subversion/libsvn_client/util.c
subversion/branches/svn-auth-x509/subversion/libsvn_delta/debug_editor.c
subversion/branches/svn-auth-x509/subversion/libsvn_delta/svndiff.c
subversion/branches/svn-auth-x509/subversion/libsvn_delta/text_delta.c
subversion/branches/svn-auth-x509/subversion/libsvn_diff/deprecated.c
subversion/branches/svn-auth-x509/subversion/libsvn_diff/diff_file.c
subversion/branches/svn-auth-x509/subversion/libsvn_diff/diff_memory.c
subversion/branches/svn-auth-x509/subversion/libsvn_diff/util.c
subversion/branches/svn-auth-x509/subversion/libsvn_fs/editor.c
subversion/branches/svn-auth-x509/subversion/libsvn_fs/fs-loader.c
subversion/branches/svn-auth-x509/subversion/libsvn_fs_base/bdb/changes-table.c
subversion/branches/svn-auth-x509/subversion/libsvn_fs_base/bdb/env.c
subversion/branches/svn-auth-x509/subversion/libsvn_fs_base/fs.c
subversion/branches/svn-auth-x509/subversion/libsvn_fs_fs/cached_data.c
subversion/branches/svn-auth-x509/subversion/libsvn_fs_fs/caching.c
subversion/branches/svn-auth-x509/subversion/libsvn_fs_fs/fs.c
subversion/branches/svn-auth-x509/subversion/libsvn_fs_fs/fs.h
subversion/branches/svn-auth-x509/subversion/libsvn_fs_fs/fs_fs.c
subversion/branches/svn-auth-x509/subversion/libsvn_fs_fs/fs_fs.h
subversion/branches/svn-auth-x509/subversion/libsvn_fs_fs/hotcopy.c
subversion/branches/svn-auth-x509/subversion/libsvn_fs_fs/id.c
subversion/branches/svn-auth-x509/subversion/libsvn_fs_fs/id.h
subversion/branches/svn-auth-x509/subversion/libsvn_fs_fs/index.c
subversion/branches/svn-auth-x509/subversion/libsvn_fs_fs/index.h
subversion/branches/svn-auth-x509/subversion/libsvn_fs_fs/lock.c
subversion/branches/svn-auth-x509/subversion/libsvn_fs_fs/low_level.c
subversion/branches/svn-auth-x509/subversion/libsvn_fs_fs/low_level.h
subversion/branches/svn-auth-x509/subversion/libsvn_fs_fs/pack.c
subversion/branches/svn-auth-x509/subversion/libsvn_fs_fs/recovery.c
subversion/branches/svn-auth-x509/subversion/libsvn_fs_fs/rev_file.c
subversion/branches/svn-auth-x509/subversion/libsvn_fs_fs/rev_file.h
subversion/branches/svn-auth-x509/subversion/libsvn_fs_fs/revprops.c
subversion/branches/svn-auth-x509/subversion/libsvn_fs_fs/revprops.h
subversion/branches/svn-auth-x509/subversion/libsvn_fs_fs/structure
subversion/branches/svn-auth-x509/subversion/libsvn_fs_fs/structure-indexes
subversion/branches/svn-auth-x509/subversion/libsvn_fs_fs/temp_serializer.c
subversion/branches/svn-auth-x509/subversion/libsvn_fs_fs/transaction.c
subversion/branches/svn-auth-x509/subversion/libsvn_fs_fs/tree.c
subversion/branches/svn-auth-x509/subversion/libsvn_fs_fs/util.c
subversion/branches/svn-auth-x509/subversion/libsvn_fs_fs/util.h
subversion/branches/svn-auth-x509/subversion/libsvn_fs_fs/verify.c
subversion/branches/svn-auth-x509/subversion/libsvn_fs_util/fs-util.c
subversion/branches/svn-auth-x509/subversion/libsvn_fs_x/ (props changed)
subversion/branches/svn-auth-x509/subversion/libsvn_fs_x/cached_data.c
subversion/branches/svn-auth-x509/subversion/libsvn_fs_x/cached_data.h
subversion/branches/svn-auth-x509/subversion/libsvn_fs_x/caching.c
subversion/branches/svn-auth-x509/subversion/libsvn_fs_x/dag.c
subversion/branches/svn-auth-x509/subversion/libsvn_fs_x/fs.c
subversion/branches/svn-auth-x509/subversion/libsvn_fs_x/fs.h
subversion/branches/svn-auth-x509/subversion/libsvn_fs_x/fs_x.c
subversion/branches/svn-auth-x509/subversion/libsvn_fs_x/fs_x.h
subversion/branches/svn-auth-x509/subversion/libsvn_fs_x/hotcopy.c
subversion/branches/svn-auth-x509/subversion/libsvn_fs_x/hotcopy.h
subversion/branches/svn-auth-x509/subversion/libsvn_fs_x/id.c
subversion/branches/svn-auth-x509/subversion/libsvn_fs_x/id.h
subversion/branches/svn-auth-x509/subversion/libsvn_fs_x/index.c
subversion/branches/svn-auth-x509/subversion/libsvn_fs_x/index.h
subversion/branches/svn-auth-x509/subversion/libsvn_fs_x/lock.c
subversion/branches/svn-auth-x509/subversion/libsvn_fs_x/low_level.c
subversion/branches/svn-auth-x509/subversion/libsvn_fs_x/low_level.h
subversion/branches/svn-auth-x509/subversion/libsvn_fs_x/noderevs.c
subversion/branches/svn-auth-x509/subversion/libsvn_fs_x/pack.c
subversion/branches/svn-auth-x509/subversion/libsvn_fs_x/recovery.c
subversion/branches/svn-auth-x509/subversion/libsvn_fs_x/reps.c
subversion/branches/svn-auth-x509/subversion/libsvn_fs_x/reps.h
subversion/branches/svn-auth-x509/subversion/libsvn_fs_x/revprops.c
subversion/branches/svn-auth-x509/subversion/libsvn_fs_x/revprops.h
subversion/branches/svn-auth-x509/subversion/libsvn_fs_x/string_table.c
subversion/branches/svn-auth-x509/subversion/libsvn_fs_x/temp_serializer.c
subversion/branches/svn-auth-x509/subversion/libsvn_fs_x/transaction.c
subversion/branches/svn-auth-x509/subversion/libsvn_fs_x/transaction.h
subversion/branches/svn-auth-x509/subversion/libsvn_fs_x/tree.c
subversion/branches/svn-auth-x509/subversion/libsvn_fs_x/util.c
subversion/branches/svn-auth-x509/subversion/libsvn_fs_x/util.h
subversion/branches/svn-auth-x509/subversion/libsvn_fs_x/verify.c
subversion/branches/svn-auth-x509/subversion/libsvn_ra_serf/blame.c
subversion/branches/svn-auth-x509/subversion/libsvn_ra_serf/commit.c
subversion/branches/svn-auth-x509/subversion/libsvn_ra_serf/get_lock.c
subversion/branches/svn-auth-x509/subversion/libsvn_ra_serf/lock.c
subversion/branches/svn-auth-x509/subversion/libsvn_ra_serf/log.c
subversion/branches/svn-auth-x509/subversion/libsvn_ra_serf/merge.c
subversion/branches/svn-auth-x509/subversion/libsvn_ra_serf/ra_serf.h
subversion/branches/svn-auth-x509/subversion/libsvn_ra_serf/replay.c
subversion/branches/svn-auth-x509/subversion/libsvn_ra_serf/update.c
subversion/branches/svn-auth-x509/subversion/libsvn_ra_serf/xml.c
subversion/branches/svn-auth-x509/subversion/libsvn_ra_svn/client.c
subversion/branches/svn-auth-x509/subversion/libsvn_ra_svn/cyrus_auth.c
subversion/branches/svn-auth-x509/subversion/libsvn_repos/dump.c
subversion/branches/svn-auth-x509/subversion/libsvn_repos/load-fs-vtable.c
subversion/branches/svn-auth-x509/subversion/libsvn_repos/replay.c
subversion/branches/svn-auth-x509/subversion/libsvn_repos/repos.c
subversion/branches/svn-auth-x509/subversion/libsvn_repos/rev_hunt.c
subversion/branches/svn-auth-x509/subversion/libsvn_subr/bit_array.c
(props changed)
subversion/branches/svn-auth-x509/subversion/libsvn_subr/cache-inprocess.c
subversion/branches/svn-auth-x509/subversion/libsvn_subr/cache-membuffer.c
subversion/branches/svn-auth-x509/subversion/libsvn_subr/cache-memcache.c
subversion/branches/svn-auth-x509/subversion/libsvn_subr/cmdline.c
subversion/branches/svn-auth-x509/subversion/libsvn_subr/debug.c
subversion/branches/svn-auth-x509/subversion/libsvn_subr/deprecated.c
subversion/branches/svn-auth-x509/subversion/libsvn_subr/dso.c
subversion/branches/svn-auth-x509/subversion/libsvn_subr/error.c
subversion/branches/svn-auth-x509/subversion/libsvn_subr/gpg_agent.c
subversion/branches/svn-auth-x509/subversion/libsvn_subr/io.c
subversion/branches/svn-auth-x509/subversion/libsvn_subr/mutex.c
subversion/branches/svn-auth-x509/subversion/libsvn_subr/object_pool.c
subversion/branches/svn-auth-x509/subversion/libsvn_subr/opt.c
subversion/branches/svn-auth-x509/subversion/libsvn_subr/packed_data.c
subversion/branches/svn-auth-x509/subversion/libsvn_subr/path.c
subversion/branches/svn-auth-x509/subversion/libsvn_subr/root_pools.c
subversion/branches/svn-auth-x509/subversion/libsvn_subr/sorts.c
subversion/branches/svn-auth-x509/subversion/libsvn_subr/sqlite.c
subversion/branches/svn-auth-x509/subversion/libsvn_subr/stream.c
subversion/branches/svn-auth-x509/subversion/libsvn_subr/string.c
subversion/branches/svn-auth-x509/subversion/libsvn_subr/subst.c
subversion/branches/svn-auth-x509/subversion/libsvn_subr/sysinfo.c
subversion/branches/svn-auth-x509/subversion/libsvn_subr/utf.c
subversion/branches/svn-auth-x509/subversion/libsvn_subr/utf8proc.c
subversion/branches/svn-auth-x509/subversion/libsvn_subr/utf8proc/README
(props changed)
subversion/branches/svn-auth-x509/subversion/libsvn_subr/win32_xlate.c
subversion/branches/svn-auth-x509/subversion/libsvn_wc/adm_crawler.c
subversion/branches/svn-auth-x509/subversion/libsvn_wc/adm_ops.c
subversion/branches/svn-auth-x509/subversion/libsvn_wc/cleanup.c
subversion/branches/svn-auth-x509/subversion/libsvn_wc/conflicts.c
subversion/branches/svn-auth-x509/subversion/libsvn_wc/conflicts.h
subversion/branches/svn-auth-x509/subversion/libsvn_wc/copy.c
subversion/branches/svn-auth-x509/subversion/libsvn_wc/deprecated.c
subversion/branches/svn-auth-x509/subversion/libsvn_wc/diff.h
subversion/branches/svn-auth-x509/subversion/libsvn_wc/diff_editor.c
subversion/branches/svn-auth-x509/subversion/libsvn_wc/diff_local.c
subversion/branches/svn-auth-x509/subversion/libsvn_wc/entries.c
subversion/branches/svn-auth-x509/subversion/libsvn_wc/externals.c
subversion/branches/svn-auth-x509/subversion/libsvn_wc/info.c
subversion/branches/svn-auth-x509/subversion/libsvn_wc/merge.c
subversion/branches/svn-auth-x509/subversion/libsvn_wc/node.c
subversion/branches/svn-auth-x509/subversion/libsvn_wc/props.c
subversion/branches/svn-auth-x509/subversion/libsvn_wc/props.h
subversion/branches/svn-auth-x509/subversion/libsvn_wc/tree_conflicts.c
subversion/branches/svn-auth-x509/subversion/libsvn_wc/tree_conflicts.h
subversion/branches/svn-auth-x509/subversion/libsvn_wc/update_editor.c
subversion/branches/svn-auth-x509/subversion/libsvn_wc/upgrade.c
subversion/branches/svn-auth-x509/subversion/libsvn_wc/util.c
subversion/branches/svn-auth-x509/subversion/libsvn_wc/wc.h
subversion/branches/svn-auth-x509/subversion/libsvn_wc/wc_db.c
subversion/branches/svn-auth-x509/subversion/libsvn_wc/wc_db.h
subversion/branches/svn-auth-x509/subversion/libsvn_wc/workqueue.c
subversion/branches/svn-auth-x509/subversion/libsvn_wc/workqueue.h
subversion/branches/svn-auth-x509/subversion/mod_dav_svn/deadprops.c
subversion/branches/svn-auth-x509/subversion/mod_dav_svn/lock.c
subversion/branches/svn-auth-x509/subversion/mod_dav_svn/status.c (props
changed)
subversion/branches/svn-auth-x509/subversion/mod_dav_svn/util.c
subversion/branches/svn-auth-x509/subversion/po/de.po
subversion/branches/svn-auth-x509/subversion/po/es.po
subversion/branches/svn-auth-x509/subversion/po/fr.po
subversion/branches/svn-auth-x509/subversion/po/it.po
subversion/branches/svn-auth-x509/subversion/po/ja.po
subversion/branches/svn-auth-x509/subversion/po/ko.po
subversion/branches/svn-auth-x509/subversion/po/nb.po
subversion/branches/svn-auth-x509/subversion/po/pl.po
subversion/branches/svn-auth-x509/subversion/po/pt_BR.po
subversion/branches/svn-auth-x509/subversion/po/zh_TW.po
subversion/branches/svn-auth-x509/subversion/svn/auth-cmd.c
subversion/branches/svn-auth-x509/subversion/svn/checkout-cmd.c
subversion/branches/svn-auth-x509/subversion/svn/cl-conflicts.c
subversion/branches/svn-auth-x509/subversion/svn/cl.h
subversion/branches/svn-auth-x509/subversion/svn/conflict-callbacks.c
subversion/branches/svn-auth-x509/subversion/svn/export-cmd.c
subversion/branches/svn-auth-x509/subversion/svn/status.c
subversion/branches/svn-auth-x509/subversion/svn/svn.c
subversion/branches/svn-auth-x509/subversion/svn/util.c
subversion/branches/svn-auth-x509/subversion/svn_private_config.hw
subversion/branches/svn-auth-x509/subversion/svnadmin/svnadmin.c
subversion/branches/svn-auth-x509/subversion/svnlook/svnlook.c
subversion/branches/svn-auth-x509/subversion/svnmucc/svnmucc.c
subversion/branches/svn-auth-x509/subversion/svnrdump/svnrdump.c
subversion/branches/svn-auth-x509/subversion/svnserve/logger.c
subversion/branches/svn-auth-x509/subversion/svnsync/svnsync.c
subversion/branches/svn-auth-x509/subversion/tests/cmdline/authz_tests.py
subversion/branches/svn-auth-x509/subversion/tests/cmdline/basic_tests.py
subversion/branches/svn-auth-x509/subversion/tests/cmdline/davautocheck.sh
subversion/branches/svn-auth-x509/subversion/tests/cmdline/diff_tests.py
subversion/branches/svn-auth-x509/subversion/tests/cmdline/externals_tests.py
subversion/branches/svn-auth-x509/subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
subversion/branches/svn-auth-x509/subversion/tests/cmdline/lock-helper.c
subversion/branches/svn-auth-x509/subversion/tests/cmdline/lock_tests.py
subversion/branches/svn-auth-x509/subversion/tests/cmdline/relocate_tests.py
subversion/branches/svn-auth-x509/subversion/tests/cmdline/svnadmin_tests.py
subversion/branches/svn-auth-x509/subversion/tests/cmdline/svntest/actions.py
subversion/branches/svn-auth-x509/subversion/tests/cmdline/svntest/main.py
subversion/branches/svn-auth-x509/subversion/tests/cmdline/switch_tests.py
subversion/branches/svn-auth-x509/subversion/tests/cmdline/tree_conflict_tests.py
subversion/branches/svn-auth-x509/subversion/tests/libsvn_diff/diff-diff3-test.c
subversion/branches/svn-auth-x509/subversion/tests/libsvn_fs/ (props
changed)
subversion/branches/svn-auth-x509/subversion/tests/libsvn_fs/fs-test.c
subversion/branches/svn-auth-x509/subversion/tests/libsvn_fs_fs/ (props
changed)
subversion/branches/svn-auth-x509/subversion/tests/libsvn_fs_fs/fs-fs-pack-test.c
subversion/branches/svn-auth-x509/subversion/tests/libsvn_fs_x/ (props
changed)
subversion/branches/svn-auth-x509/subversion/tests/libsvn_fs_x/fs-x-pack-test.c
subversion/branches/svn-auth-x509/subversion/tests/libsvn_subr/ (props
changed)
subversion/branches/svn-auth-x509/subversion/tests/libsvn_subr/bit-array-test.c
(props changed)
subversion/branches/svn-auth-x509/subversion/tests/libsvn_subr/io-test.c
subversion/branches/svn-auth-x509/subversion/tests/libsvn_subr/skel-test.c
subversion/branches/svn-auth-x509/subversion/tests/libsvn_subr/stream-test.c
subversion/branches/svn-auth-x509/subversion/tests/libsvn_subr/translate-test.c
subversion/branches/svn-auth-x509/subversion/tests/libsvn_wc/conflict-data-test.c
subversion/branches/svn-auth-x509/subversion/tests/libsvn_wc/utils.c
subversion/branches/svn-auth-x509/subversion/tests/libsvn_wc/wc-test.c
subversion/branches/svn-auth-x509/subversion/tests/manual/README (props
changed)
subversion/branches/svn-auth-x509/subversion/tests/svn_test.h
subversion/branches/svn-auth-x509/subversion/tests/svn_test_fs.c
subversion/branches/svn-auth-x509/subversion/tests/svn_test_fs.h
subversion/branches/svn-auth-x509/subversion/tests/svn_test_main.c
subversion/branches/svn-auth-x509/tools/buildbot/slaves/win32-SharpSvn/svntest-cleanup.cmd
subversion/branches/svn-auth-x509/tools/client-side/bash_completion
subversion/branches/svn-auth-x509/tools/dev/fsfs-access-map.c
subversion/branches/svn-auth-x509/tools/dev/svnraisetreeconflict/svnraisetreeconflict.c
subversion/branches/svn-auth-x509/tools/dev/unix-build/Makefile.svn
subversion/branches/svn-auth-x509/tools/diff/diff.c
subversion/branches/svn-auth-x509/tools/diff/diff3.c
subversion/branches/svn-auth-x509/tools/diff/diff4.c
subversion/branches/svn-auth-x509/tools/dist/release.py
subversion/branches/svn-auth-x509/tools/server-side/svnpredumpfilter.py
Propchange: subversion/branches/svn-auth-x509/
------------------------------------------------------------------------------
--- svn:auto-props (added)
+++ svn:auto-props Fri Nov 14 13:17:55 2014
@@ -0,0 +1,10 @@
+*.c = svn:eol-style=native
+*.cpp = svn:eol-style=native
+*.h = svn:eol-style=native
+*.hpp = svn:eol-style=native
+*.py = svn:eol-style=native
+*.pl = svn:eol-style=native
+*.rb = svn:eol-style=native
+*.txt = svn:eol-style=native
+README = svn:eol-style=native
+BRANCH-README = svn:eol-style=native
Propchange: subversion/branches/svn-auth-x509/
------------------------------------------------------------------------------
Merged /subversion/branches/revprop-caching-ng:r1620597,1620599
Merged /subversion/trunk:r1616094-1639627
Modified: subversion/branches/svn-auth-x509/COMMITTERS
URL:
http://svn.apache.org/viewvc/subversion/branches/svn-auth-x509/COMMITTERS?rev=1639628&r1=1639627&r2=1639628&view=diff
==============================================================================
--- subversion/branches/svn-auth-x509/COMMITTERS [UTF-8] (original)
+++ subversion/branches/svn-auth-x509/COMMITTERS [UTF-8] Fri Nov 14 13:17:55
2014
@@ -98,6 +98,8 @@ Commit access for specific areas:
sage Sage LaTorra <sag...@gmail.com> (Ctypes-Python b.)
vmpn Vladimir Berezniker <v...@hitechman.com> (JavaHL bindings)
rschupp Roderich Schupp <roderich.sch...@gmail.com> (Swig bindings)
+ stilor Alexey Neyman <sti...@att.net> (Python bindings,
+ svn-vendor.py)
Packages:
Modified: subversion/branches/svn-auth-x509/autogen.sh
URL:
http://svn.apache.org/viewvc/subversion/branches/svn-auth-x509/autogen.sh?rev=1639628&r1=1639627&r2=1639628&view=diff
==============================================================================
--- subversion/branches/svn-auth-x509/autogen.sh (original)
+++ subversion/branches/svn-auth-x509/autogen.sh Fri Nov 14 13:17:55 2014
@@ -59,7 +59,8 @@ done
# ### APR's libtool. deferring to a second round of change...
#
-libtoolize="`./build/PrintPath glibtoolize libtoolize libtoolize15`"
+# Much like APR except we do not prefer libtool 1 over libtool 2.
+libtoolize="`./build/PrintPath glibtoolize libtoolize glibtoolize1
libtoolize15 libtoolize14`"
lt_major_version=`$libtoolize --version 2>/dev/null | sed -e 's/^[^0-9]*//' -e
's/\..*//' -e '/^$/d' -e 1q`
if [ "x$libtoolize" = "x" ]; then
@@ -71,7 +72,7 @@ rm -f build/config.guess build/config.su
$libtoolize --copy --automake --force
ltpath="`dirname $libtoolize`"
-ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4}
+ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`}/libtool.m4
if [ ! -f $ltfile ]; then
echo "$ltfile not found (try setting the LIBTOOL_M4 environment variable)"
@@ -91,7 +92,7 @@ for file in ltoptions.m4 ltsugar.m4 ltve
rm -f build/$file
if [ $lt_major_version -ge 2 ]; then
- ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/$file}
+ ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`}/$file
if [ ! -f $ltfile ]; then
echo "$ltfile not found (try setting the LIBTOOL_M4 environment
variable)"
@@ -105,7 +106,7 @@ done
if [ $lt_major_version -ge 2 ]; then
for file in config.guess config.sub; do
- configfile=${LIBTOOL_CONFIG-`cd $ltpath/../share/libtool/config ;
pwd`/$file}
+ configfile=${LIBTOOL_CONFIG-`cd $ltpath/../share/libtool/config ;
pwd`}/$file
if [ ! -f $configfile ]; then
echo "$configfile not found (try setting the LIBTOOL_CONFIG
environment variable)"
Modified: subversion/branches/svn-auth-x509/build.conf
URL:
http://svn.apache.org/viewvc/subversion/branches/svn-auth-x509/build.conf?rev=1639628&r1=1639627&r2=1639628&view=diff
==============================================================================
--- subversion/branches/svn-auth-x509/build.conf (original)
+++ subversion/branches/svn-auth-x509/build.conf Fri Nov 14 13:17:55 2014
@@ -382,7 +382,7 @@ msvc-export =
private\svn_temp_serializer.h private\svn_io_private.h
private\svn_sorts_private.h
private\svn_string_private.h private\svn_magic.h
- private\svn_subr_private.h private\svn_mutex.h
private\svn_named_atomic.h
+ private\svn_subr_private.h private\svn_mutex.h
private\svn_packed_data.h private\svn_object_pool.h private\svn_cert.h
# Working copy management lib
@@ -427,7 +427,7 @@ install = tools
[svnfsfs]
description = Subversion FSFS Repository Manipulation Tool
type = exe
-path = tools/server-side/svnfsfs
+path = subversion/svnfsfs
install = bin
libs = libsvn_repos libsvn_fs libsvn_fs_fs libsvn_delta libsvn_subr apriconv
apr
msvc-libs = setargv.obj
@@ -810,6 +810,24 @@ install = test
libs = libsvn_test libsvn_fs libsvn_fs_fs libsvn_delta
libsvn_subr apriconv apr
+[fs-fs-fuzzy-test]
+description = Use fuzzying to test FSFS corruption resilience
+type = exe
+path = subversion/tests/libsvn_fs_fs
+sources = fs-fs-fuzzy-test.c
+install = sub-test
+libs = libsvn_test libsvn_fs libsvn_fs_fs libsvn_delta
+ libsvn_repos libsvn_subr apriconv apr
+
+[fs-fs-private-test]
+description = Test FSSF private API
+type = exe
+path = subversion/tests/libsvn_fs_fs
+sources = fs-fs-private-test.c
+install = test
+libs = libsvn_test libsvn_fs libsvn_fs_fs libsvn_delta
+ libsvn_repos libsvn_subr apriconv apr
+
# ----------------------------------------------------------------------------
# Tests for libsvn_fs_x
[fs-x-pack-test]
@@ -986,22 +1004,6 @@ sources = mergeinfo-test.c
install = test
libs = libsvn_test libsvn_subr apr
-[named_atomic-test]
-description = Test named atomics
-type = exe
-path = subversion/tests/libsvn_subr
-sources = named_atomic-test.c
-install = test
-libs = libsvn_test libsvn_subr apr
-
-[named_atomic-proc-test]
-description = Sub-process for named atomics
-type = exe
-path = subversion/tests/libsvn_subr
-sources = named_atomic-test-proc.c
-install = sub-test
-libs = libsvn_subr apr
-
[packed-data-test]
description = Test path library
type = exe
@@ -1467,14 +1469,14 @@ libs = svn svnadmin svndumpfilter svnloo
svnversion
mod_authz_svn mod_dav_svn mod_dontdothat
svnauthz svnauthz-validate svnraisetreeconflict
- svnfsfs
+ svnfsfs svn-bench
[__ALL_TESTS__]
type = project
path = build/win32
libs = __ALL__
- fs-test fs-base-test fs-fsfs-test fs-fs-pack-test fs-x-pack-test
- string-table-test
+ fs-test fs-base-test fs-fsfs-test fs-fs-pack-test fs-fs-fuzzy-test
+ fs-fs-private-test fs-x-pack-test string-table-test
skel-test strings-reps-test changes-test locks-test
repos-test dump-load-test
checksum-test compat-test config-test hashdump-test mergeinfo-test
@@ -1482,7 +1484,7 @@ libs = __ALL__
priority-queue-test root-pools-test stream-test
string-test time-test utf-test bit-array-test
error-test error-code-test cache-test spillbuf-test crypto-test
- named_atomic-test named_atomic-proc-test revision-test
+ revision-test
subst_translate-test io-test
translate-test
random-test window-test
@@ -1503,8 +1505,8 @@ libs = __ALL__
type = project
path = build/win32
libs = __ALL_TESTS__
- diff diff3 diff4 fsfs-access-map svnauth svn-bench
- svn-rep-sharing-stats svn-populate-node-origins-index
+ diff diff3 diff4 fsfs-access-map svnauth
+ svn-populate-node-origins-index
[__LIBS__]
type = project
@@ -1577,7 +1579,7 @@ libs = libsvn_diff libsvn_subr apriconv
[svn-bench]
type = exe
-path = tools/client-side/svn-bench
+path = subversion/svn-bench
install = tools
libs = libsvn_client libsvn_wc libsvn_ra libsvn_subr libsvn_delta
apriconv apr
@@ -1617,10 +1619,3 @@ type = exe
path = tools/dev/svnraisetreeconflict
libs = libsvn_wc libsvn_subr apriconv apr
install = tools
-
-[svn-rep-sharing-stats]
-type = exe
-path = tools/server-side
-sources = svn-rep-sharing-stats.c
-install = tools
-libs = libsvn_repos libsvn_fs libsvn_fs_fs libsvn_subr apriconv apr
Modified: subversion/branches/svn-auth-x509/build/buildcheck.sh
URL:
http://svn.apache.org/viewvc/subversion/branches/svn-auth-x509/build/buildcheck.sh?rev=1639628&r1=1639627&r2=1639628&view=diff
==============================================================================
--- subversion/branches/svn-auth-x509/build/buildcheck.sh (original)
+++ subversion/branches/svn-auth-x509/build/buildcheck.sh Fri Nov 14 13:17:55
2014
@@ -97,14 +97,15 @@ else
esac
fi
-libtool=${LIBTOOL:-`./build/PrintPath glibtool libtool libtool15`}
+# Much like APR except we do not prefer libtool 1 over libtool 2.
+libtoolize=${LIBTOOLIZE:-`./build/PrintPath glibtoolize libtoolize
glibtoolize1 libtoolize15 libtoolize14`}
# Extract the libtool version number: everything from the first number in
# the version text until a hyphen or space.
-lt_pversion=`$libtool --version 2>/dev/null |
+lt_pversion=`$libtoolize --version 2>/dev/null |
sed -e 's/^[^0-9]*//' -e 's/[- ].*//' -e '/^$/d' |
sed -e 1q`
if test -z "$lt_pversion"; then
- echo "buildcheck: libtool not found."
+ echo "buildcheck: libtoolize not found."
echo " You need libtool version $LIBTOOL_WANTED_VERSION or newer
installed"
exit 1
fi
Modified:
subversion/branches/svn-auth-x509/build/generator/gen_win_dependencies.py
URL:
http://svn.apache.org/viewvc/subversion/branches/svn-auth-x509/build/generator/gen_win_dependencies.py?rev=1639628&r1=1639627&r2=1639628&view=diff
==============================================================================
--- subversion/branches/svn-auth-x509/build/generator/gen_win_dependencies.py
(original)
+++ subversion/branches/svn-auth-x509/build/generator/gen_win_dependencies.py
Fri Nov 14 13:17:55 2014
@@ -862,15 +862,21 @@ class GenDependenciesBase(gen_base.Gener
"Find the right perl library name to link swig bindings with"
fp = os.popen('perl -MConfig -e ' + escape_shell_arg(
+ 'print "$Config{libperl}\\n"; '
'print "$Config{PERL_REVISION}.$Config{PERL_VERSION}.'
'$Config{PERL_SUBVERSION}\\n"; '
'print "$Config{archlib}\\n"'), 'r')
try:
line = fp.readline()
if line:
+ perl_lib = line.strip()
+ else:
+ return
+
+ line = fp.readline()
+ if line:
perl_version = line.strip()
perl_ver = perl_version.split('.')
- perl_lib = 'perl%s%s.lib' % (perl_ver[0], perl_ver[1])
else:
return
@@ -1375,7 +1381,7 @@ class GenDependenciesBase(gen_base.Gener
lib_name = None
defines.append('SVN_SQLITE_INLINE')
else:
- sys.stderr.write("ERROR: SQLite not found\n" % self.sqlite_path)
+ sys.stderr.write("ERROR: SQLite not found\n")
sys.stderr.write("Use '--with-sqlite' option to configure sqlite
location.\n");
sys.exit(1)
Modified: subversion/branches/svn-auth-x509/build/run_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/svn-auth-x509/build/run_tests.py?rev=1639628&r1=1639627&r2=1639628&view=diff
==============================================================================
--- subversion/branches/svn-auth-x509/build/run_tests.py (original)
+++ subversion/branches/svn-auth-x509/build/run_tests.py Fri Nov 14 13:17:55
2014
@@ -191,6 +191,13 @@ class TestHarness:
TextColors.disable()
self.skip_c_tests = (not not skip_c_tests)
+ # Parse out the FSFS version number
+ if self.fs_type is not None and self.fs_type.startswith('fsfs-v'):
+ self.fsfs_version = int(self.fs_type[6:])
+ self.fs_type = 'fsfs'
+ else:
+ self.fsfs_version = None
+
def run(self, list):
'''Run all test programs given in LIST. Print a summary of results, if
there is a log file. Return zero iff all test programs passed.'''
@@ -384,6 +391,8 @@ class TestHarness:
cmdline.append('--cleanup')
if self.fs_type is not None:
cmdline.append('--fs-type=' + self.fs_type)
+ if self.fsfs_version is not None:
+ cmdline.append('--fsfs-version=%d' % self.fsfs_version)
if self.server_minor_version is not None:
cmdline.append('--server-minor-version=' + self.server_minor_version)
if self.list_tests is not None:
@@ -470,7 +479,7 @@ class TestHarness:
svntest.main.options.enable_sasl = True
if self.parallel is not None:
try:
- num_parallel = int(self.parallel)
+ num_parallel = int(self.parallel)
except exceptions.ValueError:
num_parallel = svntest.main.default_num_threads
if num_parallel > 1:
@@ -485,6 +494,8 @@ class TestHarness:
svntest.main.options.cleanup = True
if self.fs_type is not None:
svntest.main.options.fs_type = self.fs_type
+ if self.fsfs_version is not None:
+ svntest.main.options.fsfs_version = self.fsfs_version
if self.http_library is not None:
svntest.main.options.http_library = self.http_library
if self.server_minor_version is not None:
Modified: subversion/branches/svn-auth-x509/configure.ac
URL:
http://svn.apache.org/viewvc/subversion/branches/svn-auth-x509/configure.ac?rev=1639628&r1=1639627&r2=1639628&view=diff
==============================================================================
--- subversion/branches/svn-auth-x509/configure.ac (original)
+++ subversion/branches/svn-auth-x509/configure.ac Fri Nov 14 13:17:55 2014
@@ -90,13 +90,8 @@ AC_SUBST([MKDIR])
dnl verify apr version and set apr flags
dnl These regular expressions should not contain "\(" and "\)".
-dnl The specific reason we require APR 0.9.7 is:
-dnl It contains fixes to its file writing routines
-dnl now generating errors instead of silently ignoring
-dnl them. Only .7 and later can guarantee repository
-dnl integrity with FSFS.
-APR_VER_REGEXES=["1\.[345]\. 2\."]
+APR_VER_REGEXES=["1\.[3-9]\. 2\."]
SVN_LIB_APR($APR_VER_REGEXES)
@@ -112,7 +107,7 @@ if test `expr $apr_version : 2` -ne 0; t
SVN_APR_MAJOR_VERSION=2
else
svn_lib_ver=0
- APU_VER_REGEXES=["1\.[345]\."]
+ APU_VER_REGEXES=["1\.[3-9]\."]
SVN_LIB_APRUTIL($APU_VER_REGEXES)
SVN_APR_MAJOR_VERSION=1
fi
@@ -324,18 +319,6 @@ case $host in
esac
AC_SUBST(LT_NO_UNDEFINED)
-AC_MSG_CHECKING([whether to avoid circular linkage at all costs])
-case $host in
- *-*-cygwin*)
- AC_MSG_RESULT([yes])
- AC_DEFINE([SVN_AVOID_CIRCULAR_LINKAGE_AT_ALL_COSTS_HACK], 1,
- [Define if circular linkage is not possible on this platform.])
- ;;
- *)
- AC_MSG_RESULT([no])
- ;;
-esac
-
dnl Check for trang.
trang=yes
AC_ARG_WITH(trang,
@@ -779,6 +762,10 @@ AH_BOTTOM([
# define SVN__FORCE_INLINE APR_INLINE
# define SVN__PREVENT_INLINE
#endif
+
+/* Macro used to specify that a variable is intentionally left unused.
+ Supresses compiler warnings about the variable being unused. */
+#define SVN_UNUSED(v) ( (void)(v) )
])
dnl Used to simulate makefile conditionals.
@@ -1061,14 +1048,13 @@ AS_HELP_STRING([--enable-maintainer-mode
SVN_CFLAGS_ADD_IFELSE([-Wold-style-definition])
SVN_CFLAGS_ADD_IFELSE([-Wno-system-headers])
SVN_CFLAGS_ADD_IFELSE([-Wno-format-nonliteral])
- SVN_CFLAGS_ADD_IFELSE([-Wno-string-plus-int])
SVN_CFLAGS_ADD_IFELSE([-Wmissing-variable-declarations])
CMAINTAINERFLAGS="$CFLAGS"
CFLAGS="$CFLAGS_KEEP"
dnl Add flags that all versions of GCC (should) support
- CMAINTAINERFLAGS="-Wall -Wpointer-arith -Wwrite-strings -Wshadow
-Wformat=2 -Wunused -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes
-Wmissing-declarations -Wno-multichar -Wredundant-decls -Wnested-externs
-Winline -Wno-long-long $CMAINTAINERFLAGS"
+ CMAINTAINERFLAGS="-Wall -Wpointer-arith -Wwrite-strings -Wshadow
-Wformat=2 -Wunused -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes
-Wmissing-declarations -Wno-multichar -Wredundant-decls -Wnested-externs
-Winline -Wno-long-long -Wbad-function-cast $CMAINTAINERFLAGS"
fi
if test "$GXX" = "yes"; then
AC_MSG_NOTICE([maintainer-mode: adding G++ warning flags])
Propchange: subversion/branches/svn-auth-x509/notes/
------------------------------------------------------------------------------
Merged /subversion/trunk/notes:r1603509-1639627
Modified: subversion/branches/svn-auth-x509/notes/api-errata/1.8/fs001.txt
URL:
http://svn.apache.org/viewvc/subversion/branches/svn-auth-x509/notes/api-errata/1.8/fs001.txt?rev=1639628&r1=1639627&r2=1639628&view=diff
==============================================================================
--- subversion/branches/svn-auth-x509/notes/api-errata/1.8/fs001.txt (original)
+++ subversion/branches/svn-auth-x509/notes/api-errata/1.8/fs001.txt Fri Nov 14
13:17:55 2014
@@ -1,4 +1,4 @@
-API ERRATE -- $Id$
+API ERRATA -- $Id$
Root Cause of Errata: implementation/docstring mismatch
Library(s) Affected: libsvn_fs_fs, libsvn_fs_base, libsvn_repos
Propchange: subversion/branches/svn-auth-x509/notes/api-errata/1.8/fs001.txt
------------------------------------------------------------------------------
svn:keywords = Id
Modified: subversion/branches/svn-auth-x509/notes/knobs
URL:
http://svn.apache.org/viewvc/subversion/branches/svn-auth-x509/notes/knobs?rev=1639628&r1=1639627&r2=1639628&view=diff
==============================================================================
--- subversion/branches/svn-auth-x509/notes/knobs (original)
+++ subversion/branches/svn-auth-x509/notes/knobs Fri Nov 14 13:17:55 2014
@@ -55,6 +55,7 @@ SVN_SQLITE_MIN_VERSION_NUMBER
SVN_SQLITE_MIN_VERSION
SVN_SERF_NO_LOGGING
SVN_ALLOW_SHORT_INTS
+SVN_ALLOW_NON_8_BIT_CHARS
2.3 Debugging Support
@@ -290,6 +291,18 @@ SVN_I_LIKE_LATENCY_SO_IGNORE_HTTPV2
Default: not defined
Suggested: not defined (to ensure correct behaviour)
+4.12 SVN_ALLOW_NON_8_BIT_CHARS
+
+ Scope: global
+ Purpose: Disables the size check for the 'char' type. We assume char
+ has exactly 8 bits. Other values may break the code reading,
+ interpreting and writing repository files. Defining this option
+ will allow SVN to be compiled even if the size check would fail
+ for some reason.
+ Range: definedness
+ Default: not defined
+ Suggested: not defined (to ensure correct behaviour)
+
5 Defines controlling debug support
==================================
Modified: subversion/branches/svn-auth-x509/notes/wc-ng/conflict-storage-2.0
URL:
http://svn.apache.org/viewvc/subversion/branches/svn-auth-x509/notes/wc-ng/conflict-storage-2.0?rev=1639628&r1=1639627&r2=1639628&view=diff
==============================================================================
--- subversion/branches/svn-auth-x509/notes/wc-ng/conflict-storage-2.0
(original)
+++ subversion/branches/svn-auth-x509/notes/wc-ng/conflict-storage-2.0 Fri Nov
14 13:17:55 2014
@@ -81,9 +81,14 @@ this format in a future version if we wa
path from before the update/switch. The new location is already available in
BASE so doesn't have to be duplicated. If the node is an addition the empty
list is used.
+### stsp: The implementation *does* duplicate the new BASE node in the skel
+### in a second PATH_REV item.
Merge will have 2 items: the left and right paths. These can come from a
different repository.
+### stsp: The implementation is storing the pre-merge BASE node, and
+### the incoming merge-right node. What about merge-left?
+### How can merge-left/merge-right come from a different repository?
An empty skel specifies that there is no location. (Tree conflicts and/or
upgrade scenarios). Future versions may introduce other origins.
Propchange:
subversion/branches/svn-auth-x509/subversion/bindings/ctypes-python/README
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: subversion/branches/svn-auth-x509/subversion/bindings/cxxhl/README
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
subversion/branches/svn-auth-x509/subversion/bindings/javahl/native/SVNClient.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/svn-auth-x509/subversion/bindings/javahl/native/SVNClient.cpp?rev=1639628&r1=1639627&r2=1639628&view=diff
==============================================================================
---
subversion/branches/svn-auth-x509/subversion/bindings/javahl/native/SVNClient.cpp
(original)
+++
subversion/branches/svn-auth-x509/subversion/bindings/javahl/native/SVNClient.cpp
Fri Nov 14 13:17:55 2014
@@ -732,28 +732,7 @@ void SVNClient::merge(const char *path,
subPool.getPool()), );
}
-void SVNClient::mergeReintegrate(const char *path, Revision &pegRevision,
- const char *localPath, bool dryRun)
-{
- SVN::Pool subPool(pool);
- SVN_JNI_NULL_PTR_EX(path, "path", );
- SVN_JNI_NULL_PTR_EX(localPath, "localPath", );
- Path intLocalPath(localPath, subPool);
- SVN_JNI_ERR(intLocalPath.error_occurred(), );
-
- Path srcPath(path, subPool);
- SVN_JNI_ERR(srcPath.error_occurred(), );
-
- svn_client_ctx_t *ctx = context.getContext(NULL, subPool);
- if (ctx == NULL)
- return;
-
- SVN_JNI_ERR(svn_client_merge_reintegrate(srcPath.c_str(),
- pegRevision.revision(),
- intLocalPath.c_str(),
- dryRun, NULL, ctx,
- subPool.getPool()), );
-}
+/* SVNClient::mergeReintegrate is implemented in deprecated.cpp. */
jobject
SVNClient::getMergeinfo(const char *target, Revision &pegRevision)
Modified:
subversion/branches/svn-auth-x509/subversion/bindings/javahl/native/SVNRepos.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/svn-auth-x509/subversion/bindings/javahl/native/SVNRepos.cpp?rev=1639628&r1=1639627&r2=1639628&view=diff
==============================================================================
---
subversion/branches/svn-auth-x509/subversion/bindings/javahl/native/SVNRepos.cpp
(original)
+++
subversion/branches/svn-auth-x509/subversion/bindings/javahl/native/SVNRepos.cpp
Fri Nov 14 13:17:55 2014
@@ -251,7 +251,8 @@ void SVNRepos::dump(File &path, OutputSt
}
void SVNRepos::hotcopy(File &path, File &targetPath,
- bool cleanLogs, bool incremental)
+ bool cleanLogs, bool incremental,
+ ReposNotifyCallback *notifyCallback)
{
SVN::Pool requestPool;
@@ -267,9 +268,13 @@ void SVNRepos::hotcopy(File &path, File
return;
}
- SVN_JNI_ERR(svn_repos_hotcopy2(path.getInternalStyle(requestPool),
+ SVN_JNI_ERR(svn_repos_hotcopy3(path.getInternalStyle(requestPool),
targetPath.getInternalStyle(requestPool),
cleanLogs, incremental,
+ notifyCallback != NULL
+ ? ReposNotifyCallback::notify
+ : NULL,
+ notifyCallback,
checkCancel, this /* cancel callback/baton */,
requestPool.getPool()),
);
Modified:
subversion/branches/svn-auth-x509/subversion/bindings/javahl/native/SVNRepos.h
URL:
http://svn.apache.org/viewvc/subversion/branches/svn-auth-x509/subversion/bindings/javahl/native/SVNRepos.h?rev=1639628&r1=1639627&r2=1639628&view=diff
==============================================================================
---
subversion/branches/svn-auth-x509/subversion/bindings/javahl/native/SVNRepos.h
(original)
+++
subversion/branches/svn-auth-x509/subversion/bindings/javahl/native/SVNRepos.h
Fri Nov 14 13:17:55 2014
@@ -64,7 +64,8 @@ class SVNRepos : public SVNBase
void listUnusedDBLogs(File &path,
MessageReceiver &messageReceiver);
void listDBLogs(File &path, MessageReceiver &messageReceiver);
- void hotcopy(File &path, File &targetPath, bool cleanLogs, bool incremental);
+ void hotcopy(File &path, File &targetPath, bool cleanLogs, bool incremental,
+ ReposNotifyCallback *notifyCallback);
void dump(File &path, OutputStream &dataOut, Revision &revsionStart,
Revision &RevisionEnd, bool incremental, bool useDeltas,
ReposNotifyCallback *notifyCallback);
Modified:
subversion/branches/svn-auth-x509/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNRepos.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/svn-auth-x509/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNRepos.cpp?rev=1639628&r1=1639627&r2=1639628&view=diff
==============================================================================
---
subversion/branches/svn-auth-x509/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNRepos.cpp
(original)
+++
subversion/branches/svn-auth-x509/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNRepos.cpp
Fri Nov 14 13:17:55 2014
@@ -170,7 +170,7 @@ Java_org_apache_subversion_javahl_SVNRep
JNIEXPORT void JNICALL
Java_org_apache_subversion_javahl_SVNRepos_hotcopy
(JNIEnv *env, jobject jthis, jobject jpath, jobject jtargetPath,
- jboolean jcleanLogs, jboolean jincremental)
+ jboolean jcleanLogs, jboolean jincremental, jobject jnotifyCallback)
{
JNIEntry(SVNRepos, hotcopy);
SVNRepos *cl = SVNRepos::getCppObject(jthis);
@@ -188,8 +188,11 @@ Java_org_apache_subversion_javahl_SVNRep
if (JNIUtil::isExceptionThrown())
return;
+ ReposNotifyCallback notifyCallback(jnotifyCallback);
+
cl->hotcopy(path, targetPath, jcleanLogs ? true : false,
- jincremental ? true : false);
+ jincremental ? true : false,
+ jnotifyCallback != NULL ? ¬ifyCallback : NULL);
}
JNIEXPORT void JNICALL
Modified:
subversion/branches/svn-auth-x509/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_DiffLib.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/svn-auth-x509/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_DiffLib.cpp?rev=1639628&r1=1639627&r2=1639628&view=diff
==============================================================================
---
subversion/branches/svn-auth-x509/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_DiffLib.cpp
(original)
+++
subversion/branches/svn-auth-x509/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_DiffLib.cpp
Fri Nov 14 13:17:55 2014
@@ -190,7 +190,7 @@ Java_org_apache_subversion_javahl_util_D
OutputStream result_stream(jresult_stream);
- SVN_JNI_ERR(svn_diff_file_output_merge2(
+ SVN_JNI_ERR(svn_diff_file_output_merge3(
result_stream.getStream(pool), diff,
original.c_str(), modified.c_str(), latest.c_str(),
conflict_original.c_str(),
@@ -198,6 +198,7 @@ Java_org_apache_subversion_javahl_util_D
conflict_latest.c_str(),
conflict_separator.c_str(),
svn_diff_conflict_display_style_t(jconflict_style_ordinal),
+ NULL, NULL,
pool.getPool()),
false);
Modified:
subversion/branches/svn-auth-x509/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRepos.java
URL:
http://svn.apache.org/viewvc/subversion/branches/svn-auth-x509/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRepos.java?rev=1639628&r1=1639627&r2=1639628&view=diff
==============================================================================
---
subversion/branches/svn-auth-x509/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRepos.java
(original)
+++
subversion/branches/svn-auth-x509/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNRepos.java
Fri Nov 14 13:17:55 2014
@@ -97,7 +97,7 @@ public interface ISVNRepos {
* @param end the last revision to be dumped
* @param incremental the dump will be incremantal
* @param useDeltas the dump will contain deltas between nodes
- * @param callback the callback to receive notifications
+ * @param callback the callback to receive notifications
* @throws ClientException throw in case of problem
*/
public abstract void dump(File path, OutputStream dataOut,
@@ -111,10 +111,18 @@ public interface ISVNRepos {
* @param targetPath the path to the target repository
* @param cleanLogs clean the unused log files in the source
* repository
+ * @param callback the callback to receive notifications
* @throws ClientException throw in case of problem
+ * @since 1.9
*/
public abstract void hotcopy(File path, File targetPath,
- boolean cleanLogs, boolean incremental) throws
ClientException;
+ boolean cleanLogs, boolean incremental,
+ ReposNotifyCallback callback)
+ throws ClientException;
+
+ public abstract void hotcopy(File path, File targetPath,
+ boolean cleanLogs, boolean incremental)
+ throws ClientException;
public abstract void hotcopy(File path, File targetPath,
boolean cleanLogs) throws ClientException;
Modified:
subversion/branches/svn-auth-x509/subversion/bindings/javahl/src/org/apache/subversion/javahl/ReposNotifyInformation.java
URL:
http://svn.apache.org/viewvc/subversion/branches/svn-auth-x509/subversion/bindings/javahl/src/org/apache/subversion/javahl/ReposNotifyInformation.java?rev=1639628&r1=1639627&r2=1639628&view=diff
==============================================================================
---
subversion/branches/svn-auth-x509/subversion/bindings/javahl/src/org/apache/subversion/javahl/ReposNotifyInformation.java
(original)
+++
subversion/branches/svn-auth-x509/subversion/bindings/javahl/src/org/apache/subversion/javahl/ReposNotifyInformation.java
Fri Nov 14 13:17:55 2014
@@ -196,7 +196,37 @@ public class ReposNotifyInformation exte
* The structure of a revision is being verified.
* @since 1.8
*/
- verify_rev_structure;
+ verify_rev_structure,
+
+ /**
+ * A revision is found with corruption/errors.
+ * @since 1.9
+ */
+ failure,
+
+ /**
+ * A revprop shard got packed. @
+ * @since 1.9
+ */
+ pack_revprops,
+
+ /**
+ * A non-packed revprop shard got removed.
+ * @since 1.9
+ */
+ cleanup_revprops,
+
+ /**
+ * The repository format got bumped.
+ * @since 1.9
+ */
+ format_bumped,
+
+ /**
+ * A revision range was copied.
+ * @since 1.9
+ */
+ hotcopy_rev_range;
}
public enum NodeAction
Modified:
subversion/branches/svn-auth-x509/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNRepos.java
URL:
http://svn.apache.org/viewvc/subversion/branches/svn-auth-x509/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNRepos.java?rev=1639628&r1=1639627&r2=1639628&view=diff
==============================================================================
---
subversion/branches/svn-auth-x509/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNRepos.java
(original)
+++
subversion/branches/svn-auth-x509/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNRepos.java
Fri Nov 14 13:17:55 2014
@@ -122,22 +122,22 @@ public class SVNRepos implements ISVNRep
boolean useDeltas, ReposNotifyCallback callback)
throws ClientException;
- /**
- * make a hot copy of the repository
- * @param path the path to the source repository
- * @param targetPath the path to the target repository
- * @param cleanLogs clean the unused log files in the source
- * repository
- * @throws ClientException throw in case of problem
- */
public native void hotcopy(File path, File targetPath,
- boolean cleanLogs, boolean incremental)
+ boolean cleanLogs, boolean incremental,
+ ReposNotifyCallback callback)
throws ClientException;
public void hotcopy(File path, File targetPath,
+ boolean cleanLogs, boolean incremental)
+ throws ClientException
+ {
+ hotcopy(path, targetPath, cleanLogs, incremental, null);
+ }
+
+ public void hotcopy(File path, File targetPath,
boolean cleanLogs) throws ClientException
{
- hotcopy(path, targetPath, cleanLogs, false);
+ hotcopy(path, targetPath, cleanLogs, false, null);
}
/**
Modified:
subversion/branches/svn-auth-x509/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
URL:
http://svn.apache.org/viewvc/subversion/branches/svn-auth-x509/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java?rev=1639628&r1=1639627&r2=1639628&view=diff
==============================================================================
---
subversion/branches/svn-auth-x509/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
(original)
+++
subversion/branches/svn-auth-x509/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
Fri Nov 14 13:17:55 2014
@@ -701,6 +701,47 @@ public class BasicTests extends SVNTests
}
/**
+ * Test SVNClient.status on externals.
+ * @throws Throwable
+ */
+ public void testExternalStatus() throws Throwable
+ {
+ // build the test setup
+ OneTest thisTest = new OneTest();
+
+
+ // Add an externals reference to the working copy.
+ client.propertySetLocal(thisTest.getWCPathSet(), "svn:externals",
+ "^/A/D/H ADHext".getBytes(),
+ Depth.empty, null, false);
+
+ // Update the working copy to bring in the external subtree.
+ client.update(thisTest.getWCPathSet(), Revision.HEAD,
+ Depth.unknown, false, false, false, false);
+
+ // Test status of an external file
+ File psi = new File(thisTest.getWorkingCopy() + "/ADHext", "psi");
+
+ MyStatusCallback statusCallback = new MyStatusCallback();
+ client.status(fileToSVNPath(psi, false), Depth.unknown,
+ false, true, true, false, false, false,
+ null, statusCallback);
+
+ final int statusCount = statusCallback.getStatusArray().length;
+ if (statusCount == 1)
+ {
+ Status st = statusCallback.getStatusArray()[0];
+ assertFalse(st.isConflicted());
+ assertEquals(Status.Kind.normal, st.getNodeStatus());
+ assertEquals(NodeKind.file, st.getNodeKind());
+ }
+ else if (statusCount > 1)
+ fail("File psi should not return more than one status.");
+ else
+ fail("File psi should return exactly one status.");
+ }
+
+ /**
* Test the basic SVNClient.checkout functionality.
* @throws Throwable
*/
Modified:
subversion/branches/svn-auth-x509/subversion/bindings/swig/include/svn_string.swg
URL:
http://svn.apache.org/viewvc/subversion/branches/svn-auth-x509/subversion/bindings/swig/include/svn_string.swg?rev=1639628&r1=1639627&r2=1639628&view=diff
==============================================================================
---
subversion/branches/svn-auth-x509/subversion/bindings/swig/include/svn_string.swg
(original)
+++
subversion/branches/svn-auth-x509/subversion/bindings/swig/include/svn_string.swg
Fri Nov 14 13:17:55 2014
@@ -208,11 +208,6 @@ typedef struct svn_string_t svn_string_t
/* when storing an svn_string_t* into a structure, we must allocate the
svn_string_t structure on the heap. */
-#ifdef SWIGPYTHON
-%typemap(memberin) const svn_string_t * {
- $1 = svn_string_dup($input, _global_pool);
-}
-#endif
#ifdef SWIGPERL
%typemap(memberin) const svn_string_t * {
$1 = svn_string_dup($input, _global_pool);
Modified:
subversion/branches/svn-auth-x509/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
URL:
http://svn.apache.org/viewvc/subversion/branches/svn-auth-x509/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c?rev=1639628&r1=1639627&r2=1639628&view=diff
==============================================================================
---
subversion/branches/svn-auth-x509/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
(original)
+++
subversion/branches/svn-auth-x509/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
Fri Nov 14 13:17:55 2014
@@ -445,7 +445,7 @@ static PyObject *make_ob_pool(void *pool
apr_pool_t *new_pool = svn_pool_create(application_pool);
PyObject *new_py_pool = svn_swig_py_new_pointer_obj(new_pool,
svn_swig_TypeQuery("apr_pool_t *"), application_py_pool, NULL);
- (void) pool; /* Silence compiler warnings about unused parameter. */
+ SVN_UNUSED(pool);
return new_py_pool;
}
static PyObject *make_ob_fs_root(svn_fs_root_t *ptr, PyObject *py_pool)
Modified:
subversion/branches/svn-auth-x509/subversion/bindings/swig/python/svn/core.py
URL:
http://svn.apache.org/viewvc/subversion/branches/svn-auth-x509/subversion/bindings/swig/python/svn/core.py?rev=1639628&r1=1639627&r2=1639628&view=diff
==============================================================================
---
subversion/branches/svn-auth-x509/subversion/bindings/swig/python/svn/core.py
(original)
+++
subversion/branches/svn-auth-x509/subversion/bindings/swig/python/svn/core.py
Fri Nov 14 13:17:55 2014
@@ -169,6 +169,8 @@ class Stream:
self._stream = stream
def read(self, amt=None):
+ if self._stream is None:
+ raise ValueError
if amt is None:
# read the rest of the stream
chunks = [ ]
@@ -183,9 +185,15 @@ class Stream:
return svn_stream_read(self._stream, int(amt))
def write(self, buf):
+ if self._stream is None:
+ raise ValueError
### what to do with the amount written? (the result value)
svn_stream_write(self._stream, buf)
+ def close(self):
+ svn_stream_close(self._stream)
+ self._stream = None
+
def secs_from_timestr(svn_datetime, pool=None):
"""Convert a Subversion datetime string into seconds since the Epoch."""
aprtime = svn_time_from_cstring(svn_datetime, pool)
Modified:
subversion/branches/svn-auth-x509/subversion/bindings/swig/ruby/test/test_ra.rb
URL:
http://svn.apache.org/viewvc/subversion/branches/svn-auth-x509/subversion/bindings/swig/ruby/test/test_ra.rb?rev=1639628&r1=1639627&r2=1639628&view=diff
==============================================================================
---
subversion/branches/svn-auth-x509/subversion/bindings/swig/ruby/test/test_ra.rb
(original)
+++
subversion/branches/svn-auth-x509/subversion/bindings/swig/ruby/test/test_ra.rb
Fri Nov 14 13:17:55 2014
@@ -38,8 +38,7 @@ class SvnRaTest < Test::Unit::TestCase
def test_uuid
Svn::Ra::Session.open(@repos_uri) do |session|
- assert_equal(File.read(File.join(@repos_path, "db", "uuid")).strip,
- session.uuid)
+ assert_equal(@repos.fs.uuid, session.uuid)
end
end
Modified: subversion/branches/svn-auth-x509/subversion/bindings/swig/svn_wc.i
URL:
http://svn.apache.org/viewvc/subversion/branches/svn-auth-x509/subversion/bindings/swig/svn_wc.i?rev=1639628&r1=1639627&r2=1639628&view=diff
==============================================================================
--- subversion/branches/svn-auth-x509/subversion/bindings/swig/svn_wc.i
(original)
+++ subversion/branches/svn-auth-x509/subversion/bindings/swig/svn_wc.i Fri Nov
14 13:17:55 2014
@@ -40,8 +40,9 @@
*/
%ignore svn_wc_set_auth_file;
-/* ### ignore this structure because the accessors will need a pool */
+/* ### ignore these structures because the accessors will need a pool */
%ignore svn_wc_keywords_t;
+%ignore svn_wc_conflict_description2_t;
#ifdef SWIGRUBY
%ignore svn_wc_external_item_create;
Propchange: subversion/branches/svn-auth-x509/subversion/include/private/README
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
subversion/branches/svn-auth-x509/subversion/include/private/svn_cert.h
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
subversion/branches/svn-auth-x509/subversion/include/private/svn_dep_compat.h
URL:
http://svn.apache.org/viewvc/subversion/branches/svn-auth-x509/subversion/include/private/svn_dep_compat.h?rev=1639628&r1=1639627&r2=1639628&view=diff
==============================================================================
---
subversion/branches/svn-auth-x509/subversion/include/private/svn_dep_compat.h
(original)
+++
subversion/branches/svn-auth-x509/subversion/include/private/svn_dep_compat.h
Fri Nov 14 13:17:55 2014
@@ -47,6 +47,19 @@ extern "C" {
#endif
/**
+ * We assume that 'char' is 8 bits wide. The critical interfaces are
+ * our repository formats and RA encodings. E.g. a 32 bit wide char may
+ * mess up UTF8 parsing, how we interpret size values etc.
+ *
+ * @since New in 1.9.
+ */
+#if defined(CHAR_BIT) \
+ && !defined(SVN_ALLOW_NON_8_BIT_CHARS) \
+ && (CHAR_BIT != 8)
+#error char is not 8 bits and may break Subversion. Define
SVN_ALLOW_NON_8_BIT_CHARS to skip this check.
+#endif
+
+/**
* Work around a platform dependency issue. apr_thread_rwlock_trywrlock()
* will make APR_STATUS_IS_EBUSY() return TRUE if the lock could not be
* acquired under Unix. Under Windows, this will not work. So, provide
Modified:
subversion/branches/svn-auth-x509/subversion/include/private/svn_diff_private.h
URL:
http://svn.apache.org/viewvc/subversion/branches/svn-auth-x509/subversion/include/private/svn_diff_private.h?rev=1639628&r1=1639627&r2=1639628&view=diff
==============================================================================
---
subversion/branches/svn-auth-x509/subversion/include/private/svn_diff_private.h
(original)
+++
subversion/branches/svn-auth-x509/subversion/include/private/svn_diff_private.h
Fri Nov 14 13:17:55 2014
@@ -97,6 +97,9 @@ svn_diff__unidiff_write_header(svn_strea
* merged or reverse merged; otherwise (or if the mergeinfo property values
* don't parse correctly) display them just like any other property.
*
+ * Pass @a context_size, @a cancel_func and @a cancel_baton to the diff
+ * output functions.
+ *
* Use @a scratch_pool for temporary allocations.
*/
svn_error_t *
@@ -105,6 +108,9 @@ svn_diff__display_prop_diffs(svn_stream_
const apr_array_header_t *propchanges,
apr_hash_t *original_props,
svn_boolean_t pretty_print_mergeinfo,
+ int context_size,
+ svn_cancel_func_t cancel_func,
+ void *cancel_baton,
apr_pool_t *scratch_pool);
Modified:
subversion/branches/svn-auth-x509/subversion/include/private/svn_diff_tree.h
URL:
http://svn.apache.org/viewvc/subversion/branches/svn-auth-x509/subversion/include/private/svn_diff_tree.h?rev=1639628&r1=1639627&r2=1639628&view=diff
==============================================================================
---
subversion/branches/svn-auth-x509/subversion/include/private/svn_diff_tree.h
(original)
+++
subversion/branches/svn-auth-x509/subversion/include/private/svn_diff_tree.h
Fri Nov 14 13:17:55 2014
@@ -103,18 +103,22 @@ extern "C" {
* Note that it is possible for nodes to be described as a delete followed by
* an add at the same place within one parent. (Iff the diff is reversed you
* can see an add followed by a delete!)
+ * ### "An add followed by a delete" sounds wrong.
*
* The directory batons live between the open and close events of a directory
* and are thereby guaranteed to outlive the batons of their descendants.
*/
/* Describes the source of a merge */
+/* ### You mean a diff?
+ * ### How come many users don't set the 'repos_relpath' field? */
typedef struct svn_diff_source_t
{
/* Always available */
svn_revnum_t revision;
/* Depending on the driver available for copyfrom */
+ /* ### What? */
const char *repos_relpath;
} svn_diff_source_t;
@@ -137,9 +141,10 @@ typedef struct svn_diff_tree_processor_t
{
/** The value passed to svn_diff__tree_processor_create() as BATON.
*/
- void *baton; /* To avoid an additional in some places */
+ void *baton; /* To avoid an additional in some places
+ * ### What? */
- /* Called before a directories children are processed.
+ /* Called before a directory's children are processed.
*
* Set *SKIP_CHILDREN to TRUE, to skip calling callbacks for all
* children.
Modified:
subversion/branches/svn-auth-x509/subversion/include/private/svn_mutex.h
URL:
http://svn.apache.org/viewvc/subversion/branches/svn-auth-x509/subversion/include/private/svn_mutex.h?rev=1639628&r1=1639627&r2=1639628&view=diff
==============================================================================
--- subversion/branches/svn-auth-x509/subversion/include/private/svn_mutex.h
(original)
+++ subversion/branches/svn-auth-x509/subversion/include/private/svn_mutex.h
Fri Nov 14 13:17:55 2014
@@ -54,16 +54,13 @@ typedef struct svn_mutex__t svn_mutex__t
* We don't support recursive locks, i.e. a thread may not acquire the same
* mutex twice without releasing it in between. Attempts to lock a mutex
* recursively will cause lock ups and other undefined behavior on some
- * systems. If @a checked is set, svn_mutex__lock() will try to detect that
- * situation and return an error. However, this comes with some system
- * dependent overhead and may not detect all violations.
+ * systems.
*
* If threading is not supported by APR, this function is a no-op.
*/
svn_error_t *
svn_mutex__init(svn_mutex__t **mutex,
svn_boolean_t mutex_required,
- svn_boolean_t checked,
apr_pool_t *result_pool);
/** Acquire the @a mutex, if that has been enabled in svn_mutex__init().
Modified:
subversion/branches/svn-auth-x509/subversion/include/private/svn_opt_private.h
URL:
http://svn.apache.org/viewvc/subversion/branches/svn-auth-x509/subversion/include/private/svn_opt_private.h?rev=1639628&r1=1639627&r2=1639628&view=diff
==============================================================================
---
subversion/branches/svn-auth-x509/subversion/include/private/svn_opt_private.h
(original)
+++
subversion/branches/svn-auth-x509/subversion/include/private/svn_opt_private.h
Fri Nov 14 13:17:55 2014
@@ -46,10 +46,6 @@ extern "C" {
* UTF8_TARGET need not be canonical. *TRUE_TARGET will not be canonical
* unless UTF8_TARGET is.
*
- * It is an error if *TRUE_TARGET results in the empty string after the
- * split, which happens in case UTF8_TARGET has a leading '@' character
- * with no additional '@' characters to escape the first '@'.
- *
* Note that *PEG_REVISION will still contain the '@' symbol as the first
* character if a peg revision was found. If a trailing '@' symbol was
* used to escape other '@' characters in UTF8_TARGET, *PEG_REVISION will
Modified:
subversion/branches/svn-auth-x509/subversion/include/private/svn_string_private.h
URL:
http://svn.apache.org/viewvc/subversion/branches/svn-auth-x509/subversion/include/private/svn_string_private.h?rev=1639628&r1=1639627&r2=1639628&view=diff
==============================================================================
---
subversion/branches/svn-auth-x509/subversion/include/private/svn_string_private.h
(original)
+++
subversion/branches/svn-auth-x509/subversion/include/private/svn_string_private.h
Fri Nov 14 13:17:55 2014
@@ -139,13 +139,6 @@ svn_stringbuf__morph_into_string(svn_str
unsigned long
svn__strtoul(const char *buffer, const char **end);
-/** Like strtol but with a fixed base of 10 and without overflow checks.
- * This allows the compiler to generate massively faster code.
- * (E.g. Avoiding locale specific processing)
- */
-long
-svn__strtol(const char *buffer, const char **end);
-
/** Number of chars needed to represent signed (19 places + sign + NUL) or
* unsigned (20 places + NUL) integers as strings.
*/
Modified:
subversion/branches/svn-auth-x509/subversion/include/private/svn_wc_private.h
URL:
http://svn.apache.org/viewvc/subversion/branches/svn-auth-x509/subversion/include/private/svn_wc_private.h?rev=1639628&r1=1639627&r2=1639628&view=diff
==============================================================================
---
subversion/branches/svn-auth-x509/subversion/include/private/svn_wc_private.h
(original)
+++
subversion/branches/svn-auth-x509/subversion/include/private/svn_wc_private.h
Fri Nov 14 13:17:55 2014
@@ -82,8 +82,6 @@ svn_wc__get_file_external_editor(const s
const char *recorded_url,
const svn_opt_revision_t *recorded_peg_rev,
const svn_opt_revision_t *recorded_rev,
- svn_wc_conflict_resolver_func2_t
conflict_func,
- void *conflict_baton,
svn_cancel_func_t cancel_func,
void *cancel_baton,
svn_wc_notify_func2_t notify_func,
@@ -293,7 +291,7 @@ svn_wc__close_db(const char *external_ab
* use @a scratch_pool for temporary allocations.
*/
svn_error_t *
-svn_wc__get_tree_conflict(const svn_wc_conflict_description3_t **tree_conflict,
+svn_wc__get_tree_conflict(const svn_wc_conflict_description2_t **tree_conflict,
svn_wc_context_t *wc_ctx,
const char *victim_abspath,
apr_pool_t *result_pool,
@@ -311,7 +309,7 @@ svn_wc__get_tree_conflict(const svn_wc_c
*/
svn_error_t *
svn_wc__add_tree_conflict(svn_wc_context_t *wc_ctx,
- const svn_wc_conflict_description3_t *conflict,
+ const svn_wc_conflict_description2_t *conflict,
apr_pool_t *scratch_pool);
/* Remove any tree conflict on victim @a victim_abspath using @a wc_ctx.
@@ -355,26 +353,6 @@ svn_wc__get_wcroot(const char **wcroot_a
*/
/*
- * Convert from svn_wc_conflict_description3_t to
- * svn_wc_conflict_description2_t.
- *
- * Allocate the result in RESULT_POOL.
- */
-svn_wc_conflict_description2_t *
-svn_wc__cd3_to_cd2(const svn_wc_conflict_description3_t *conflict,
- apr_pool_t *result_pool);
-
-/*
- * Convert an array of svn_wc_conflict_description3_t * elements to an
- * array of * svn_wc_conflict_description2_t * elements.
- *
- * Allocate the result in RESULT_POOL.
- */
-apr_array_header_t *
-svn_wc__cd3_array_to_cd2_array(const apr_array_header_t *conflicts,
- apr_pool_t *result_pool);
-
-/*
* Convert from svn_wc_conflict_description2_t to
* svn_wc_conflict_description_t. This is needed by some backwards-compat
* code in libsvn_client/ctx.c
@@ -1575,8 +1553,12 @@ svn_wc__get_switch_editor(const svn_delt
* if they weren't modified after being copied. This allows the callbacks
* to generate appropriate --git diff headers for such files.
*
- * Normally, the difference from repository->working_copy is shown.
- * If @a reverse_order is TRUE, then show working_copy->repository diffs.
+ * Normally, the difference from repository->working_copy is shown. If
+ * @a reverse_order is TRUE, then we want to show working_copy->repository
+ * diffs. Most of the reversal is done by the caller; here we just swap the
+ * order of reporting a replacement so that the local addition is reported
+ * before the remote delete. (The caller's diff processor can then transform
+ * adds into deletes and deletes into adds, but it can't reorder the output.)
*
* If @a cancel_func is non-NULL, it will be used along with @a cancel_baton
* to periodically check if the client has canceled the operation.
Modified: subversion/branches/svn-auth-x509/subversion/include/svn_client.h
URL:
http://svn.apache.org/viewvc/subversion/branches/svn-auth-x509/subversion/include/svn_client.h?rev=1639628&r1=1639627&r2=1639628&view=diff
==============================================================================
--- subversion/branches/svn-auth-x509/subversion/include/svn_client.h (original)
+++ subversion/branches/svn-auth-x509/subversion/include/svn_client.h Fri Nov
14 13:17:55 2014
@@ -1081,20 +1081,15 @@ svn_client_create_context(svn_client_ctx
/** @} end group: Client context management */
/**
- * @name Authentication information file names
- *
- * Names of files that contain authentication information.
- *
- * These filenames are decided by libsvn_client, since this library
- * implements all the auth-protocols; libsvn_wc does nothing but
- * blindly store and retrieve these files from protected areas.
- *
- * @defgroup clnt_auth_filenames Client authentication file names
- * @{
+ * @deprecated Provided for backward compatibility. This constant was never
+ * used in released versions.
*/
#define SVN_CLIENT_AUTH_USERNAME "username"
+/**
+ * @deprecated Provided for backward compatibility. This constant was never
+ * used in released versions.
+ */
#define SVN_CLIENT_AUTH_PASSWORD "password"
-/** @} group end: Authentication information file names */
/** Client argument processing
*
@@ -1130,6 +1125,12 @@ svn_client_create_context(svn_client_ctx
* error, and if this is the only type of error encountered, complete
* the operation before returning the error(s).
*
+ * Return an error if a target is just a peg specifier with no path, such as
+ * "@abc". Before v1.6.5 (r878062) this form was interpreted as a literal path;
+ * it is now ambiguous. The form "@abc@" should now be used to refer to the
+ * literal path "@abc" with no peg revision, or the form ".@abc" to refer to
+ * the empty path with peg revision "abc".
+ *
* @since New in 1.7
*/
svn_error_t *
@@ -1144,6 +1145,9 @@ svn_client_args_to_target_array2(apr_arr
* Similar to svn_client_args_to_target_array2() but with
* @a keep_last_origpath_on_truepath_collision always set to FALSE.
*
+ * @since Since 1.6.5, this returns an error if a path contains a peg
+ * specifier with no path before it, such as "@abc".
+ *
* @deprecated Provided for backward compatibility with the 1.6 API.
*/
SVN_DEPRECATED
Modified: subversion/branches/svn-auth-x509/subversion/include/svn_cmdline.h
URL:
http://svn.apache.org/viewvc/subversion/branches/svn-auth-x509/subversion/include/svn_cmdline.h?rev=1639628&r1=1639627&r2=1639628&view=diff
==============================================================================
--- subversion/branches/svn-auth-x509/subversion/include/svn_cmdline.h
(original)
+++ subversion/branches/svn-auth-x509/subversion/include/svn_cmdline.h Fri Nov
14 13:17:55 2014
@@ -320,15 +320,58 @@ svn_cmdline_auth_plaintext_passphrase_pr
* by the command line client.
*
* @a non_interactive, @a username, @a password, @a config_dir,
- * @a no_auth_cache, and @a trust_server_cert are the values of the
- * command line options of the corresponding names.
+ * and @a no_auth_cache are the values of the command line options
+ * of the corresponding names.
*
+ * If @a non_interactive is @c TRUE, then the following parameters
+ * control whether an invalid SSL certificate will be accepted
+ * regardless of a specific verification failure:
+ *
+ * @a trust_server_cert_unknown_ca: If @c TRUE, accept certificates
+ * from unknown certificate authorities.
+ *
+ * @a trust_server_cert_cn_mismatch: If @c TRUE, accept certificates
+ * even if the Common Name attribute of the certificate differs from
+ * the hostname of the server.
+ *
+ * @a trust_server_cert_expired: If @c TRUE, accept certificates even
+ * if they are expired.
+ *
+ * @a trust_server_cert_not_yet_valid: If @c TRUE, accept certificates
+ * from the future.
+ *
+ * @a trust_server_cert_other_failure: If @c TRUE, accept certificates
+ * even if any other verification failure than the above occured.
+ *
* @a cfg is the @c SVN_CONFIG_CATEGORY_CONFIG configuration, and
* @a cancel_func and @a cancel_baton control the cancellation of the
* prompting providers that are initialized.
*
* Use @a pool for all allocations.
*
+ * @since New in 1.9.
+ */
+svn_error_t *
+svn_cmdline_create_auth_baton2(svn_auth_baton_t **ab,
+ svn_boolean_t non_interactive,
+ const char *username,
+ const char *password,
+ const char *config_dir,
+ svn_boolean_t no_auth_cache,
+ svn_boolean_t trust_server_cert_unknown_ca,
+ svn_boolean_t trust_server_cert_cn_mismatch,
+ svn_boolean_t trust_server_cert_expired,
+ svn_boolean_t trust_server_cert_not_yet_valid,
+ svn_boolean_t trust_server_cert_other_failure,
+ svn_config_t *cfg,
+ svn_cancel_func_t cancel_func,
+ void *cancel_baton,
+ apr_pool_t *pool);
+
+/* Like svn_cmdline_create_auth_baton2, but with only one trust_server_cert
+ * option which corresponds to trust_server_cert_unknown_ca.
+ *
+ * @deprecated Provided for backward compatibility with the 1.8 API.
* @since New in 1.6.
*/
svn_error_t *
Modified: subversion/branches/svn-auth-x509/subversion/include/svn_config.h
URL:
http://svn.apache.org/viewvc/subversion/branches/svn-auth-x509/subversion/include/svn_config.h?rev=1639628&r1=1639627&r2=1639628&view=diff
==============================================================================
--- subversion/branches/svn-auth-x509/subversion/include/svn_config.h (original)
+++ subversion/branches/svn-auth-x509/subversion/include/svn_config.h Fri Nov
14 13:17:55 2014
@@ -191,7 +191,7 @@ typedef struct svn_config_t svn_config_t
#define SVN_CONFIG__DEFAULT_GLOBAL_IGNORES_LINE_1 \
"*.o *.lo *.la *.al .libs *.so *.so.[0-9]* *.a *.pyc *.pyo __pycache__"
#define SVN_CONFIG__DEFAULT_GLOBAL_IGNORES_LINE_2 \
- "*.rej *~ #*# .#* .*.swp .DS_Store"
+ "*.rej *~ #*# .#* .*.swp .DS_Store [Tt]humbs.db"
#endif
#define SVN_CONFIG_DEFAULT_GLOBAL_IGNORES \
Modified: subversion/branches/svn-auth-x509/subversion/include/svn_delta.h
URL:
http://svn.apache.org/viewvc/subversion/branches/svn-auth-x509/subversion/include/svn_delta.h?rev=1639628&r1=1639627&r2=1639628&view=diff
==============================================================================
--- subversion/branches/svn-auth-x509/subversion/include/svn_delta.h (original)
+++ subversion/branches/svn-auth-x509/subversion/include/svn_delta.h Fri Nov 14
13:17:55 2014
@@ -249,6 +249,7 @@ svn_txdelta_compose_windows(const svn_tx
*
* @since New in 1.4
*
+ * @since Since 1.9, @a tbuf may be NULL if @a *tlen is 0.
*/
void
svn_txdelta_apply_instructions(svn_txdelta_window_t *window,
