Author: futatuki
Date: Mon Jul 8 15:19:03 2019
New Revision: 1862754
URL: http://svn.apache.org/viewvc?rev=1862754&view=rev
Log:
On branch swig-py3: Catchup to trunk @r1862753.
Added:
subversion/branches/swig-py3/build/ac-macros/ax_boost_base.m4
- copied unchanged from r1862712,
subversion/trunk/build/ac-macros/ax_boost_base.m4
subversion/branches/swig-py3/build/ac-macros/ax_boost_unit_test_framework.m4
- copied unchanged from r1862712,
subversion/trunk/build/ac-macros/ax_boost_unit_test_framework.m4
subversion/branches/swig-py3/subversion/bindings/cxx/
- copied from r1862712, subversion/trunk/subversion/bindings/cxx/
subversion/branches/swig-py3/subversion/bindings/javahl/native/CxxCompat.hpp
- copied unchanged from r1862712,
subversion/trunk/subversion/bindings/javahl/native/CxxCompat.hpp
subversion/branches/swig-py3/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/BlameLineCallback.java
- copied unchanged from r1862712,
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/BlameLineCallback.java
subversion/branches/swig-py3/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/BlameRangeCallback.java
- copied unchanged from r1862712,
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/BlameRangeCallback.java
subversion/branches/swig-py3/subversion/include/private/svn_dirent_uri_private.h
- copied unchanged from r1862712,
subversion/trunk/subversion/include/private/svn_dirent_uri_private.h
subversion/branches/swig-py3/subversion/include/svn_opt_impl.h
- copied unchanged from r1862712,
subversion/trunk/subversion/include/svn_opt_impl.h
subversion/branches/swig-py3/subversion/include/svn_types_impl.h
- copied unchanged from r1862712,
subversion/trunk/subversion/include/svn_types_impl.h
Removed:
subversion/branches/swig-py3/doc/programmer/gtest-guide.txt
subversion/branches/swig-py3/subversion/bindings/cxxhl/
Modified:
subversion/branches/swig-py3/ (props changed)
subversion/branches/swig-py3/CHANGES
subversion/branches/swig-py3/COMMITTERS
subversion/branches/swig-py3/INSTALL
subversion/branches/swig-py3/LICENSE
subversion/branches/swig-py3/Makefile.in
subversion/branches/swig-py3/NOTICE
subversion/branches/swig-py3/aclocal.m4
subversion/branches/swig-py3/build.conf
subversion/branches/swig-py3/build/ac-macros/compiler.m4
subversion/branches/swig-py3/build/ac-macros/kwallet.m4
subversion/branches/swig-py3/build/ac-macros/swig.m4
subversion/branches/swig-py3/build/generator/gen_make.py
subversion/branches/swig-py3/build/generator/gen_vcnet_vcproj.py
subversion/branches/swig-py3/build/generator/gen_win.py
subversion/branches/swig-py3/build/generator/gen_win_dependencies.py
subversion/branches/swig-py3/configure.ac
subversion/branches/swig-py3/doc/doxygen.conf
subversion/branches/swig-py3/gen-make.py
subversion/branches/swig-py3/get-deps.sh
subversion/branches/swig-py3/notes/knobs
subversion/branches/swig-py3/notes/shelving/shelf-structure.txt
subversion/branches/swig-py3/subversion/bindings/javahl/native/BlameCallback.cpp
subversion/branches/swig-py3/subversion/bindings/javahl/native/BlameCallback.h
subversion/branches/swig-py3/subversion/bindings/javahl/native/EditorProxy.cpp
subversion/branches/swig-py3/subversion/bindings/javahl/native/EditorProxy.h
subversion/branches/swig-py3/subversion/bindings/javahl/native/OperationContext.cpp
subversion/branches/swig-py3/subversion/bindings/javahl/native/OperationContext.h
subversion/branches/swig-py3/subversion/bindings/javahl/native/Path.cpp
subversion/branches/swig-py3/subversion/bindings/javahl/native/Prompter.cpp
subversion/branches/swig-py3/subversion/bindings/javahl/native/Prompter.h
subversion/branches/swig-py3/subversion/bindings/javahl/native/RemoteSession.cpp
subversion/branches/swig-py3/subversion/bindings/javahl/native/RemoteSession.h
subversion/branches/swig-py3/subversion/bindings/javahl/native/RemoteSessionContext.cpp
subversion/branches/swig-py3/subversion/bindings/javahl/native/RemoteSessionContext.h
subversion/branches/swig-py3/subversion/bindings/javahl/native/SVNClient.cpp
subversion/branches/swig-py3/subversion/bindings/javahl/native/StateReporter.cpp
subversion/branches/swig-py3/subversion/bindings/javahl/native/jniwrapper/jni_class_cache.cpp
subversion/branches/swig-py3/subversion/bindings/javahl/native/jniwrapper/jni_io_stream.cpp
subversion/branches/swig-py3/subversion/bindings/javahl/native/org_apache_subversion_javahl_SVNClient.cpp
subversion/branches/swig-py3/subversion/bindings/javahl/native/org_apache_subversion_javahl_remote_RemoteSession.cpp
subversion/branches/swig-py3/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_ConfigImpl_Category.cpp
subversion/branches/swig-py3/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_PropLib.cpp
subversion/branches/swig-py3/subversion/bindings/javahl/native/org_apache_subversion_javahl_util_SubstLib.cpp
subversion/branches/swig-py3/subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java
subversion/branches/swig-py3/subversion/bindings/javahl/src/org/apache/subversion/javahl/NativeResources.java
subversion/branches/swig-py3/subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java
subversion/branches/swig-py3/subversion/bindings/javahl/src/org/apache/subversion/javahl/callback/BlameCallback.java
subversion/branches/swig-py3/subversion/bindings/javahl/src/org/apache/subversion/javahl/types/RevisionRange.java
subversion/branches/swig-py3/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
subversion/branches/swig-py3/subversion/bindings/javahl/tests/org/apache/subversion/javahl/ExceptionTests.java
subversion/branches/swig-py3/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNRemoteTests.java
subversion/branches/swig-py3/subversion/bindings/swig/core.i
subversion/branches/swig-py3/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
subversion/branches/swig-py3/subversion/bindings/swig/python/svn/core.py
subversion/branches/swig-py3/subversion/bindings/swig/ruby/test/test_delta.rb
subversion/branches/swig-py3/subversion/include/private/svn_client_mtcc.h
subversion/branches/swig-py3/subversion/include/private/svn_client_private.h
subversion/branches/swig-py3/subversion/include/private/svn_fs_fs_private.h
subversion/branches/swig-py3/subversion/include/private/svn_wc_private.h
subversion/branches/swig-py3/subversion/include/svn_client.h
subversion/branches/swig-py3/subversion/include/svn_delta.h
subversion/branches/swig-py3/subversion/include/svn_dirent_uri.h
subversion/branches/swig-py3/subversion/include/svn_error_codes.h
subversion/branches/swig-py3/subversion/include/svn_fs.h
subversion/branches/swig-py3/subversion/include/svn_opt.h
subversion/branches/swig-py3/subversion/include/svn_repos.h
subversion/branches/swig-py3/subversion/include/svn_types.h
subversion/branches/swig-py3/subversion/include/svn_version.h
subversion/branches/swig-py3/subversion/libsvn_client/add.c
subversion/branches/swig-py3/subversion/libsvn_client/blame.c
subversion/branches/swig-py3/subversion/libsvn_client/client.h
subversion/branches/swig-py3/subversion/libsvn_client/commit.c
subversion/branches/swig-py3/subversion/libsvn_client/commit_util.c
subversion/branches/swig-py3/subversion/libsvn_client/conflicts.c
subversion/branches/swig-py3/subversion/libsvn_client/copy.c
subversion/branches/swig-py3/subversion/libsvn_client/delete.c
subversion/branches/swig-py3/subversion/libsvn_client/deprecated.c
subversion/branches/swig-py3/subversion/libsvn_client/shelf.c
subversion/branches/swig-py3/subversion/libsvn_client/upgrade.c
subversion/branches/swig-py3/subversion/libsvn_client/util.c
subversion/branches/swig-py3/subversion/libsvn_client/wc_editor.c
subversion/branches/swig-py3/subversion/libsvn_delta/branch_compat.c
subversion/branches/swig-py3/subversion/libsvn_delta/compat.c
subversion/branches/swig-py3/subversion/libsvn_delta/deprecated.c
subversion/branches/swig-py3/subversion/libsvn_delta/path_driver.c
subversion/branches/swig-py3/subversion/libsvn_fs/fs-loader.c
subversion/branches/swig-py3/subversion/libsvn_fs/fs-loader.h
subversion/branches/swig-py3/subversion/libsvn_fs_base/fs.c
subversion/branches/swig-py3/subversion/libsvn_fs_fs/dump-index.c
subversion/branches/swig-py3/subversion/libsvn_fs_fs/fs.c
subversion/branches/swig-py3/subversion/libsvn_fs_fs/fs_fs.h
subversion/branches/swig-py3/subversion/libsvn_fs_fs/load-index.c
subversion/branches/swig-py3/subversion/libsvn_fs_fs/revprops.c
subversion/branches/swig-py3/subversion/libsvn_fs_fs/revprops.h
subversion/branches/swig-py3/subversion/libsvn_fs_fs/stats.c
subversion/branches/swig-py3/subversion/libsvn_fs_x/ (props changed)
subversion/branches/swig-py3/subversion/libsvn_fs_x/fs.c
subversion/branches/swig-py3/subversion/libsvn_ra_svn/client.c
subversion/branches/swig-py3/subversion/libsvn_repos/authz.c
subversion/branches/swig-py3/subversion/libsvn_repos/authz.h
subversion/branches/swig-py3/subversion/libsvn_repos/authz_parse.c
subversion/branches/swig-py3/subversion/libsvn_repos/deprecated.c
subversion/branches/swig-py3/subversion/libsvn_repos/dump.c
subversion/branches/swig-py3/subversion/libsvn_repos/replay.c
subversion/branches/swig-py3/subversion/libsvn_subr/dirent_uri.c
subversion/branches/swig-py3/subversion/libsvn_subr/error.c
subversion/branches/swig-py3/subversion/libsvn_subr/io.c
subversion/branches/swig-py3/subversion/libsvn_subr/pool.c
subversion/branches/swig-py3/subversion/libsvn_subr/version.c
subversion/branches/swig-py3/subversion/libsvn_wc/node.c
subversion/branches/swig-py3/subversion/libsvn_wc/revert.c
subversion/branches/swig-py3/subversion/libsvn_wc/update_editor.c
subversion/branches/swig-py3/subversion/libsvn_wc/wc-queries.sql
subversion/branches/swig-py3/subversion/libsvn_wc/wc_db.c
subversion/branches/swig-py3/subversion/libsvn_wc/wc_db.h
subversion/branches/swig-py3/subversion/libsvn_wc/wc_db_update_move.c
subversion/branches/swig-py3/subversion/libsvn_wc/wcroot_anchor.c
subversion/branches/swig-py3/subversion/mod_authz_svn/mod_authz_svn.c
subversion/branches/swig-py3/subversion/mod_dav_svn/reports/list.c
subversion/branches/swig-py3/subversion/mod_dav_svn/repos.c
subversion/branches/swig-py3/subversion/svn/blame-cmd.c
subversion/branches/swig-py3/subversion/svn/cl.h
subversion/branches/swig-py3/subversion/svn/conflict-callbacks.c
subversion/branches/swig-py3/subversion/svn/revert-cmd.c
subversion/branches/swig-py3/subversion/svn/shelf-cmd.c
subversion/branches/swig-py3/subversion/svn/svn.c
subversion/branches/swig-py3/subversion/svn/util.c
subversion/branches/swig-py3/subversion/svnadmin/svnadmin.c
subversion/branches/swig-py3/subversion/svndumpfilter/svndumpfilter.c
subversion/branches/swig-py3/subversion/svnfsfs/dump-index-cmd.c
subversion/branches/swig-py3/subversion/svnfsfs/load-index-cmd.c
subversion/branches/swig-py3/subversion/svnfsfs/stats-cmd.c
subversion/branches/swig-py3/subversion/svnserve/logger.c
subversion/branches/swig-py3/subversion/svnserve/logger.h
subversion/branches/swig-py3/subversion/svnserve/serve.c
subversion/branches/swig-py3/subversion/tests/ (props changed)
subversion/branches/swig-py3/subversion/tests/cmdline/ (props changed)
subversion/branches/swig-py3/subversion/tests/cmdline/authz_tests.py
subversion/branches/swig-py3/subversion/tests/cmdline/commit_tests.py
subversion/branches/swig-py3/subversion/tests/cmdline/dav_tests.py
subversion/branches/swig-py3/subversion/tests/cmdline/getopt_tests_data/svn--help_stdout
subversion/branches/swig-py3/subversion/tests/cmdline/getopt_tests_data/svn_help_stdout
subversion/branches/swig-py3/subversion/tests/cmdline/revert_tests.py
subversion/branches/swig-py3/subversion/tests/cmdline/shelf_tests.py
subversion/branches/swig-py3/subversion/tests/cmdline/svnadmin_tests.py
subversion/branches/swig-py3/subversion/tests/cmdline/svnauthz_tests.py
subversion/branches/swig-py3/subversion/tests/cmdline/svnserveautocheck.sh
subversion/branches/swig-py3/subversion/tests/cmdline/svntest/main.py
subversion/branches/swig-py3/subversion/tests/cmdline/switch_tests.py
subversion/branches/swig-py3/subversion/tests/cmdline/update_tests.py
subversion/branches/swig-py3/subversion/tests/libsvn_client/conflicts-test.c
subversion/branches/swig-py3/subversion/tests/libsvn_fs/fs-test.c
subversion/branches/swig-py3/subversion/tests/libsvn_fs/locks-test.c
subversion/branches/swig-py3/subversion/tests/libsvn_fs_fs/fs-fs-private-test.c
subversion/branches/swig-py3/subversion/tests/libsvn_ra/ra-test.c
subversion/branches/swig-py3/subversion/tests/libsvn_repos/authz-test.c
subversion/branches/swig-py3/subversion/tests/libsvn_subr/dirent_uri-test.c
subversion/branches/swig-py3/subversion/tests/libsvn_subr/io-test.c
subversion/branches/swig-py3/subversion/tests/libsvn_wc/wc-queries-test.c
subversion/branches/swig-py3/tools/client-side/bash_completion
subversion/branches/swig-py3/tools/client-side/svn-mergeinfo-normalizer/svn-mergeinfo-normalizer.c
subversion/branches/swig-py3/tools/client-side/svnconflict/svnconflict.c
subversion/branches/swig-py3/tools/dev/build-svn-deps-win.pl
subversion/branches/swig-py3/tools/dev/unix-build/Makefile.svn
subversion/branches/swig-py3/tools/dist/backport.pl
subversion/branches/swig-py3/tools/dist/create-minor-release-branch.py
subversion/branches/swig-py3/tools/dist/nightly.sh
subversion/branches/swig-py3/tools/dist/release.py
subversion/branches/swig-py3/tools/server-side/svnauthz.c
Propchange: subversion/branches/swig-py3/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 8 15:19:03 2019
@@ -79,6 +79,7 @@
/subversion/branches/revprop-packing:1143907,1143971,1143997,1144017,1144499,1144568,1146145
/subversion/branches/shelve:1802592-1815226
/subversion/branches/shelve-checkpoint:1801593-1801923,1801970,1817320,1828508,1828521
+/subversion/branches/shelving-v3:1853394-1853901
/subversion/branches/subtree-mergeinfo:876734-878766
/subversion/branches/svn-auth-x509:1603509-1655900
/subversion/branches/svn-info-detail:1660035-1662618
@@ -101,4 +102,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1813660-1849002
+/subversion/trunk:1813660-1862712
Modified: subversion/branches/swig-py3/CHANGES
URL:
http://svn.apache.org/viewvc/subversion/branches/swig-py3/CHANGES?rev=1862754&r1=1862753&r2=1862754&view=diff
==============================================================================
--- subversion/branches/swig-py3/CHANGES (original)
+++ subversion/branches/swig-py3/CHANGES Mon Jul 8 15:19:03 2019
@@ -4,37 +4,87 @@
# To view an issue listed as (issue #XXXX), visit:
# https://issues.apache.org/jira/browse/SVN-XXXX
+Version 1.13.0
+(?? ??? 20XX, from /branches/1.13.x)
+https://svn.apache.org/repos/asf/subversion/tags/1.13.0
+
Version 1.12.0
-(?? ??? 20XX, from /branches/1.12.x)
+(12 Apr 2019, from /branches/1.12.x)
https://svn.apache.org/repos/asf/subversion/tags/1.12.0
User-visible changes:
- Major new features:
- Minor new features and improvements:
+ * 'move vs. move' merge conflicts can now be resolved (r1846851, r1851913)
* 'svn --version --verbose' shows loaded libraries on Linux (r1843774)
* 'svnrdump' can read/write a file instead of stdin/stdout (r1844906)
- * 'svn list' tries to not truncate the authior's name (r1847384 et al.)
+ * 'svn list' tries to not truncate the author's name (r1847384 et al.)
* 'svn list' can show sizes in base-2 unit suffixes (r1847384 et al.)
* 'svn info' shows the size of files in the repository (r1847441 et al.)
+ * 'svn cleanup' can remove read-only directories (#4806, r1854072 et al.)
- Client-side bugfixes:
* Repos-to-WC copy with --parents works with absent target (r1843888)
* Repos-to-WC copy from foreign repo with peg/operative revs (#4785)
- Server-side bugfixes:
+ * Ignore empty group definitions in authz files (#4802, r1851687)
- Client-side and server-side bugfixes:
- Other tool improvements and bugfixes:
+ * svnauthz: warn about empty groups in authz files (#4803, r1851823)
+ * Storing passwords in plain text on disk is disabled by default (r1845377)
Developer-visible changes:
- General:
- * Storing passwords in plain text on disk is disabled by default (r1845377)
* Updated the required libtool version to 2.x (r1845716)
+ * get-deps.sh: Remove references to Googlemock and Googletest (r1849200)
+ * All C++ code is compiled in C++11 mode by default (r1849202)
- Bindings:
- * Fixed potential core dump in JavaHL's ISVNClient.diff (r1845408)
+ * JavaHL: Fixed potential core dump in ISVNClient.diff (r1845408)
+ * JavaHL: Let clients decode file contents from ISVNClient.blame (r1851333)
+
+
+Version 1.11.1
+(11 Jan 2019, from /branches/1.11.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.11.1
+
+ User-visible changes:
+ - Minor new features and improvements:
+ * Conflict resolver support for added vs unversioned file (r1845577)
+ * Conflict resolver support for unversioned directories (r1846299)
+ * Improve help for 'svn add' and the '-N' option (r1842814 et al.)
+ * Improve display of Mac OS name in 'svn --version --verbose' (r1842334)
+
+ - Client-side bugfixes:
+ * Fix: repos-to-WC copy with --parents doesn't create dirs (#4768)
+ * Fix: foreign repo copy with peg/operative revisions (#4785)
+ * Fix: foreign repo copy of file adding mergeinfo (#4792)
+ * Fix: assertion failure using -rPREV on a working copy at r0 (#4532)
+ * Fix: tree conflict message ends a sentence with a colon (#4717)
+
+ - Server-side bugfixes:
+ * Fix CVE-2018-11803: malicious SVN clients can crash mod_dav_svn
+ * Fix: unexpected SVN_ERR_FS_NOT_DIRECTORY errors (#4791)
+ * Fix: mod_dav_svn's SVNUseUTF8 had no effect in some setups (r1844882)
+ * Fix crash in mod_http2 (#4782)
+
+ - Other tool improvements and bugfixes:
+ * svndumpfilter: Clarify error messages by including node path (r1845261)
+
+ - Bindings bugfixes:
+ * JavaHL: Fix crash in client code when using external diff (r1845408)
+
+ Developer-visible changes:
+ - General:
+ * Fix build on systems without python in $PATH (r1845555)
+ * Fix compiler warnings about indentation (r1845556 et al.)
+
+ - API changes:
+ (none)
Version 1.11.0
@@ -86,6 +136,42 @@ http://svn.apache.org/repos/asf/subversi
* Fix a potential crash in JavaHL (issue #4764)
+Version 1.10.4
+(11 Jan 2019, from /branches/1.10.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.10.4
+
+ User-visible changes:
+ - Minor new features and improvements:
+ * Conflict resolver support for added vs unversioned file (r1845577)
+ * Conflict resolver support for unversioned directories (r1846299)
+
+ - Client-side bugfixes:
+ * Fix: repos-to-WC copy with --parents doesn't create dirs (#4768)
+ * Fix: foreign repo copy with peg/operative revisions (#4785)
+ * Fix: foreign repo copy of file adding mergeinfo (#4792)
+ * Fix: assertion failure using -rPREV on a working copy at r0 (#4532)
+ * Fix: tree conflict message ends a sentence with a colon (#4717)
+
+ - Server-side bugfixes:
+ * Fix CVE-2018-11803: malicious SVN clients can crash mod_dav_svn
+ * Fix: unexpected SVN_ERR_FS_NOT_DIRECTORY errors (#4791)
+ * Fix: mod_dav_svn's SVNUseUTF8 had no effect in some setups (r1844882)
+ * Fix crash in mod_http2 (#4782)
+
+ - Other tool improvements and bugfixes:
+ * svndumpfilter: Clarify error messages by including node path (r1845261)
+
+ - Bindings bugfixes:
+ * JavaHL: Fix crash in client code when using external diff (r1845408)
+
+ Developer-visible changes:
+ - General:
+ * Fix build on systems without python in $PATH (r1845555)
+
+ - API changes:
+ (none)
+
+
Version 1.10.3
(10 Oct 2018, from /branches/1.10.x)
http://svn.apache.org/repos/asf/subversion/tags/1.10.3
@@ -157,7 +243,7 @@ the 1.9 release: https://subversion.apa
User-visible changes:
- Major new features:
* Better interactive conflict resolution for tree conflicts (r1687489 et
al)
- * Wilcards and improved performance in path-based authorization (r1776832)
+ * Wildcards and improved performance in path-based authorization (r1776832)
* New experimental 'svn shelve' command (issue #3625)
- Minor new features and improvements:
* svnbench: Show time taken & bytes transferred (r1703383, r1710586)
@@ -178,7 +264,7 @@ the 1.9 release: https://subversion.apa
* ra_serf: Adjustments for serf versions with HTTP/2 support (r1716400)
* ra_serf: Send svndiff1 deltas during commit (r1704317, r1704613,
r1791290)
* ra_serf: Stream svndiff deltas w/o creating temporary files (r1803143 et
al)
- * ra_serf: Don't necessarily request full MERGE reponses (r1806017 et al)
+ * ra_serf: Don't necessarily request full MERGE responses (r1806017 et al)
* 'svn patch': Parse binary diffs in git-style patches (r1703925)
* 'svnadmin info' now reports latest revision in the repository (r1697953)
* ra_svn: Various performance-related tweaks (r1694490)
@@ -435,6 +521,46 @@ the 1.9 release: https://subversion.apa
* Ruby: Detect versions up to 2.4 (r1806570)
+Version 1.9.10
+(11 Jan 2019, from /branches/1.9.x)
+http://svn.apache.org/repos/asf/subversion/tags/1.9.10
+
+ User-visible changes:
+ - Client-side bugfixes:
+ * Fix: repos-to-WC copy with --parents doesn't create dirs (#4768)
+ * Fix: foreign repo copy with peg/operative revisions (#4785)
+ * Fix: assertion failure using -rPREV on a working copy at r0 (#4532)
+ * Fix: german translation for 'svn help merge' (r1837037)
+ * Fix: prune externals after 'update --set-depth=exclude' (r1830883 et al.)
+ * Fix: detection of GPG-agent (r1794166 et al.)
+ * Fix: null updates don't update last-changed-revision (#4700)
+ * Fix: merge "Unable to parse reversed revision range" (#4686)
+
+ - Server-side bugfixes:
+ * Fix: unexpected SVN_ERR_FS_NOT_DIRECTORY errors (#4791)
+ * Fix: mod_dav_svn's SVNUseUTF8 had no effect in some setups (r1844882)
+ * Fix: crash in mod_http2 (#4782)
+ * Fix: 'svnadmin upgrade' of BDB: Error out on too-new formats (r1804013)
+ * Fix: Enforce v1 HTTP protocol: error if PUT before CHECKOUT (r1833465)
+ * Fix: Let 'svnadmin recover' prune rep-cache even if disabled (r1838813)
+ * Add test and FSFS checksum verification for issue #4722 (r1826720 et al.)
+
+ - Other tool improvements and bugfixes:
+ * Install 'fsfs-stats' wrapper for 1.8 compat (r1802032 et al.)
+ * Note that 'tools/client-side/detach.py' doesn't work on 1.8+ (r1696722)
+
+ - Bindings bugfixes:
+ * JavaHL: Fix crash in client code when using external diff (r1845408)
+ * JavaHL: SSL server trust prompt: allow accepting temporarily (r1820718)
+
+ Developer-visible changes:
+ - General:
+ (none)
+
+ - API changes:
+ (none)
+
+
Version 1.9.9
(20 Jul 2018, from /branches/1.9.x)
http://svn.apache.org/repos/asf/subversion/tags/1.9.9
Modified: subversion/branches/swig-py3/COMMITTERS
URL:
http://svn.apache.org/viewvc/subversion/branches/swig-py3/COMMITTERS?rev=1862754&r1=1862753&r2=1862754&view=diff
==============================================================================
--- subversion/branches/swig-py3/COMMITTERS [UTF-8] (original)
+++ subversion/branches/swig-py3/COMMITTERS [UTF-8] Mon Jul 8 15:19:03 2019
@@ -61,6 +61,7 @@ Blanket commit access:
astieger Andreas Stieger <[email protected]>
jamessan James McCoy <[email protected]>
luke1410 Stefan Hett <[email protected]>
+ troycurtisjr Troy Curtis, Jr <[email protected]>
[[END ACTIVE FULL COMMITTERS. LEAVE THIS LINE HERE; SCRIPTS LOOK FOR IT.]]
@@ -104,7 +105,6 @@ Commit access for specific areas:
rschupp Roderich Schupp <[email protected]> (Swig bindings)
stilor Alexey Neyman <[email protected]> (Python bindings,
svn-vendor.py)
- troycurtisjr Troy Curtis, Jr <[email protected]> (Swig bindings)
Packages:
@@ -214,6 +214,7 @@ giorgio_valoti Giorgio Valoti <giorgio
holden Holden Karau <[email protected]> (scheme-bindings
br.)
moklo Morten Kloster <[email protected]>
(diff-improvements br.)
vmpn Vladimir Berezniker <[email protected]> (javahl-ra br.)
+ futatuki Yasuhito Futatsuki <[email protected]> (swig-py3 br.)
Subprojects that are complete, abandoned or have moved elsewhere:
Modified: subversion/branches/swig-py3/INSTALL
URL:
http://svn.apache.org/viewvc/subversion/branches/swig-py3/INSTALL?rev=1862754&r1=1862753&r2=1862754&view=diff
==============================================================================
--- subversion/branches/swig-py3/INSTALL (original)
+++ subversion/branches/swig-py3/INSTALL Mon Jul 8 15:19:03 2019
@@ -23,8 +23,8 @@ Contents:
III. BUILDING A SUBVERSION SERVER
A. Setting Up Apache Httpd
- B. Making and Installing the Subversion Server
- C. Configuring Apache for Subversion
+ B. Making and Installing the Subversion Apache Server Module
+ C. Configuring Apache Httpd for Subversion
D. Running and Testing
E. Alternative: 'svnserve' and ra_svn
@@ -166,11 +166,6 @@ I. INTRODUCTION
configured via auto-props or the mime-types-file option
take precedence.
- * Googlemock aka Gmock (OPTIONAL)
-
- This optional package is used by the tests for Subversions'
- C++ bindings.
-
C. Dependencies in Detail
@@ -528,12 +523,6 @@ I. INTRODUCTION
--with-libmagic
- 21. Googlemock (OPTIONAL)
-
- Googlemock can be installed and built in-tree by invoking
-
- $ ./get-dep.sh gmock
-
22. LZ4 (OPTIONAL)
Subversion uses LZ4 compression libary version r129 or above. Configure
Modified: subversion/branches/swig-py3/LICENSE
URL:
http://svn.apache.org/viewvc/subversion/branches/swig-py3/LICENSE?rev=1862754&r1=1862753&r2=1862754&view=diff
==============================================================================
--- subversion/branches/swig-py3/LICENSE (original)
+++ subversion/branches/swig-py3/LICENSE Mon Jul 8 15:19:03 2019
@@ -423,3 +423,24 @@ For the (modified) LZ4 library files in
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
THE POSSIBILITY OF SUCH DAMAGE.
+
+For the Autoconf Archive macros for Boost:
+
+ * in build/ac-macros/ax_boost_base.m4:
+
+ Copyright (c) 2008 Thomas Porschberg <[email protected]>
+ Copyright (c) 2009 Peter Adolphs
+
+ Copying and distribution of this file, with or without modification, are
+ permitted in any medium without royalty provided the copyright notice
+ and this notice are preserved. This file is offered as-is, without any
+ warranty.
+
+ * in build/ac-macros/ax_boost_unit_test_framework.m4:
+
+ Copyright (c) 2008 Thomas Porschberg <[email protected]>
+
+ Copying and distribution of this file, with or without modification, are
+ permitted in any medium without royalty provided the copyright notice
+ and this notice are preserved. This file is offered as-is, without any
+ warranty.
Modified: subversion/branches/swig-py3/Makefile.in
URL:
http://svn.apache.org/viewvc/subversion/branches/swig-py3/Makefile.in?rev=1862754&r1=1862753&r2=1862754&view=diff
==============================================================================
--- subversion/branches/swig-py3/Makefile.in (original)
+++ subversion/branches/swig-py3/Makefile.in Mon Jul 8 15:19:03 2019
@@ -80,6 +80,9 @@ datadir = @datadir@
datarootdir = @datarootdir@
localedir = @localedir@
+# where to install SVN++
+svnxx_libdir = @libdir@
+
# where to install libsvn_swig_*
swig_py_libdir = @libdir@
swig_pl_libdir = @libdir@
@@ -141,9 +144,8 @@ APACHE_INCLUDES = @APACHE_INCLUDES@
APACHE_LIBEXECDIR = $(DESTDIR)@APACHE_LIBEXECDIR@
APACHE_LDFLAGS = @APACHE_LDFLAGS@
-SVN_USE_GOOGLEMOCK = @SVN_USE_GOOGLEMOCK@
-GOOGLEMOCK_INCLUDES = -I@GOOGLEMOCK_SRCDIR@/googlemock/include
-I@GOOGLEMOCK_SRCDIR@/googletest/include
-GOOGLEMOCK_LIB_INCLUDES = -I@GOOGLEMOCK_SRCDIR@/googlemock
-I@GOOGLEMOCK_SRCDIR@/googletest $(GOOGLEMOCK_INCLUDES)
+BOOST_TEST_CPPFLAGS = @BOOST_CPPFLAGS@ -DBOOST_TEST_DYN_LINK
-DBOOST_TEST_NO_MAIN
+BOOST_TEST_LDFLAGS = @BOOST_LDFLAGS@ @BOOST_UNIT_TEST_FRAMEWORK_LIB@
SWIG = @SWIG@
SWIG_PY_INCLUDES = @SWIG_PY_INCLUDES@ @SVN_PY3C_INCLUDES@
-I$(SWIG_SRC_DIR)/python/libsvn_swig_py
@@ -169,7 +171,9 @@ CTYPES_PYTHON_SRC_DIR = $(abs_srcdir)/su
JAVAHL_JAR=subversion/bindings/javahl/svn-javahl.jar
JAVAHL_INCLUDES= @JNI_INCLUDES@
-I$(abs_builddir)/subversion/bindings/javahl/include
-CXXHL_INCLUDES = -I$(abs_srcdir)/subversion/bindings/cxxhl/include
+SVN_BUILD_SVNXX = @SVN_BUILD_SVNXX@
+SVN_BUILD_SVNXX_TESTS = @SVN_BUILD_SVNXX_TESTS@
+SVNXX_INCLUDES = -I$(abs_srcdir)/subversion/bindings/cxx/include
SVN_APR_CONFIG = @SVN_APR_CONFIG@
SVN_APR_INCLUDES = @SVN_APR_INCLUDES@
@@ -264,15 +268,15 @@ TEST_SHLIB_VAR_SWIG_RB=\
export @SVN_APR_SHLIB_PATH_VAR@; \
fi;
-# special compilation for files destined for cxxhl
-COMPILE_CXXHL_CXX = $(LT_COMPILE_CXX) $(CXXHL_INCLUDES) -o $@ -c
-COMPILE_GOOGLEMOCK_CXX = $(LT_COMPILE_CXX_NOWARN) $(GOOGLEMOCK_LIB_INCLUDES)
-o $@ -c
-COMPILE_CXXHL_GOOGLEMOCK_CXX = $(LT_COMPILE_CXX) $(CXXHL_INCLUDES)
$(GOOGLEMOCK_INCLUDES) -o $@ -c
+# special compilation for files destined for SVN++
+COMPILE_SVNXX = $(LT_COMPILE_CXX) $(SVNXX_INCLUDES) -o $@ -c
+COMPILE_SVNXX_TEST = $(LT_COMPILE_CXX) $(SVNXX_INCLUDES)
$(BOOST_TEST_CPPFLAGS) -o $@ -c
LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS)
$(LDFLAGS) -rpath $(libdir)
LINK_LIB = $(LINK) $(LT_SO_VERSION)
LINK_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS)
$(CXXFLAGS) $(LDFLAGS) -rpath $(libdir)
LINK_CXX_LIB = $(LINK_CXX) $(LT_SO_VERSION)
+LINK_SVNXX_TEST = $(LINK_CXX) $(BOOST_TEST_LDFLAGS)
# special link rule for mod_dav_svn
LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS)
$(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module
$(APACHE_LDFLAGS) -shared
@@ -326,6 +330,8 @@ INSTALL_DATA = $(INSTALL) -m 644
INSTALL_LOCALE = $(INSTALL_DATA)
INSTALL_APACHE_MODS = @INSTALL_APACHE_MODS@
+INSTALL_SVNXX_LIB = $(INSTALL_LIB)
+
### this isn't correct yet
INSTALL_SWIG_PY = $(INSTALL_LIB)
INSTALL_SWIG_PY_LIB = $(INSTALL_LIB)
@@ -530,6 +536,9 @@ check-javahl: check-apache-javahl
check-all-javahl: check-apache-javahl check-tigris-javahl
check-deprecated-authn-javahl
+check-svnxx: svnxx-tests
+ $(abs_builddir)/$(svnxx_tests_PATH)/svnxx-tests$(EXEEXT)
+
# "make check CLEANUP=true" will clean up directories for successful tests.
# "make check TESTS=subversion/tests/cmdline/basic_tests.py"
# will perform only basic tests (likewise for other tests).
@@ -701,7 +710,8 @@ check-clean: gcov-clean
subversion/tests/libsvn_diff/T1 \
subversion/tests/libsvn_diff/T2 \
subversion/tests/libsvn_diff/T3 \
- subversion/tests/svnserveautocheck.pid \
+ subversion/tests/cmdline/httpd-* \
+ subversion/tests/cmdline/svnserve-* \
tests.log fails.log
mkdir-init:
Modified: subversion/branches/swig-py3/NOTICE
URL:
http://svn.apache.org/viewvc/subversion/branches/swig-py3/NOTICE?rev=1862754&r1=1862753&r2=1862754&view=diff
==============================================================================
--- subversion/branches/swig-py3/NOTICE (original)
+++ subversion/branches/swig-py3/NOTICE Mon Jul 8 15:19:03 2019
@@ -1,5 +1,5 @@
Apache Subversion
-Copyright 2018 The Apache Software Foundation
+Copyright 2019 The Apache Software Foundation
This product includes software developed by many people, and distributed
under Contributor License Agreements to The Apache Software Foundation
@@ -29,3 +29,6 @@ license, see LICENSE.
This product includes code derived from the software developed by Yann Collet
under a BSD 2-Clause license, see LICENSE.
+
+This product includes code derived from the software developed by Thomas
+Porschberg and Peter Adolphs under a permissive license, see LICENSE.
Modified: subversion/branches/swig-py3/aclocal.m4
URL:
http://svn.apache.org/viewvc/subversion/branches/swig-py3/aclocal.m4?rev=1862754&r1=1862753&r2=1862754&view=diff
==============================================================================
--- subversion/branches/swig-py3/aclocal.m4 (original)
+++ subversion/branches/swig-py3/aclocal.m4 Mon Jul 8 15:19:03 2019
@@ -35,6 +35,8 @@ sinclude(build/ac-macros/apache.m4)
sinclude(build/ac-macros/apr.m4)
sinclude(build/ac-macros/aprutil.m4)
sinclude(build/ac-macros/apr_memcache.m4)
+sinclude(build/ac-macros/ax_boost_base.m4)
+sinclude(build/ac-macros/ax_boost_unit_test_framework.m4)
sinclude(build/ac-macros/berkeley-db.m4)
sinclude(build/ac-macros/compiler.m4)
sinclude(build/ac-macros/ctypesgen.m4)
Modified: subversion/branches/swig-py3/build.conf
URL:
http://svn.apache.org/viewvc/subversion/branches/swig-py3/build.conf?rev=1862754&r1=1862753&r2=1862754&view=diff
==============================================================================
--- subversion/branches/swig-py3/build.conf (original)
+++ subversion/branches/swig-py3/build.conf Mon Jul 8 15:19:03 2019
@@ -38,11 +38,14 @@ private-includes =
subversion/include/private/*.h
subversion/bindings/swig/include/*.swg
subversion/libsvn_delta/compose_delta.c
- subversion/bindings/cxxhl/include/*.hpp
- subversion/bindings/cxxhl/include/svncxxhl/*.hpp
- subversion/bindings/cxxhl/src/*.hpp
- subversion/bindings/cxxhl/src/aprwrap/*.hpp
- subversion/bindings/cxxhl/src/private/*.hpp
+ subversion/bindings/cxx/include/*.hpp
+ subversion/bindings/cxx/include/svnxx/*.hpp
+ subversion/bindings/cxx/include/svnxx/client/*.hpp
+ subversion/bindings/cxx/include/svnxx/detail/*.hpp
+ subversion/bindings/cxx/src/*.hpp
+ subversion/bindings/cxx/src/aprwrap/*.hpp
+ subversion/bindings/cxx/src/private/*.hpp
+ subversion/bindings/cxx/tests/*.hpp
subversion/bindings/javahl/native/*.hpp
subversion/bindings/javahl/native/jniwrapper/jni_*.hpp
tools/dev/svnmover/linenoise/linenoise.h
@@ -393,7 +396,7 @@ msvc-export =
private\svn_string_private.h private\svn_magic.h
private\svn_subr_private.h private\svn_mutex.h
private\svn_packed_data.h private\svn_object_pool.h private\svn_cert.h
- private\svn_config_private.h
+ private\svn_config_private.h private\svn_dirent_uri_private.h
# Working copy management lib
[libsvn_wc]
@@ -439,7 +442,7 @@ description = Subversion FSFS Repository
type = exe
path = subversion/svnfsfs
install = bin
-libs = libsvn_repos libsvn_fs libsvn_fs_fs libsvn_delta libsvn_subr apriconv
apr
+libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr apriconv apr
# ----------------------------------------------------------------------------
#
@@ -724,48 +727,34 @@ link-cmd = $(LINK_JAVAHL_CXX)
# ----------------------------------------------------------------------------
#
-# C++HL targets
+# SVN++ targets
#
-[libsvncxxhl]
-description = Subversion C++ HighLevel bindings
+[libsvnxx]
+description = Subversion C++ bindings
+when = SVN_BUILD_SVNXX
type = lib
-path = subversion/bindings/cxxhl
+path = subversion/bindings/cxx
libs = libsvn_repos libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_diff
libsvn_subr libsvn_fs aprutil apriconv apr
sources = src/*.cpp src/aprwrap/*.cpp
-install = cxxhl-lib
+install = svnxx-lib
msvc-static = yes
-compile-cmd = $(COMPILE_CXXHL_CXX)
+compile-cmd = $(COMPILE_SVNXX)
link-cmd = $(LINK_CXX_LIB)
-[cxxhl-tests]
-description = Unit tests for Subversion C++ HighLevel bindings
-when = SVN_USE_GOOGLEMOCK
-type = exe
-path = subversion/bindings/cxxhl
-libs = libsvncxxhl libgooglemock libsvn_subr apr
+[svnxx-tests]
+description = Unit tests for Subversion C++ bindings
+when = SVN_BUILD_SVNXX_TESTS
+type = exe
+path = subversion/bindings/cxx
+libs = libsvnxx
+ libsvn_repos libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_diff
+ libsvn_subr libsvn_fs aprutil apriconv apr
sources = tests/*.cpp
-install = cxxhl-tests
-compile-cmd = $(COMPILE_CXXHL_GOOGLEMOCK_CXX)
-link-cmd = $(LINK_CXX)
-
-
-# ----------------------------------------------------------------------------
-#
-# Googlemock targets
-#
-
-[libgooglemock]
-description = Googlemock Library
-when = SVN_USE_GOOGLEMOCK
-type = lib
-path = googlemock
-sources = googletest/src/gtest-all.cc googlemock/src/gmock-all.cc
-install = cxxhl-tests
-msvc-static = yes
-compile-cmd = $(COMPILE_GOOGLEMOCK_CXX)
-link-cmd = $(LINK_CXX_LIB)
+install = svnxx-tests
+compile-cmd = $(COMPILE_SVNXX_TEST)
+link-cmd = $(LINK_SVNXX_TEST)
# ----------------------------------------------------------------------------
#
@@ -842,7 +831,7 @@ 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
+libs = libsvn_test libsvn_fs libsvn_delta
libsvn_repos libsvn_subr apriconv apr
msvc-force-static = yes
Modified: subversion/branches/swig-py3/build/ac-macros/compiler.m4
URL:
http://svn.apache.org/viewvc/subversion/branches/swig-py3/build/ac-macros/compiler.m4?rev=1862754&r1=1862753&r2=1862754&view=diff
==============================================================================
--- subversion/branches/swig-py3/build/ac-macros/compiler.m4 (original)
+++ subversion/branches/swig-py3/build/ac-macros/compiler.m4 Mon Jul 8
15:19:03 2019
@@ -102,7 +102,7 @@ AC_DEFUN([SVN_CXX_MODE_SETUP],
if test "$GXX" = "yes"; then
dnl Find flags to force C++98 mode
dnl g++ and clang++
- SVN_CXXFLAGS_ADD_IFELSE([-std=c++98])
+ SVN_CXXFLAGS_ADD_IFELSE([-std=c++11])
fi
CXXMODEFLAGS="$CXXFLAGS"
@@ -126,18 +126,3 @@ AC_DEFUN([SVN_CXX_MODE_SETUP],
SVN_CXXFLAGS_ADD_IFELSE([-Werror=unknown-warning-option])
fi
])
-
-dnl The KWallet provider needs to use C++11 mode when using KDE 5
-AC_DEFUN([SVN_CXX_MODE_SETUP11],
-[
- CXXFLAGS_KEEP="$CXXFLAGS"
- CXXFLAGS=""
-
- if test "$GXX" = "yes"; then
- SVN_CXXFLAGS_ADD_IFELSE([-std=c++11])
- fi
-
- CXXMODEFLAGS="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS_KEEP"
- AC_SUBST(CXXMODEFLAGS)
-])
Modified: subversion/branches/swig-py3/build/ac-macros/kwallet.m4
URL:
http://svn.apache.org/viewvc/subversion/branches/swig-py3/build/ac-macros/kwallet.m4?rev=1862754&r1=1862753&r2=1862754&view=diff
==============================================================================
--- subversion/branches/swig-py3/build/ac-macros/kwallet.m4 (original)
+++ subversion/branches/swig-py3/build/ac-macros/kwallet.m4 Mon Jul 8 15:19:03
2019
@@ -83,10 +83,6 @@ AC_DEFUN(SVN_LIB_KWALLET,
fi
fi
if test -n "$KDE_CONFIG"; then
- if test $kde_config_name = "kf5-config"; then
- dnl KF5 does not compile with -std=c++98
- SVN_CXX_MODE_SETUP11
- fi
old_CXXFLAGS="$CXXFLAGS"
old_LDFLAGS="$LDFLAGS"
old_LIBS="$LIBS"
Modified: subversion/branches/swig-py3/build/ac-macros/swig.m4
URL:
http://svn.apache.org/viewvc/subversion/branches/swig-py3/build/ac-macros/swig.m4?rev=1862754&r1=1862753&r2=1862754&view=diff
==============================================================================
--- subversion/branches/swig-py3/build/ac-macros/swig.m4 (original)
+++ subversion/branches/swig-py3/build/ac-macros/swig.m4 Mon Jul 8 15:19:03
2019
@@ -163,41 +163,6 @@ AC_DEFUN(SVN_FIND_SWIG,
SWIG_PY_OPTS="-python -classic"
fi
- dnl Sun Forte adds an extra space before substituting APR_INT64_T_FMT
- dnl gcc-2.95 adds an extra space after substituting APR_INT64_T_FMT
- dnl thus the egrep patterns have a + in them.
- SVN_PYCFMT_SAVE_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $SVN_APR_INCLUDES"
- AC_CACHE_CHECK([for apr_int64_t Python/C API format string],
- [svn_cv_pycfmt_apr_int64_t], [
- if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then
- AC_EGREP_CPP([MaTcHtHiS +\"lld\" +EnDeNd],
- [#include <apr.h>
- MaTcHtHiS APR_INT64_T_FMT EnDeNd],
- [svn_cv_pycfmt_apr_int64_t="L"])
- fi
- if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then
- AC_EGREP_CPP([MaTcHtHiS +\"ld\" +EnDeNd],r
- [#include <apr.h>
- MaTcHtHiS APR_INT64_T_FMT EnDeNd],
- [svn_cv_pycfmt_apr_int64_t="l"])
- fi
- if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then
- AC_EGREP_CPP([MaTcHtHiS +\"d\" +EnDeNd],
- [#include <apr.h>
- MaTcHtHiS APR_INT64_T_FMT EnDeNd],
- [svn_cv_pycfmt_apr_int64_t="i"])
- fi
- ])
- CPPFLAGS="$SVN_PYCFMT_SAVE_CPPFLAGS"
- if test "x$svn_cv_pycfmt_apr_int64_t" = "x"; then
- AC_MSG_ERROR([failed to recognize APR_INT64_T_FMT on this
platform])
- fi
- AC_DEFINE_UNQUOTED([SVN_APR_INT64_T_PYCFMT],
- ["$svn_cv_pycfmt_apr_int64_t"],
- [Define to the Python/C API format character
suitable]
- [ for apr_int64_t])
-
dnl SWIG Python bindings successfully configured, clear the error
message
SWIG_PY_ERRMSG=""
fi
Modified: subversion/branches/swig-py3/build/generator/gen_make.py
URL:
http://svn.apache.org/viewvc/subversion/branches/swig-py3/build/generator/gen_make.py?rev=1862754&r1=1862753&r2=1862754&view=diff
==============================================================================
--- subversion/branches/swig-py3/build/generator/gen_make.py (original)
+++ subversion/branches/swig-py3/build/generator/gen_make.py Mon Jul 8
15:19:03 2019
@@ -447,7 +447,7 @@ class Generator(gen_base.GeneratorBase):
### we should turn AREA into an object, then test it instead of this
if area[:5] == 'swig-' and area[-4:] != '-lib' \
or area[:7] == 'javahl-' \
- or area[:6] == 'cxxhl-' \
+ or area[:6] == 'svnxx-' \
or area == 'tools':
ezt_area.extra_install = 'yes'
Modified: subversion/branches/swig-py3/build/generator/gen_vcnet_vcproj.py
URL:
http://svn.apache.org/viewvc/subversion/branches/swig-py3/build/generator/gen_vcnet_vcproj.py?rev=1862754&r1=1862753&r2=1862754&view=diff
==============================================================================
--- subversion/branches/swig-py3/build/generator/gen_vcnet_vcproj.py (original)
+++ subversion/branches/swig-py3/build/generator/gen_vcnet_vcproj.py Mon Jul 8
15:19:03 2019
@@ -286,3 +286,11 @@ class Generator(gen_win.WinGeneratorBase
}
self.write_with_template('subversion_vcnet.sln',
'templates/vcnet_sln.ezt', data)
+
+ def quote_define(self, value):
+ "Properly quote special characters in a define (if needed)"
+
+ if self.vcproj_extension == '.vcproj':
+ return value.replace('"', '""')
+ else:
+ return value
Modified: subversion/branches/swig-py3/build/generator/gen_win.py
URL:
http://svn.apache.org/viewvc/subversion/branches/swig-py3/build/generator/gen_win.py?rev=1862754&r1=1862753&r2=1862754&view=diff
==============================================================================
--- subversion/branches/swig-py3/build/generator/gen_win.py (original)
+++ subversion/branches/swig-py3/build/generator/gen_win.py Mon Jul 8 15:19:03
2019
@@ -743,9 +743,13 @@ class WinGeneratorBase(gen_win_dependenc
if target.name.endswith('svn_subr'):
fakedefines.append("SVN_USE_WIN32_CRASHHANDLER")
-
fakedefines.append('SVN_WIN32_CRASHREPORT_EMAIL="[email protected]"')
+
fakedefines.append(self.quote_define('SVN_WIN32_CRASHREPORT_EMAIL="[email protected]"'))
return fakedefines
+
+ def quote_define(self, value):
+ "Properly quote special characters in a define (if needed)"
+ return value
def get_win_includes(self, target, cfg='Release'):
"Return the list of include directories for target"
@@ -790,8 +794,8 @@ class WinGeneratorBase(gen_win_dependenc
fakeincludes.append(os.path.join(self.swig_libdir, lang_subdir))
fakeincludes.append(self.swig_libdir)
- if 'cxxhl' in target.name:
- fakeincludes.append("subversion/bindings/cxxhl/include")
+ if 'svnxx' in target.name:
+ fakeincludes.append("subversion/bindings/cxx/include")
return gen_base.unique(map(self.apath, fakeincludes))
Modified: subversion/branches/swig-py3/build/generator/gen_win_dependencies.py
URL:
http://svn.apache.org/viewvc/subversion/branches/swig-py3/build/generator/gen_win_dependencies.py?rev=1862754&r1=1862753&r2=1862754&view=diff
==============================================================================
--- subversion/branches/swig-py3/build/generator/gen_win_dependencies.py
(original)
+++ subversion/branches/swig-py3/build/generator/gen_win_dependencies.py Mon
Jul 8 15:19:03 2019
@@ -275,6 +275,11 @@ class GenDependenciesBase(gen_base.Gener
self.sln_version = '12.00'
self.vcproj_version = '14.1'
self.vcproj_extension = '.vcxproj'
+ elif val == '2019' or val == '16':
+ self.vs_version = '2019'
+ self.sln_version = '12.00'
+ self.vcproj_version = '14.2'
+ self.vcproj_extension = '.vcxproj'
elif re.match('^20\d+$', val):
print('WARNING: Unknown VS.NET version "%s",'
' assuming VS2012. Your VS can probably upgrade')
Modified: subversion/branches/swig-py3/configure.ac
URL:
http://svn.apache.org/viewvc/subversion/branches/swig-py3/configure.ac?rev=1862754&r1=1862753&r2=1862754&view=diff
==============================================================================
--- subversion/branches/swig-py3/configure.ac (original)
+++ subversion/branches/swig-py3/configure.ac Mon Jul 8 15:19:03 2019
@@ -640,29 +640,6 @@ AC_SUBST(SVN_GNOME_KEYRING_LIBS)
dnl LibSecret -------------------
SVN_LIB_SECRET
-dnl Googlemock -----------------
-AC_ARG_ENABLE([googlemock],
- AS_HELP_STRING([--disable-googlemock],
- [Do not use the Googlemock testing framework]),
- [],
- [enable_googlemock=yes])
-
-AC_SUBST([GOOGLEMOCK_SRCDIR], [$abs_srcdir/googlemock])
-AC_MSG_CHECKING([whether use Googlemock])
-if test "$enable_googlemock" != "no"; then
- if test -d "$GOOGLEMOCK_SRCDIR"; then
- AC_MSG_RESULT([yes])
- SVN_USE_GOOGLEMOCK=true
- else
- AC_MSG_RESULT([no])
- SVN_USE_GOOGLEMOCK=false
- fi
-else
- AC_MSG_RESULT([no])
- SVN_USE_GOOGLEMOCK=false
-fi
-AC_SUBST([SVN_USE_GOOGLEMOCK])
-
dnl Ev2 experimental features ----------------------
dnl Note: The Ev2 implementations will be built unconditionally, but by
dnl providing this flag, users can choose to use the currently-shimmed Ev2
@@ -1157,7 +1134,6 @@ if test "$enable_optimization" = "yes";
SVN_CFLAGS_ADD_IFELSE([-O1],[],[
SVN_CFLAGS_ADD_IFELSE([-O])])])])
SVN_CFLAGS_ADD_IFELSE([-Wno-clobbered])
- SVN_CFLAGS_ADD_IFELSE([-flto])
fi
fi
if test -z ["`echo $CXXUSERFLAGS' ' | $EGREP -- '-O[^ ]* '`"]; then
@@ -1173,7 +1149,6 @@ if test "$enable_optimization" = "yes";
SVN_CXXFLAGS_ADD_IFELSE([-O1],[],[
SVN_CXXFLAGS_ADD_IFELSE([-O])])])])
SVN_CXXFLAGS_ADD_IFELSE([-Wno-clobbered])
- SVN_CXXFLAGS_ADD_IFELSE([-flto])
fi
fi
elif test "$enable_optimization" = "no"; then
@@ -1187,9 +1162,11 @@ fi
dnl Dump the current compiler options
AC_MSG_NOTICE([C compiler flags: $CFLAGS])
+AC_MSG_NOTICE([ language-level: $CMODEFLAGS])
AC_MSG_NOTICE([ user-defined: $CUSERFLAGS])
AC_MSG_NOTICE([ maintainer-mode: $CMAINTAINERFLAGS])
AC_MSG_NOTICE([C++ compiler flags: $CXXFLAGS])
+AC_MSG_NOTICE([ language-level: $CXXMODEFLAGS])
AC_MSG_NOTICE([ user-defined: $CXXUSERFLAGS])
AC_MSG_NOTICE([ maintainer-mode: $CXXMAINTAINERFLAGS])
@@ -1458,6 +1435,69 @@ AC_SUBST(SVN_FS_LIB_DEPS)
AC_SUBST(SVN_FS_LIB_INSTALL_DEPS)
AC_SUBST(SVN_FS_LIB_LINK)
+# ==== SVN++ =================================================================
+
+dnl Possibly compile SVN++
+do_svnxx_build=no
+AC_ARG_ENABLE(svnxx,
+ AS_HELP_STRING([--enable-svnxx],
+ [Enable compilation of the C++ bindings (requires C++)]),
+ [ if test "$enableval" = "yes" ; then
+ AC_MSG_NOTICE([Enabling the C++ bindings])
+ do_svnxx_build=yes
+ fi
+ ])
+
+dnl Possibly compile SVN++ tests
+do_svnxx_test_build=no
+AC_ARG_ENABLE(svnxx-tests,
+ AS_HELP_STRING([--enable-svnxx-tests],
+ [Enable compilation of tests for the C++ bindings
+ (implies --enable-svnxx, requires Boost and Boost.Test)]),
+ [ if test "$enableval" = "yes" ; then
+ AC_MSG_NOTICE([Enabling tests for the C++ bindings])
+ do_svnxx_test_build=yes
+ fi
+ ])
+
+AX_BOOST_BASE([1.58],
+ [
+ if test "$do_svnxx_test_build" = "yes"; then
+ AX_BOOST_UNIT_TEST_FRAMEWORK
+ fi
+ ],
+ [
+ if test "$do_svnxx_test_build" = "yes"; then
+ AC_MSG_WARN([Tests for the C++ bindings require Boost and Boost.Test])
+ do_svnxx_test_build=no
+ fi
+ ])
+
+if test "$do_svnxx_test_build" = "yes"; then
+ if test "$want_boost" != "yes"; then
+ AC_MSG_WARN([Tests for the C++ bindings require Boost and Boost.Test])
+ do_svnxx_test_build=no
+ SVN_BUILD_SVNXX_TESTS=false
+ else
+ if test "$do_svnxx_build" != "yes"; then
+ AC_MSG_WARN([Enabling the C++ bindings because their tests are
enabled])
+ do_svnxx_build=yes
+ fi
+ SVN_BUILD_SVNXX_TESTS=true
+ fi
+else
+ SVN_BUILD_SVNXX_TESTS=false
+fi
+
+if test "$do_svnxx_build" = "yes"; then
+ SVN_BUILD_SVNXX=true
+else
+ SVN_BUILD_SVNXX=false
+fi
+
+AC_SUBST(SVN_BUILD_SVNXX)
+AC_SUBST(SVN_BUILD_SVNXX_TESTS)
+
# ==== JavaHL ================================================================
dnl Possibly compile JavaHL
Modified: subversion/branches/swig-py3/doc/doxygen.conf
URL:
http://svn.apache.org/viewvc/subversion/branches/swig-py3/doc/doxygen.conf?rev=1862754&r1=1862753&r2=1862754&view=diff
==============================================================================
--- subversion/branches/swig-py3/doc/doxygen.conf (original)
+++ subversion/branches/swig-py3/doc/doxygen.conf Mon Jul 8 15:19:03 2019
@@ -112,7 +112,7 @@ INLINE_INHERITED_MEMB = NO
# path before files name in the file list and in the header files. If set
# to NO the shortest path that makes the file name unique will be used.
-FULL_PATH_NAMES = NO
+FULL_PATH_NAMES = YES
# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
# can be used to strip a user-defined part of the path. Stripping is
@@ -121,7 +121,7 @@ FULL_PATH_NAMES = NO
# If left blank the directory from which doxygen is run is used as the
# path to strip.
-STRIP_FROM_PATH =
+STRIP_FROM_PATH = subversion/include subversion/bindings/cxx/include
# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
# the path mentioned in the documentation of a class, which tells
@@ -130,7 +130,7 @@ STRIP_FROM_PATH =
# definition is used. Otherwise one should specify the include paths that
# are normally passed to the compiler using the -I flag.
-STRIP_FROM_INC_PATH =
+STRIP_FROM_INC_PATH = subversion/include subversion/bindings/cxx/include
# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
# (but less readable) file names. This can be useful is your file systems
@@ -280,22 +280,6 @@ SUBGROUPING = YES
TYPEDEF_HIDES_STRUCT = NO
-# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
-# determine which symbols to keep in memory and which to flush to disk.
-# When the cache is full, less often used symbols will be written to disk.
-# For small to medium size projects (<1000 input files) the default value is
-# probably good enough. For larger projects a too small cache size can cause
-# doxygen to be busy swapping symbols to and from disk most of the time
-# causing a significant performance penality.
-# If the system has enough physical memory increasing the cache will improve
the
-# performance by keeping more symbols in memory. Note that the value works on
-# a logarithmic scale so increasing the size by one will rougly double the
-# memory usage. The cache size is given by this formula:
-# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
-# corresponding to a cache size of 2^16 = 65536 symbols
-
-SYMBOL_CACHE_SIZE = 0
-
#---------------------------------------------------------------------------
# Build related configuration options
#---------------------------------------------------------------------------
@@ -478,12 +462,6 @@ MAX_INITIALIZER_LINES = 30
SHOW_USED_FILES = YES
-# If the sources in your project are distributed over multiple directories
-# then setting the SHOW_DIRECTORIES tag to YES will show the directory
hierarchy
-# in the documentation. The default is NO.
-
-SHOW_DIRECTORIES = NO
-
# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
# This will remove the Files entry from the Quick Index and from the
# Folder Tree View (if specified). The default is YES.
@@ -577,6 +555,10 @@ WARN_LOGFILE =
# with spaces.
INPUT = subversion/include \
+ subversion/bindings/cxx/include \
+ subversion/bindings/cxx/include/svnxx \
+ subversion/bindings/cxx/include/svnxx/client \
+ subversion/bindings/cxx/include/svnxx/detail \
subversion/include/private/svn_doxygen.h
# This tag can be used to specify the character encoding of the source files
@@ -594,7 +576,7 @@ INPUT_ENCODING = UTF-8
# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx
# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
-FILE_PATTERNS = *.h
+FILE_PATTERNS = *.h *.hpp
# The RECURSIVE tag can be used to turn specify whether or not subdirectories
# should be searched for input files as well. Possible values are YES and NO.
@@ -805,12 +787,6 @@ HTML_FOOTER =
HTML_STYLESHEET =
-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
-# files or namespaces will be aligned in HTML using tables. If set to
-# NO a bullet list will be used.
-
-HTML_ALIGN_MEMBERS = YES
-
# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
# documentation will contain sections that can be hidden and shown after the
# page has loaded. For this to work a browser that supports
@@ -959,11 +935,6 @@ ENUM_VALUES_PER_LINE = 1
GENERATE_TREEVIEW = NO
-# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories,
-# and Class Hierarchy pages using a tree view instead of an ordered list.
-
-USE_INLINE_TREES = NO
-
# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
# used to set the initial width (in pixels) of the frame in which the tree
# is shown.
@@ -1151,18 +1122,6 @@ GENERATE_XML = NO
XML_OUTPUT = xml
-# The XML_SCHEMA tag can be used to specify an XML schema,
-# which can be used by a validating XML parser to check the
-# syntax of the XML files.
-
-XML_SCHEMA =
-
-# The XML_DTD tag can be used to specify an XML DTD,
-# which can be used by a validating XML parser to check the
-# syntax of the XML files.
-
-XML_DTD =
-
# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
# dump the program listings (including syntax highlighting
# and cross-referencing information) to the XML output. Note that
@@ -1378,7 +1337,7 @@ HAVE_DOT = NO
# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory
# containing the font.
-DOT_FONTNAME = FreeSans
+DOT_FONTNAME =
# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
# The default size is 10pt.
Modified: subversion/branches/swig-py3/gen-make.py
URL:
http://svn.apache.org/viewvc/subversion/branches/swig-py3/gen-make.py?rev=1862754&r1=1862753&r2=1862754&view=diff
==============================================================================
--- subversion/branches/swig-py3/gen-make.py (original)
+++ subversion/branches/swig-py3/gen-make.py Mon Jul 8 15:19:03 2019
@@ -216,8 +216,6 @@ def _usage_exit(err=None):
print("")
print(" --with-apr_memcache=DIR")
print(" the apr_memcache sources are in DIR")
- print(" --disable-gmock")
- print(" do not use Googlemock")
sys.exit(1)
@@ -266,7 +264,6 @@ if __name__ == '__main__':
'disable-shared',
'installed-libs=',
'vsnet-version=',
- 'disable-gmock',
])
if len(args) > 1:
_usage_exit("Too many arguments")
Modified: subversion/branches/swig-py3/get-deps.sh
URL:
http://svn.apache.org/viewvc/subversion/branches/swig-py3/get-deps.sh?rev=1862754&r1=1862753&r2=1862754&view=diff
==============================================================================
--- subversion/branches/swig-py3/get-deps.sh (original)
+++ subversion/branches/swig-py3/get-deps.sh Mon Jul 8 15:19:03 2019
@@ -38,8 +38,6 @@ ZLIB_VERSION=${ZLIB_VERSION:-"1.2.8"}
SQLITE_VERSION=${SQLITE_VERSION:-"3.8.11.1"}
# Used to construct the SQLite download URL.
SQLITE_VERSION_REL_YEAR=2015
-GTEST_VERSION=${GMOCK_VERSION:-"1.7.0"}
-GMOCK_VERSION=${GMOCK_VERSION:-"1.7.0"}
HTTPD_VERSION=${HTTPD_VERSION:-"2.4.10"}
APR_ICONV_VERSION=${APR_ICONV_VERSION:-"1.2.1"}
@@ -49,10 +47,6 @@ SERF=serf-${SERF_VERSION}
ZLIB=zlib-${ZLIB_VERSION}
SQLITE_VERSION_LIST=`echo $SQLITE_VERSION | sed -e 's/\./ /g'`
SQLITE=sqlite-amalgamation-`printf %d%02d%02d%02d $SQLITE_VERSION_LIST`
-GTEST=release-${GTEST_VERSION}
-GTEST_URL=https://github.com/google/googletest/archive
-GMOCK=release-${GMOCK_VERSION}
-GMOCK_URL=https://github.com/google/googlemock/archive
HTTPD=httpd-${HTTPD_VERSION}
APR_ICONV=apr-iconv-${APR_ICONV_VERSION}
@@ -67,12 +61,12 @@ HTTP_FETCH=
# Need this uncommented if any of the specific versions of the ASF tarballs to
# be downloaded are no longer available on the general mirrors.
-APACHE_MIRROR=http://archive.apache.org/dist
+APACHE_MIRROR=https://archive.apache.org/dist
# helpers
usage() {
echo "Usage: $0"
- echo "Usage: $0 [ apr | serf | zlib | sqlite | googlemock ] ..."
+ echo "Usage: $0 [ apr | serf | zlib | sqlite ] ..."
exit $1
}
@@ -106,7 +100,7 @@ get_zlib() {
test -d $BASEDIR/zlib && return
cd $TEMPDIR
- $HTTP_FETCH
http://sourceforge.net/projects/libpng/files/zlib/$ZLIB_VERSION/$ZLIB.tar.gz
+ $HTTP_FETCH
https://sourceforge.net/projects/libpng/files/zlib/$ZLIB_VERSION/$ZLIB.tar.gz
cd $BASEDIR
gzip -dc $TEMPDIR/$ZLIB.tar.gz | tar -xf -
@@ -127,29 +121,11 @@ get_sqlite() {
}
-get_googlemock() {
- test -d $BASEDIR/googlemock && return
-
- cd $TEMPDIR
- $HTTP_FETCH ${GTEST_URL}/${GTEST}.zip
- unzip -q ${GTEST}.zip
- rm -f ${GTEST}.zip
-
- $HTTP_FETCH ${GMOCK_URL}/${GMOCK}.zip
- unzip -q ${GMOCK}.zip
- rm -f ${GMOCK}.zip
-
- cd $BASEDIR
- mkdir googlemock
- mv $TEMPDIR/googletest-release-${GTEST_VERSION} googlemock/googletest
- mv $TEMPDIR/googlemock-release-${GMOCK_VERSION} googlemock/googlemock
-}
-
# main()
get_deps() {
mkdir -p $TEMPDIR
- for i in zlib serf sqlite-amalgamation apr apr-util gmock-fused; do
+ for i in zlib serf sqlite-amalgamation apr apr-util; do
if [ -d $i ]; then
echo "Local directory '$i' already exists; the downloaded copy won't
be used" >&2
fi
Modified: subversion/branches/swig-py3/notes/knobs
URL:
http://svn.apache.org/viewvc/subversion/branches/swig-py3/notes/knobs?rev=1862754&r1=1862753&r2=1862754&view=diff
==============================================================================
--- subversion/branches/swig-py3/notes/knobs (original)
+++ subversion/branches/swig-py3/notes/knobs Mon Jul 8 15:19:03 2019
@@ -56,6 +56,7 @@ SVN_SQLITE_MIN_VERSION
SVN_SERF_NO_LOGGING
SVN_ALLOW_SHORT_INTS
SVN_ALLOW_NON_8_BIT_CHARS
+SVNXX_USE_BOOST
2.3 Debugging Support
@@ -75,6 +76,7 @@ SVN_FS__TRAIL_DEBUG
SVN_FS_FS__LOG_ACCESS
SVN_FS_EMULATE_PATHS_CHANGED
SVN_FS_EMULATE_REPORT_CHANGES
+SVNXX_POOL_DEBUG
2.4 Test-only
@@ -304,6 +306,15 @@ SVN_I_LIKE_LATENCY_SO_IGNORE_HTTPV2
Default: not defined
Suggested: not defined (to ensure correct behaviour)
+4.13 SVNXX_USE_BOOST
+ Scope: SVN++ (subversion/bindings/cxx)
+ Purpose: Adds header-only conversions and overloads to make SVN++
+ interoperate cleanly with selected Boost types. Defining this
+ symbol does *not* affect the SVN++ ABI. Users may define the
+ symbol when using SVN++ after libsvnxx has been built.
+ Range: definedness
+ Default: not defined
+ Suggested: defined for testing SVN++, otherwise not defined
5 Defines controlling debug support
==================================
@@ -458,6 +469,14 @@ SVN_I_LIKE_LATENCY_SO_IGNORE_HTTPV2
Default: TRUE (local default if macro has not been defined)
Suggested: FALSE
+5.17 SVNXX_POOL_DEBUG
+
+ Scope: SVN++ (subversion/bindings/cxx)
+ Purpose: Logs debugging info about the lifetime of the SVN++ global pool.
+ Depends on SVN_DEBUG being defined.
+ Range: definedness
+ Default: not defined
+ Suggested: defined, not defined
6 Defines that affect unit tests
================================
Modified: subversion/branches/swig-py3/notes/shelving/shelf-structure.txt
URL:
http://svn.apache.org/viewvc/subversion/branches/swig-py3/notes/shelving/shelf-structure.txt?rev=1862754&r1=1862753&r2=1862754&view=diff
==============================================================================
--- subversion/branches/swig-py3/notes/shelving/shelf-structure.txt (original)
+++ subversion/branches/swig-py3/notes/shelving/shelf-structure.txt Mon Jul 8
15:19:03 2019
@@ -1,28 +1,54 @@
== Storage Structure for Shelving ==
-=== Shelving (trunk) ===
+=== Shelving v3 (trunk) ===
-In development in trunk (1.11-dev), marked "experimental".
+In development in trunk (1.12-dev), marked "experimental".
+
+Each shelf-version is stored in an entire copy of the WC. The shelves are
+stored in a sibling to the user's WC, at '<WC-root-dir>.shelves'. Inside it:
+
+* .../<encoded-name>.current
+ Holds an ASCII-decimal number stating the latest shelf-version of the
+ shelf <encoded-name>, followed by a newline character (LF).
+
+* .../<encoded-name>.log
+ Holds the 'revision' properties of the shelf, in svn_hash_write2() format
+ terminated with "PROPS-END". Created when any revprop is set; need not
+ exist.
+
+* .../<encoded-name>-<version>.wc
+ Directory holding a shelf-version as a real WC.
+
+
+=== Shelving v2 ===
+
+Released in Subversion 1.11.0, marked "experimental".
Each shelf has zero or more versions of the change, and exactly one set of
'revision' properties.
-* .svn/shelves
+* .svn/experimental/shelves/v2
This subdirectory holds all shelving metadata and data.
It is created on demand, and never deleted.
-* .svn/shelves/<encoded-name>.current
+* .svn/experimental/shelves/v2/<encoded-name>.current
Holds an ASCII-decimal number stating the latest shelf-version of the
- shelf <encoded-name>.
+ shelf <encoded-name>, followed by a newline character (LF).
-* .svn/shelves/<encoded-name>.log
+* .svn/experimental/shelves/v2/<encoded-name>.log
Holds the 'revision' properties of the shelf, in svn_hash_write2() format
terminated with "PROPS-END". Created when any revprop is set; need not
exist.
-* .svn/shelves/<encoded-name>-<version>.patch
- The patch file representing version <version>.
+* .svn/experimental/shelves/v2/<encoded-name>-<version>.d
+ Directory holding the metadata and {base,working}{text,props} files for a
+ shelf-version. For each shelved WC-relpath <P>:
+ - <P>.meta : metadata, serialized in a shelf-v2-specific format
+ - <P>.base : the base text (absent for a directory)
+ - <P>.work : the working text (absent for a directory)
+ - <P>.base-props : the base properties
+ - <P>.work-props : the working properties
<encoded-name>: the shelf name as UTF-8, encoded byte-by-byte into
two-hex-digit pairs, e.g. shelf name 'Az' is encoded as '417f'.
Modified:
subversion/branches/swig-py3/subversion/bindings/javahl/native/BlameCallback.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/swig-py3/subversion/bindings/javahl/native/BlameCallback.cpp?rev=1862754&r1=1862753&r2=1862754&view=diff
==============================================================================
---
subversion/branches/swig-py3/subversion/bindings/javahl/native/BlameCallback.cpp
(original)
+++
subversion/branches/swig-py3/subversion/bindings/javahl/native/BlameCallback.cpp
Mon Jul 8 15:19:03 2019
@@ -28,14 +28,20 @@
#include "CreateJ.h"
#include "JNIUtil.h"
#include "svn_time.h"
+
+#include "svn_private_config.h"
+
/**
* Create a BlameCallback object
* @param jcallback the Java callback object.
*/
-BlameCallback::BlameCallback(jobject jcallback)
-{
- m_callback = jcallback;
-}
+BlameCallback::BlameCallback(jobject jrangeCallback, jobject jlineCallback)
+ : m_start_revnum(SVN_INVALID_REVNUM),
+ m_end_revnum(SVN_INVALID_REVNUM),
+ m_range_callback_invoked(false),
+ m_range_callback(jrangeCallback),
+ m_line_callback(jlineCallback)
+{}
/**
* Destroy a BlameCallback object
*/
@@ -48,36 +54,84 @@ BlameCallback::~BlameCallback()
/* implements svn_client_blame_receiver3_t */
svn_error_t *
BlameCallback::callback(void *baton,
- svn_revnum_t start_revnum,
- svn_revnum_t end_revnum,
apr_int64_t line_no,
svn_revnum_t revision,
apr_hash_t *rev_props,
svn_revnum_t merged_revision,
apr_hash_t *merged_rev_props,
const char *merged_path,
- const char *line,
+ const svn_string_t *line,
svn_boolean_t local_change,
apr_pool_t *pool)
{
- if (baton)
- return static_cast<BlameCallback *>(baton)->singleLine(start_revnum,
- end_revnum, line_no, revision, rev_props, merged_revision,
- merged_rev_props, merged_path, line, local_change, pool);
+ BlameCallback *const self = static_cast<BlameCallback *>(baton);
+ svn_error_t *err = SVN_NO_ERROR;
- return SVN_NO_ERROR;
+ if (self)
+ {
+ if (self->m_range_callback && !self->m_range_callback_invoked)
+ {
+ self->m_range_callback_invoked = true;
+ err = self->setRange();
+ }
+
+ if (self->m_line_callback && err == SVN_NO_ERROR)
+ {
+ err = self->singleLine(
+ line_no, revision, rev_props, merged_revision,
+ merged_rev_props, merged_path, line, local_change, pool);
+ }
+ }
+
+ return err;
}
+svn_error_t *
+BlameCallback::setRange()
+{
+ if (m_start_revnum == SVN_INVALID_REVNUM
+ || m_end_revnum == SVN_INVALID_REVNUM)
+ return svn_error_create(SVN_ERR_CLIENT_BAD_REVISION, NULL,
+ _("Blame revision range was not resolved"));
+
+ JNIEnv *env = JNIUtil::getEnv();
+
+ // Create a local frame for our references
+ env->PushLocalFrame(LOCAL_FRAME_SIZE);
+ if (JNIUtil::isJavaExceptionThrown())
+ return SVN_NO_ERROR;
+
+ // The method id will not change during the time this library is
+ // loaded, so it can be cached.
+ static jmethodID mid = 0;
+ if (mid == 0)
+ {
+ jclass clazz =
env->FindClass(JAVAHL_CLASS("/callback/BlameRangeCallback"));
+ if (JNIUtil::isJavaExceptionThrown())
+ POP_AND_RETURN(SVN_NO_ERROR);
+
+ mid = env->GetMethodID(clazz, "setRange", "(JJ)V");
+ if (JNIUtil::isJavaExceptionThrown() || mid == 0)
+ POP_AND_RETURN(SVN_NO_ERROR);
+ }
+
+ // call the Java method
+ env->CallVoidMethod(m_range_callback, mid,
+ (jlong)m_start_revnum, (jlong)m_end_revnum);
+
+ POP_AND_RETURN_EXCEPTION_AS_SVNERROR();
+}
+
+
/**
* Callback called for a single line in the file, for which the blame
* information was requested. See the Java-doc for more information.
*/
svn_error_t *
-BlameCallback::singleLine(svn_revnum_t start_revnum, svn_revnum_t end_revnum,
- apr_int64_t line_no, svn_revnum_t revision,
+BlameCallback::singleLine(apr_int64_t line_no, svn_revnum_t revision,
apr_hash_t *revProps, svn_revnum_t mergedRevision,
apr_hash_t *mergedRevProps, const char *mergedPath,
- const char *line, svn_boolean_t localChange,
+ const svn_string_t *line, svn_boolean_t localChange,
apr_pool_t *pool)
{
JNIEnv *env = JNIUtil::getEnv();
@@ -92,13 +146,13 @@ BlameCallback::singleLine(svn_revnum_t s
static jmethodID mid = 0;
if (mid == 0)
{
- jclass clazz = env->FindClass(JAVAHL_CLASS("/callback/BlameCallback"));
+ jclass clazz =
env->FindClass(JAVAHL_CLASS("/callback/BlameLineCallback"));
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN(SVN_NO_ERROR);
mid = env->GetMethodID(clazz, "singleLine",
"(JJLjava/util/Map;JLjava/util/Map;"
- "Ljava/lang/String;Ljava/lang/String;Z)V");
+ "Ljava/lang/String;Z[B)V");
if (JNIUtil::isJavaExceptionThrown() || mid == 0)
POP_AND_RETURN(SVN_NO_ERROR);
}
@@ -120,14 +174,14 @@ BlameCallback::singleLine(svn_revnum_t s
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN(SVN_NO_ERROR);
- jstring jline = JNIUtil::makeJString(line);
+ jbyteArray jline = JNIUtil::makeJByteArray(line);
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN(SVN_NO_ERROR);
// call the Java method
- env->CallVoidMethod(m_callback, mid, (jlong)line_no, (jlong)revision,
+ env->CallVoidMethod(m_line_callback, mid, (jlong)line_no, (jlong)revision,
jrevProps, (jlong)mergedRevision, jmergedRevProps,
- jmergedPath, jline, (jboolean)localChange);
+ jmergedPath, (jboolean)localChange, jline);
POP_AND_RETURN_EXCEPTION_AS_SVNERROR();
}
Modified:
subversion/branches/swig-py3/subversion/bindings/javahl/native/BlameCallback.h
URL:
http://svn.apache.org/viewvc/subversion/branches/swig-py3/subversion/bindings/javahl/native/BlameCallback.h?rev=1862754&r1=1862753&r2=1862754&view=diff
==============================================================================
---
subversion/branches/swig-py3/subversion/bindings/javahl/native/BlameCallback.h
(original)
+++
subversion/branches/swig-py3/subversion/bindings/javahl/native/BlameCallback.h
Mon Jul 8 15:19:03 2019
@@ -37,40 +37,44 @@
class BlameCallback
{
public:
- BlameCallback(jobject jcallback);
+ BlameCallback(jobject jrangeCallback, jobject jlineCallback);
~BlameCallback();
static svn_error_t *callback(void *baton,
- svn_revnum_t start_revnum,
- svn_revnum_t end_revnum,
apr_int64_t line_no,
svn_revnum_t revision,
apr_hash_t *rev_props,
svn_revnum_t merged_revision,
apr_hash_t *merged_rev_props,
const char *merged_path,
- const char *line,
+ const svn_string_t *line,
svn_boolean_t local_change,
apr_pool_t *pool);
+ svn_revnum_t *get_start_revnum_p() { return &m_start_revnum; }
+ svn_revnum_t *get_end_revnum_p() { return &m_end_revnum; }
+
protected:
- svn_error_t *singleLine(svn_revnum_t start_revnum,
- svn_revnum_t end_revnum,
- apr_int64_t line_no,
+ svn_error_t *setRange();
+ svn_error_t *singleLine(apr_int64_t line_no,
svn_revnum_t revision,
apr_hash_t *rev_props,
svn_revnum_t merged_revision,
apr_hash_t *merged_rev_props,
const char *merged_path,
- const char *line,
+ const svn_string_t *line,
svn_boolean_t local_change,
apr_pool_t *pool);
private:
- /**
- * This a local reference to the Java object.
- */
- jobject m_callback;
+ // Arguments for svn_client_blame6
+ svn_revnum_t m_start_revnum;
+ svn_revnum_t m_end_revnum;
+ bool m_range_callback_invoked;
+
+ // These are local references to the Java objects.
+ jobject m_range_callback;
+ jobject m_line_callback;
};
#endif // BLAMECALLBACK_H
Modified:
subversion/branches/swig-py3/subversion/bindings/javahl/native/EditorProxy.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/swig-py3/subversion/bindings/javahl/native/EditorProxy.cpp?rev=1862754&r1=1862753&r2=1862754&view=diff
==============================================================================
---
subversion/branches/swig-py3/subversion/bindings/javahl/native/EditorProxy.cpp
(original)
+++
subversion/branches/swig-py3/subversion/bindings/javahl/native/EditorProxy.cpp
Mon Jul 8 15:19:03 2019
@@ -132,7 +132,7 @@ get_editor_method(jmethodID& mid, const
jobject wrap_input_stream(svn_stream_t* stream)
{
- std::auto_ptr<JavaHL::NativeInputStream>
+ JavaHL::cxx::owned_ptr<JavaHL::NativeInputStream>
wrapped(new JavaHL::NativeInputStream());
apr_pool_t* const wrapped_pool = wrapped->get_pool().getPool();
wrapped->set_stream(svn_stream_disown(stream, wrapped_pool));
Modified:
subversion/branches/swig-py3/subversion/bindings/javahl/native/EditorProxy.h
URL:
http://svn.apache.org/viewvc/subversion/branches/swig-py3/subversion/bindings/javahl/native/EditorProxy.h?rev=1862754&r1=1862753&r2=1862754&view=diff
==============================================================================
---
subversion/branches/swig-py3/subversion/bindings/javahl/native/EditorProxy.h
(original)
+++
subversion/branches/swig-py3/subversion/bindings/javahl/native/EditorProxy.h
Mon Jul 8 15:19:03 2019
@@ -33,6 +33,8 @@
#include "private/svn_editor.h"
#include "private/svn_delta_private.h"
+#include "CxxCompat.hpp"
+
/**
* These callbacks are needed by the delta-to-Ev2 shims.
*/
@@ -53,7 +55,7 @@ struct EditorProxyCallbacks
class EditorProxy
{
public:
- typedef std::auto_ptr<EditorProxy> UniquePtr;
+ typedef ::JavaHL::cxx::owned_ptr<EditorProxy> UniquePtr;
EditorProxy(jobject jeditor, apr_pool_t* edit_pool,
const char* repos_root_url, const char* base_relpath,
Modified:
subversion/branches/swig-py3/subversion/bindings/javahl/native/OperationContext.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/swig-py3/subversion/bindings/javahl/native/OperationContext.cpp?rev=1862754&r1=1862753&r2=1862754&view=diff
==============================================================================
---
subversion/branches/swig-py3/subversion/bindings/javahl/native/OperationContext.cpp
(original)
+++
subversion/branches/swig-py3/subversion/bindings/javahl/native/OperationContext.cpp
Mon Jul 8 15:19:03 2019
@@ -43,7 +43,7 @@
OperationContext::OperationContext(SVN::Pool &pool)
: m_config(NULL),
- m_prompter(NULL),
+ m_prompter(),
m_cancelOperation(0),
m_pool(&pool),
m_jctx(NULL),
@@ -253,7 +253,7 @@ OperationContext::password(const char *p
void
OperationContext::setPrompt(Prompter::UniquePtr prompter)
{
- m_prompter = prompter;
+ m_prompter = JavaHL::cxx::move(prompter);
}
void
@@ -311,7 +311,7 @@ Prompter::UniquePtr OperationContext::cl
{
if (m_prompter.get())
return m_prompter->clone();
- return Prompter::UniquePtr(NULL);
+ return Prompter::UniquePtr();
}
void OperationContext::setTunnelCallback(jobject jtunnelcb)
Modified:
subversion/branches/swig-py3/subversion/bindings/javahl/native/OperationContext.h
URL:
http://svn.apache.org/viewvc/subversion/branches/swig-py3/subversion/bindings/javahl/native/OperationContext.h?rev=1862754&r1=1862753&r2=1862754&view=diff
==============================================================================
---
subversion/branches/swig-py3/subversion/bindings/javahl/native/OperationContext.h
(original)
+++
subversion/branches/swig-py3/subversion/bindings/javahl/native/OperationContext.h
Mon Jul 8 15:19:03 2019
@@ -37,6 +37,7 @@
#include <jni.h>
#include "Pool.h"
#include "JNIStringHolder.h"
+#include "CxxCompat.hpp"
class Prompter;
@@ -52,7 +53,7 @@ class OperationContext
apr_hash_t * m_config;
- std::auto_ptr<Prompter> m_prompter;
+ JavaHL::cxx::owned_ptr<Prompter> m_prompter;
svn_atomic_t m_cancelOperation;
protected:
@@ -90,7 +91,7 @@ class OperationContext
virtual void username(const char *pi_username);
virtual void password(const char *pi_password);
- virtual void setPrompt(std::auto_ptr<Prompter> prompter);
+ virtual void setPrompt(JavaHL::cxx::owned_ptr<Prompter> prompter);
svn_auth_baton_t *getAuthBaton(SVN::Pool &in_pool);
void cancelOperation();
@@ -100,7 +101,7 @@ class OperationContext
const char *getConfigDirectory() const;
const char *getUsername() const;
const char *getPassword() const;
- std::auto_ptr<Prompter> clonePrompter() const;
+ JavaHL::cxx::owned_ptr<Prompter> clonePrompter() const;
/**
* Set the configuration directory, taking the usual steps to
Modified:
subversion/branches/swig-py3/subversion/bindings/javahl/native/Path.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/swig-py3/subversion/bindings/javahl/native/Path.cpp?rev=1862754&r1=1862753&r2=1862754&view=diff
==============================================================================
--- subversion/branches/swig-py3/subversion/bindings/javahl/native/Path.cpp
(original)
+++ subversion/branches/swig-py3/subversion/bindings/javahl/native/Path.cpp Mon
Jul 8 15:19:03 2019
@@ -28,11 +28,12 @@
#include "Path.h"
#include "svn_path.h"
#include "svn_dirent_uri.h"
+#include "private/svn_dirent_uri_private.h"
#include "JNIUtil.h"
#include "JNIStringHolder.h"
#include "Pool.h"
#include "svn_private_config.h"
-
+
/**
* Constructor
*
@@ -164,6 +165,6 @@ URL::initfunc(const char*& path, SVN::Po
svn_error_t*
Relpath::initfunc(const char*& path, SVN::Pool& pool)
{
- path = svn_relpath__internal_style(path, pool.getPool());
- return SVN_NO_ERROR;
+ apr_pool_t *const p = pool.getPool();
+ return svn_error_trace(svn_relpath__make_internal(&path, path, p, p));
}
Modified:
subversion/branches/swig-py3/subversion/bindings/javahl/native/Prompter.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/swig-py3/subversion/bindings/javahl/native/Prompter.cpp?rev=1862754&r1=1862753&r2=1862754&view=diff
==============================================================================
--- subversion/branches/swig-py3/subversion/bindings/javahl/native/Prompter.cpp
(original)
+++ subversion/branches/swig-py3/subversion/bindings/javahl/native/Prompter.cpp
Mon Jul 8 15:19:03 2019
@@ -45,7 +45,7 @@
Prompter::UniquePtr Prompter::create(jobject jprompter)
{
if (!jprompter)
- return UniquePtr(NULL);
+ return UniquePtr();
// Make sure no C++ exceptions are propagated from here.
const ::Java::Env jenv;
@@ -53,12 +53,12 @@ Prompter::UniquePtr Prompter::create(job
{
const jclass cls = ::Java::ClassCache::get_authn_cb(jenv)->get_class();
if (!jenv.IsInstanceOf(jprompter, cls))
- return UniquePtr(NULL);
+ return UniquePtr();
return UniquePtr(new Prompter(jenv, jprompter));
}
SVN_JAVAHL_JNI_CATCH;
- return UniquePtr(NULL);
+ return UniquePtr();
}
Prompter::UniquePtr Prompter::clone() const
@@ -431,7 +431,7 @@ svn_error_t *Prompter::dispatch_plaintex
Prompter::UniquePtr CompatPrompter::create(jobject jprompter)
{
if (!jprompter)
- return UniquePtr(NULL);
+ return UniquePtr();
// Make sure no C++ exceptions are propagated from here.
const ::Java::Env jenv;
@@ -440,12 +440,12 @@ Prompter::UniquePtr CompatPrompter::crea
const jclass cls =
::Java::ClassCache::get_user_passwd_cb(jenv)->get_class();
if (!jenv.IsInstanceOf(jprompter, cls))
- return UniquePtr(NULL);
+ return UniquePtr();
return UniquePtr(new CompatPrompter(jenv, jprompter));
}
SVN_JAVAHL_JNI_CATCH;
- return UniquePtr(NULL);
+ return UniquePtr();
}
Prompter::UniquePtr CompatPrompter::clone() const
Modified:
subversion/branches/swig-py3/subversion/bindings/javahl/native/Prompter.h
URL:
http://svn.apache.org/viewvc/subversion/branches/swig-py3/subversion/bindings/javahl/native/Prompter.h?rev=1862754&r1=1862753&r2=1862754&view=diff
==============================================================================
--- subversion/branches/swig-py3/subversion/bindings/javahl/native/Prompter.h
(original)
+++ subversion/branches/swig-py3/subversion/bindings/javahl/native/Prompter.h
Mon Jul 8 15:19:03 2019
@@ -35,10 +35,13 @@
#include "jniwrapper/jni_globalref.hpp"
+#include "CxxCompat.hpp"
+
+
class Prompter
{
public:
- typedef ::std::auto_ptr<Prompter> UniquePtr;
+ typedef ::JavaHL::cxx::owned_ptr<Prompter> UniquePtr;
/**
* Factory method; @a prompter is a local reference to the Java
Modified:
subversion/branches/swig-py3/subversion/bindings/javahl/native/RemoteSession.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/swig-py3/subversion/bindings/javahl/native/RemoteSession.cpp?rev=1862754&r1=1862753&r2=1862754&view=diff
==============================================================================
---
subversion/branches/swig-py3/subversion/bindings/javahl/native/RemoteSession.cpp
(original)
+++
subversion/branches/swig-py3/subversion/bindings/javahl/native/RemoteSession.cpp
Mon Jul 8 15:19:03 2019
@@ -104,7 +104,9 @@ RemoteSession::open(jint jretryAttempts,
jobject jremoteSession = open(
jretryAttempts, url.c_str(), uuid,
(jconfigDirectory ? configDirectory.c_str() : NULL),
- usernameStr, passwordStr, prompter, jprogress, jcfgcb, jtunnelcb);
+ usernameStr, passwordStr,
+ JavaHL::cxx::move(prompter),
+ jprogress, jcfgcb, jtunnelcb);
if (JNIUtil::isExceptionThrown() || !jremoteSession)
jremoteSession = NULL;
return jremoteSession;
@@ -120,7 +122,9 @@ RemoteSession::open(jint jretryAttempts,
{
RemoteSession* session = new RemoteSession(
jretryAttempts, url, uuid, configDirectory,
- usernameStr, passwordStr, prompter, jcfgcb, jtunnelcb);
+ usernameStr, passwordStr,
+ JavaHL::cxx::move(prompter),
+ jcfgcb, jtunnelcb);
if (JNIUtil::isJavaExceptionThrown() || !session)
{
delete session;
@@ -169,7 +173,7 @@ RemoteSession::open(jint jretryAttempts,
namespace{
struct compare_c_strings
{
- bool operator()(const char* a, const char* b)
+ bool operator()(const char* a, const char* b) const
{
return (0 < std::strcmp(a, b));
}
@@ -187,7 +191,9 @@ RemoteSession::RemoteSession(int retryAt
: m_session(NULL), m_context(NULL)
{
m_context = new RemoteSessionContext(
- pool, configDirectory, username, password, prompter, jcfgcb, jtunnelcb);
+ pool, configDirectory, username, password,
+ JavaHL::cxx::move(prompter),
+ jcfgcb, jtunnelcb);
if (JNIUtil::isJavaExceptionThrown())
return;
@@ -421,31 +427,31 @@ byte_array_to_svn_string(JNIByteArray& a
void
RemoteSession::changeRevisionProperty(
jlong jrevision, jstring jname,
- jbyteArray jold_value, jbyteArray jvalue)
+ jbyteArray jold_propval, jbyteArray jpropval)
{
JNIStringHolder name(jname);
if (JNIUtil::isExceptionThrown())
return;
- JNIByteArray old_value(jold_value);
+ JNIByteArray old_propval(jold_propval);
if (JNIUtil::isExceptionThrown())
return;
- JNIByteArray value(jvalue);
+ JNIByteArray propval(jpropval);
if (JNIUtil::isExceptionThrown())
return;
SVN::Pool subPool(pool);
- svn_string_t* const* p_old_value = NULL;
- svn_string_t* const str_old_value =
- byte_array_to_svn_string(old_value, subPool);
- if (str_old_value)
- p_old_value = &str_old_value;
+ svn_string_t* const* p_old_propval = NULL;
+ svn_string_t* const str_old_propval =
+ byte_array_to_svn_string(old_propval, subPool);
+ if (str_old_propval)
+ p_old_propval = &str_old_propval;
SVN_JNI_ERR(svn_ra_change_rev_prop2(m_session,
svn_revnum_t(jrevision),
- name, p_old_value,
- byte_array_to_svn_string(value, subPool),
+ name, p_old_propval,
+ byte_array_to_svn_string(propval,
subPool),
subPool.getPool()), );
}
@@ -856,7 +862,8 @@ RemoteSession::status(jobject jthis, jst
editor->delta_editor(),
editor->delta_baton(),
report_pool),);
- rp->set_reporter_data(raw_reporter, report_baton, editor);
+ rp->set_reporter_data(raw_reporter, report_baton,
+ JavaHL::cxx::move(editor));
}
// TODO: diff
Modified:
subversion/branches/swig-py3/subversion/bindings/javahl/native/RemoteSession.h
URL:
http://svn.apache.org/viewvc/subversion/branches/swig-py3/subversion/bindings/javahl/native/RemoteSession.h?rev=1862754&r1=1862753&r2=1862754&view=diff
==============================================================================
---
subversion/branches/swig-py3/subversion/bindings/javahl/native/RemoteSession.h
(original)
+++
subversion/branches/swig-py3/subversion/bindings/javahl/native/RemoteSession.h
Mon Jul 8 15:19:03 2019
@@ -71,8 +71,8 @@ class RemoteSession : public SVNBase
jlong getLatestRevision();
jlong getRevisionByTimestamp(jlong jtimestamp);
void changeRevisionProperty(jlong jrevision, jstring jname,
- jbyteArray jold_value,
- jbyteArray jvalue);
+ jbyteArray jold_propval,
+ jbyteArray jpropval);
jobject getRevisionProperties(jlong jrevision);
jbyteArray getRevisionProperty(jlong jrevision, jstring jname);
jlong getFile(jlong jrevision, jstring jpath,
Modified:
subversion/branches/swig-py3/subversion/bindings/javahl/native/RemoteSessionContext.cpp
URL:
http://svn.apache.org/viewvc/subversion/branches/swig-py3/subversion/bindings/javahl/native/RemoteSessionContext.cpp?rev=1862754&r1=1862753&r2=1862754&view=diff
==============================================================================
---
subversion/branches/swig-py3/subversion/bindings/javahl/native/RemoteSessionContext.cpp
(original)
+++
subversion/branches/swig-py3/subversion/bindings/javahl/native/RemoteSessionContext.cpp
Mon Jul 8 15:19:03 2019
@@ -43,7 +43,7 @@ RemoteSessionContext::RemoteSessionConte
if (passwordStr != NULL)
password(passwordStr);
- setPrompt(prompter);
+ setPrompt(JavaHL::cxx::move(prompter));
setConfigEventHandler(jcfgcb);
setTunnelCallback(jtunnelcb);
