Author: rinrab
Date: Fri Dec 6 13:59:05 2024
New Revision: 1922345
URL: http://svn.apache.org/viewvc?rev=1922345&view=rev
Log:
On the 'pristine-checksum-kind' branch: Sync with trunk@1922344.
Added:
subversion/branches/pristine-checksum-kind/.asf.yaml
- copied unchanged from r1922344, subversion/trunk/.asf.yaml
subversion/branches/pristine-checksum-kind/.clang-format
- copied unchanged from r1922344, subversion/trunk/.clang-format
subversion/branches/pristine-checksum-kind/.github/
- copied from r1922344, subversion/trunk/.github/
subversion/branches/pristine-checksum-kind/CMakeLists.txt
- copied unchanged from r1922344, subversion/trunk/CMakeLists.txt
subversion/branches/pristine-checksum-kind/build/cmake/
- copied from r1922344, subversion/trunk/build/cmake/
subversion/branches/pristine-checksum-kind/build/generator/gen_cmake.py
- copied unchanged from r1922344,
subversion/trunk/build/generator/gen_cmake.py
subversion/branches/pristine-checksum-kind/build/generator/templates/targets.cmake.ezt
- copied unchanged from r1922344,
subversion/trunk/build/generator/templates/targets.cmake.ezt
subversion/branches/pristine-checksum-kind/subversion/bindings/swig/python/tests/data/repository-deltas.dump
- copied unchanged from r1922344,
subversion/trunk/subversion/bindings/swig/python/tests/data/repository-deltas.dump
subversion/branches/pristine-checksum-kind/subversion/libsvn_client/diff_patch.c
- copied unchanged from r1922344,
subversion/trunk/subversion/libsvn_client/diff_patch.c
subversion/branches/pristine-checksum-kind/subversion/libsvn_diff/diff_tree_copy_as_changed.c
- copied unchanged from r1922344,
subversion/trunk/subversion/libsvn_diff/diff_tree_copy_as_changed.c
subversion/branches/pristine-checksum-kind/subversion/libsvn_diff/diff_tree_debug.c
- copied unchanged from r1922344,
subversion/trunk/subversion/libsvn_diff/diff_tree_debug.c
subversion/branches/pristine-checksum-kind/subversion/libsvn_diff/diff_tree_filter.c
- copied unchanged from r1922344,
subversion/trunk/subversion/libsvn_diff/diff_tree_filter.c
subversion/branches/pristine-checksum-kind/subversion/libsvn_diff/diff_tree_reverse.c
- copied unchanged from r1922344,
subversion/trunk/subversion/libsvn_diff/diff_tree_reverse.c
subversion/branches/pristine-checksum-kind/subversion/libsvn_diff/diff_tree_tee.c
- copied unchanged from r1922344,
subversion/trunk/subversion/libsvn_diff/diff_tree_tee.c
subversion/branches/pristine-checksum-kind/subversion/libsvn_ra_local/ra_init.h
- copied unchanged from r1922344,
subversion/trunk/subversion/libsvn_ra_local/ra_init.h
subversion/branches/pristine-checksum-kind/subversion/libsvn_ra_serf/ra_init.h
- copied unchanged from r1922344,
subversion/trunk/subversion/libsvn_ra_serf/ra_init.h
subversion/branches/pristine-checksum-kind/subversion/libsvn_ra_svn/ra_init.h
- copied unchanged from r1922344,
subversion/trunk/subversion/libsvn_ra_svn/ra_init.h
subversion/branches/pristine-checksum-kind/subversion/svn_private_config.hc
- copied unchanged from r1922344,
subversion/trunk/subversion/svn_private_config.hc
subversion/branches/pristine-checksum-kind/subversion/tests/cmdline/svneditor.sh
- copied unchanged from r1922344,
subversion/trunk/subversion/tests/cmdline/svneditor.sh
subversion/branches/pristine-checksum-kind/tools/dev/awk/
- copied from r1922344, subversion/trunk/tools/dev/awk/
subversion/branches/pristine-checksum-kind/tools/dev/hash-test.c
- copied unchanged from r1922344, subversion/trunk/tools/dev/hash-test.c
subversion/branches/pristine-checksum-kind/tools/dev/unix-build/Makefile.local
- copied unchanged from r1922344,
subversion/trunk/tools/dev/unix-build/Makefile.local
subversion/branches/pristine-checksum-kind/tools/hook-scripts/mailer/tests/README.md
- copied unchanged from r1922344,
subversion/trunk/tools/hook-scripts/mailer/tests/README.md
subversion/branches/pristine-checksum-kind/tools/hook-scripts/mailer/tests/mailer-t2.sh
- copied unchanged from r1922344,
subversion/trunk/tools/hook-scripts/mailer/tests/mailer-t2.sh
subversion/branches/pristine-checksum-kind/tools/hook-scripts/mailer/tests/mailer-t3.py
- copied unchanged from r1922344,
subversion/trunk/tools/hook-scripts/mailer/tests/mailer-t3.py
subversion/branches/pristine-checksum-kind/tools/hook-scripts/mailer/tests/t2-reference/
- copied from r1922344,
subversion/trunk/tools/hook-scripts/mailer/tests/t2-reference/
subversion/branches/pristine-checksum-kind/tools/hook-scripts/mailer/tests/t3/
- copied from r1922344,
subversion/trunk/tools/hook-scripts/mailer/tests/t3/
Removed:
subversion/branches/pristine-checksum-kind/build/hudson/
subversion/branches/pristine-checksum-kind/contrib/server-side/backup-recipe.sh
subversion/branches/pristine-checksum-kind/contrib/server-side/svnmirror-test.sh
subversion/branches/pristine-checksum-kind/contrib/server-side/svnmirror.sh
subversion/branches/pristine-checksum-kind/notes/move-tracking/
subversion/branches/pristine-checksum-kind/subversion/include/private/svn_branch.h
subversion/branches/pristine-checksum-kind/subversion/include/private/svn_branch_compat.h
subversion/branches/pristine-checksum-kind/subversion/include/private/svn_branch_impl.h
subversion/branches/pristine-checksum-kind/subversion/include/private/svn_branch_nested.h
subversion/branches/pristine-checksum-kind/subversion/include/private/svn_branch_repos.h
subversion/branches/pristine-checksum-kind/subversion/include/private/svn_element.h
subversion/branches/pristine-checksum-kind/subversion/libsvn_client/merge_elements.c
subversion/branches/pristine-checksum-kind/subversion/libsvn_delta/branch.c
subversion/branches/pristine-checksum-kind/subversion/libsvn_delta/branch_compat.c
subversion/branches/pristine-checksum-kind/subversion/libsvn_delta/branch_migrate.c
subversion/branches/pristine-checksum-kind/subversion/libsvn_delta/branch_nested.c
subversion/branches/pristine-checksum-kind/subversion/libsvn_delta/branch_repos.c
subversion/branches/pristine-checksum-kind/subversion/libsvn_delta/element.c
subversion/branches/pristine-checksum-kind/subversion/libsvn_ra/deprecated.h
subversion/branches/pristine-checksum-kind/subversion/tests/cmdline/svneditor.sh.in
subversion/branches/pristine-checksum-kind/subversion/tests/cmdline/svnmover_tests.py
subversion/branches/pristine-checksum-kind/tools/dev/iz/
subversion/branches/pristine-checksum-kind/tools/dev/svnmover/
Modified:
subversion/branches/pristine-checksum-kind/ (props changed)
subversion/branches/pristine-checksum-kind/.editorconfig
subversion/branches/pristine-checksum-kind/CHANGES
subversion/branches/pristine-checksum-kind/COMMITTERS
subversion/branches/pristine-checksum-kind/INSTALL
subversion/branches/pristine-checksum-kind/LICENSE
subversion/branches/pristine-checksum-kind/Makefile.in
subversion/branches/pristine-checksum-kind/NOTICE
subversion/branches/pristine-checksum-kind/build.conf
subversion/branches/pristine-checksum-kind/build/ac-macros/swig.m4
subversion/branches/pristine-checksum-kind/build/generator/extractor.py
subversion/branches/pristine-checksum-kind/build/generator/gen_base.py
subversion/branches/pristine-checksum-kind/build/generator/gen_win.py
subversion/branches/pristine-checksum-kind/build/generator/gen_win_dependencies.py
subversion/branches/pristine-checksum-kind/build/generator/swig/__init__.py
subversion/branches/pristine-checksum-kind/build/get-py-info.py
subversion/branches/pristine-checksum-kind/build/run_tests.py
subversion/branches/pristine-checksum-kind/build/transform_sql.py
subversion/branches/pristine-checksum-kind/configure.ac
subversion/branches/pristine-checksum-kind/contrib/client-side/svn_apply_autoprops.py
subversion/branches/pristine-checksum-kind/contrib/client-side/svn_load_dirs/svn_load_dirs.pl.in
subversion/branches/pristine-checksum-kind/contrib/hook-scripts/check-mime-type.pl
subversion/branches/pristine-checksum-kind/contrib/server-side/fsfsverify.py
subversion/branches/pristine-checksum-kind/gen-make.py
subversion/branches/pristine-checksum-kind/subversion/bindings/javahl/README
subversion/branches/pristine-checksum-kind/subversion/bindings/swig/INSTALL
subversion/branches/pristine-checksum-kind/subversion/bindings/swig/include/svn_containers.swg
subversion/branches/pristine-checksum-kind/subversion/bindings/swig/include/svn_types.swg
subversion/branches/pristine-checksum-kind/subversion/bindings/swig/perl/native/t/5delta-compat.t
subversion/branches/pristine-checksum-kind/subversion/bindings/swig/perl/native/t/5delta.t
subversion/branches/pristine-checksum-kind/subversion/bindings/swig/perl/native/t/6ra.t
subversion/branches/pristine-checksum-kind/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c
subversion/branches/pristine-checksum-kind/subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.h
subversion/branches/pristine-checksum-kind/subversion/bindings/swig/python/svn/delta.py
subversion/branches/pristine-checksum-kind/subversion/bindings/swig/python/svn/fs.py
subversion/branches/pristine-checksum-kind/subversion/bindings/swig/python/svn/repos.py
subversion/branches/pristine-checksum-kind/subversion/bindings/swig/python/tests/client.py
subversion/branches/pristine-checksum-kind/subversion/bindings/swig/python/tests/core.py
subversion/branches/pristine-checksum-kind/subversion/bindings/swig/python/tests/delta.py
subversion/branches/pristine-checksum-kind/subversion/bindings/swig/python/tests/fs.py
subversion/branches/pristine-checksum-kind/subversion/bindings/swig/python/tests/repository.py
subversion/branches/pristine-checksum-kind/subversion/bindings/swig/python/tests/wc.py
subversion/branches/pristine-checksum-kind/subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c
subversion/branches/pristine-checksum-kind/subversion/bindings/swig/ruby/svn/core.rb
subversion/branches/pristine-checksum-kind/subversion/bindings/swig/svn_client.i
subversion/branches/pristine-checksum-kind/subversion/bindings/swig/svn_delta.i
subversion/branches/pristine-checksum-kind/subversion/bindings/swig/svn_repos.i
subversion/branches/pristine-checksum-kind/subversion/bindings/swig/svn_wc.i
subversion/branches/pristine-checksum-kind/subversion/include/private/svn_client_private.h
subversion/branches/pristine-checksum-kind/subversion/include/private/svn_cmdline_private.h
subversion/branches/pristine-checksum-kind/subversion/include/private/svn_diff_tree.h
subversion/branches/pristine-checksum-kind/subversion/include/svn_opt.h
subversion/branches/pristine-checksum-kind/subversion/include/svn_wc.h
subversion/branches/pristine-checksum-kind/subversion/libsvn_client/client.h
subversion/branches/pristine-checksum-kind/subversion/libsvn_client/copy.c
subversion/branches/pristine-checksum-kind/subversion/libsvn_client/diff.c
subversion/branches/pristine-checksum-kind/subversion/libsvn_client/externals.c
subversion/branches/pristine-checksum-kind/subversion/libsvn_client/merge.c
subversion/branches/pristine-checksum-kind/subversion/libsvn_client/util.c
subversion/branches/pristine-checksum-kind/subversion/libsvn_diff/diff_tree.c
subversion/branches/pristine-checksum-kind/subversion/libsvn_fs/fs-loader.c
subversion/branches/pristine-checksum-kind/subversion/libsvn_fs/fs-loader.h
subversion/branches/pristine-checksum-kind/subversion/libsvn_fs_base/fs.c
subversion/branches/pristine-checksum-kind/subversion/libsvn_fs_base/fs_init.h
subversion/branches/pristine-checksum-kind/subversion/libsvn_fs_fs/fs.c
subversion/branches/pristine-checksum-kind/subversion/libsvn_fs_fs/fs_init.h
subversion/branches/pristine-checksum-kind/subversion/libsvn_fs_x/ (props
changed)
subversion/branches/pristine-checksum-kind/subversion/libsvn_fs_x/fs.c
subversion/branches/pristine-checksum-kind/subversion/libsvn_fs_x/fs_init.h
subversion/branches/pristine-checksum-kind/subversion/libsvn_ra/deprecated.c
subversion/branches/pristine-checksum-kind/subversion/libsvn_ra/ra_loader.c
subversion/branches/pristine-checksum-kind/subversion/libsvn_ra/ra_loader.h
subversion/branches/pristine-checksum-kind/subversion/libsvn_ra_local/ra_plugin.c
subversion/branches/pristine-checksum-kind/subversion/libsvn_ra_serf/inherited_props.c
subversion/branches/pristine-checksum-kind/subversion/libsvn_ra_serf/mergeinfo.c
subversion/branches/pristine-checksum-kind/subversion/libsvn_ra_serf/serf.c
subversion/branches/pristine-checksum-kind/subversion/libsvn_ra_svn/client.c
subversion/branches/pristine-checksum-kind/subversion/libsvn_repos/load-fs-vtable.c
subversion/branches/pristine-checksum-kind/subversion/libsvn_repos/log.c
subversion/branches/pristine-checksum-kind/subversion/libsvn_repos/reporter.c
subversion/branches/pristine-checksum-kind/subversion/libsvn_subr/auth.c
subversion/branches/pristine-checksum-kind/subversion/libsvn_subr/cmdline.c
subversion/branches/pristine-checksum-kind/subversion/libsvn_subr/io.c
subversion/branches/pristine-checksum-kind/subversion/libsvn_subr/opt.c
subversion/branches/pristine-checksum-kind/subversion/libsvn_subr/sysinfo.c
subversion/branches/pristine-checksum-kind/subversion/libsvn_subr/version.c
subversion/branches/pristine-checksum-kind/subversion/libsvn_wc/revert.c
subversion/branches/pristine-checksum-kind/subversion/libsvn_wc/workqueue.c
subversion/branches/pristine-checksum-kind/subversion/svn/cl.h
subversion/branches/pristine-checksum-kind/subversion/svn/info-cmd.c
subversion/branches/pristine-checksum-kind/subversion/svn/notify.c
subversion/branches/pristine-checksum-kind/subversion/svn/propget-cmd.c
subversion/branches/pristine-checksum-kind/subversion/svn/proplist-cmd.c
subversion/branches/pristine-checksum-kind/subversion/svn/shelf-cmd.c
subversion/branches/pristine-checksum-kind/subversion/svn/shelf2-cmd.c
subversion/branches/pristine-checksum-kind/subversion/svn/svn.c
subversion/branches/pristine-checksum-kind/subversion/svnadmin/svnadmin.c
subversion/branches/pristine-checksum-kind/subversion/svnbench/notify.c
subversion/branches/pristine-checksum-kind/subversion/svnbench/svnbench.c
subversion/branches/pristine-checksum-kind/subversion/svndumpfilter/svndumpfilter.c
subversion/branches/pristine-checksum-kind/subversion/svnfsfs/svnfsfs.c
subversion/branches/pristine-checksum-kind/subversion/svnlook/svnlook.c
subversion/branches/pristine-checksum-kind/subversion/svnmucc/svnmucc.c
subversion/branches/pristine-checksum-kind/subversion/svnrdump/svnrdump.c
subversion/branches/pristine-checksum-kind/subversion/svnserve/svnserve.c
subversion/branches/pristine-checksum-kind/subversion/svnsync/svnsync.c
subversion/branches/pristine-checksum-kind/subversion/svnversion/svnversion.c
subversion/branches/pristine-checksum-kind/subversion/tests/cmdline/
(props changed)
subversion/branches/pristine-checksum-kind/subversion/tests/cmdline/basic_tests.py
subversion/branches/pristine-checksum-kind/subversion/tests/cmdline/changelist_tests.py
subversion/branches/pristine-checksum-kind/subversion/tests/cmdline/checkout_tests.py
subversion/branches/pristine-checksum-kind/subversion/tests/cmdline/copy_tests.py
subversion/branches/pristine-checksum-kind/subversion/tests/cmdline/diff_tests.py
subversion/branches/pristine-checksum-kind/subversion/tests/cmdline/getopt_tests.py
subversion/branches/pristine-checksum-kind/subversion/tests/cmdline/info_tests.py
subversion/branches/pristine-checksum-kind/subversion/tests/cmdline/legacy/utf8_tests.py
subversion/branches/pristine-checksum-kind/subversion/tests/cmdline/lock_tests.py
subversion/branches/pristine-checksum-kind/subversion/tests/cmdline/log_tests.py
subversion/branches/pristine-checksum-kind/subversion/tests/cmdline/merge_authz_tests.py
subversion/branches/pristine-checksum-kind/subversion/tests/cmdline/merge_automatic_tests.py
subversion/branches/pristine-checksum-kind/subversion/tests/cmdline/merge_tests.py
subversion/branches/pristine-checksum-kind/subversion/tests/cmdline/merge_tree_conflict_tests.py
subversion/branches/pristine-checksum-kind/subversion/tests/cmdline/patch_tests.py
subversion/branches/pristine-checksum-kind/subversion/tests/cmdline/prop_tests.py
subversion/branches/pristine-checksum-kind/subversion/tests/cmdline/special_tests.py
subversion/branches/pristine-checksum-kind/subversion/tests/cmdline/stat_tests.py
subversion/branches/pristine-checksum-kind/subversion/tests/cmdline/store_pristine_tests.py
subversion/branches/pristine-checksum-kind/subversion/tests/cmdline/svnadmin_tests.py
subversion/branches/pristine-checksum-kind/subversion/tests/cmdline/svnfsfs_tests.py
subversion/branches/pristine-checksum-kind/subversion/tests/cmdline/svnmucc_tests.py
subversion/branches/pristine-checksum-kind/subversion/tests/cmdline/svntest/actions.py
subversion/branches/pristine-checksum-kind/subversion/tests/cmdline/svntest/main.py
subversion/branches/pristine-checksum-kind/subversion/tests/cmdline/svntest/verify.py
subversion/branches/pristine-checksum-kind/subversion/tests/cmdline/svntest/wc.py
subversion/branches/pristine-checksum-kind/subversion/tests/cmdline/trans_tests.py
subversion/branches/pristine-checksum-kind/subversion/tests/cmdline/update_tests.py
subversion/branches/pristine-checksum-kind/subversion/tests/cmdline/upgrade_tests.py
subversion/branches/pristine-checksum-kind/subversion/tests/libsvn_ra/ra-test.c
subversion/branches/pristine-checksum-kind/subversion/tests/libsvn_subr/
(props changed)
subversion/branches/pristine-checksum-kind/subversion/tests/libsvn_subr/opt-test.c
subversion/branches/pristine-checksum-kind/tools/client-side/svn-mergeinfo-normalizer/svn-mergeinfo-normalizer.c
subversion/branches/pristine-checksum-kind/tools/client-side/svnconflict/svnconflict.c
subversion/branches/pristine-checksum-kind/tools/dev/svnraisetreeconflict/svnraisetreeconflict.c
subversion/branches/pristine-checksum-kind/tools/dev/unix-build/Makefile.svn
subversion/branches/pristine-checksum-kind/tools/dev/unix-build/README
subversion/branches/pristine-checksum-kind/tools/dev/wc-ng/svn-wc-db-tester.c
subversion/branches/pristine-checksum-kind/tools/dist/README.backport
subversion/branches/pristine-checksum-kind/tools/dist/backport.pl
subversion/branches/pristine-checksum-kind/tools/dist/backport_tests.py
subversion/branches/pristine-checksum-kind/tools/dist/backport_tests_data/backport_accept.dump
subversion/branches/pristine-checksum-kind/tools/dist/backport_tests_data/backport_branch_with_original_revision.dump
subversion/branches/pristine-checksum-kind/tools/dist/backport_tests_data/backport_branches.dump
subversion/branches/pristine-checksum-kind/tools/dist/backport_tests_data/backport_indented_entry.dump
subversion/branches/pristine-checksum-kind/tools/dist/backport_tests_data/backport_logsummary_colon.dump
subversion/branches/pristine-checksum-kind/tools/dist/backport_tests_data/backport_multirevisions.dump
subversion/branches/pristine-checksum-kind/tools/dist/backport_tests_data/backport_two_approveds.dump
subversion/branches/pristine-checksum-kind/tools/dist/backport_tests_data/backport_unicode_entry.dump
subversion/branches/pristine-checksum-kind/tools/dist/backport_tests_pl.py
subversion/branches/pristine-checksum-kind/tools/dist/backport_tests_py.py
subversion/branches/pristine-checksum-kind/tools/dist/make-keys.sh
subversion/branches/pristine-checksum-kind/tools/dist/release-lines.yaml
subversion/branches/pristine-checksum-kind/tools/dist/release.py
subversion/branches/pristine-checksum-kind/tools/hook-scripts/mailer/mailer.py
subversion/branches/pristine-checksum-kind/tools/hook-scripts/mailer/tests/
(props changed)
subversion/branches/pristine-checksum-kind/tools/hook-scripts/mailer/tests/mailer-t1.sh
subversion/branches/pristine-checksum-kind/tools/server-side/svnauthz.c
Propchange: subversion/branches/pristine-checksum-kind/
------------------------------------------------------------------------------
--- svn:auto-props (original)
+++ svn:auto-props Fri Dec 6 13:59:05 2024
@@ -9,6 +9,7 @@
*.rb = svn:eol-style=native
*.sql = svn:eol-style=native
*.txt = svn:eol-style=native
+*.yml = svn:eol-style=native
README = svn:eol-style=native
BRANCH-README = svn:eol-style=native
STATUS = svn:eol-style=native
Propchange: subversion/branches/pristine-checksum-kind/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Dec 6 13:59:05 2024
@@ -32,10 +32,12 @@ Release
release_win32
release_win32_static
release_x64
+release_ARM64
Debug
debug_win32
debug_win32_static
debug_x64
+debug_ARM64
ipch
subversion_msvc.dsw
subversion_msvc.ncb
@@ -63,3 +65,5 @@ compile_commands.json
.swig_pl_checked
.swig_py_checked
.swig_rb_checked
+out
+CMakeSettings.json
Propchange: subversion/branches/pristine-checksum-kind/
------------------------------------------------------------------------------
Merged /subversion/branches/windows-shared-ra-modules:r1920808-1921005
Merged /subversion/trunk:r1908636-1922344
Merged /subversion/branches/cmake:r1918598-1920716
Modified: subversion/branches/pristine-checksum-kind/.editorconfig
URL:
http://svn.apache.org/viewvc/subversion/branches/pristine-checksum-kind/.editorconfig?rev=1922345&r1=1922344&r2=1922345&view=diff
==============================================================================
--- subversion/branches/pristine-checksum-kind/.editorconfig (original)
+++ subversion/branches/pristine-checksum-kind/.editorconfig Fri Dec 6
13:59:05 2024
@@ -8,6 +8,24 @@ indent_size = 2
insert_final_newline = true
trim_trailing_whitespace = false
+# Forces hard line wrapping after the amount of characters specified.
+max_line_length = 79
+
+# Adds guidelines to the editor. This option is unofficial, but it is
+# supported by Visual Studio with EditorConfig Guidelines or Editor
+# Guidelines extensions.
+guidelines = 79 dashed
+
+[*.{c,h,cpp,hpp}]
+trim_trailing_whitespace = true
+cpp_indent_within_parentheses = align_to_parenthesis
+cpp_indent_preserve_within_parentheses = true
+cpp_space_pointer_reference_alignment = right
+cpp_wrap_preserve_blocks = all_one_line_scopes
+cpp_new_line_before_open_brace_function = new_line
+cpp_new_line_before_open_brace_block = new_line
+cpp_space_preserve_in_initializer_list = true
+
[**/Makefile*]
indent_style = tab
indent_size = 8
Modified: subversion/branches/pristine-checksum-kind/CHANGES
URL:
http://svn.apache.org/viewvc/subversion/branches/pristine-checksum-kind/CHANGES?rev=1922345&r1=1922344&r2=1922345&view=diff
==============================================================================
--- subversion/branches/pristine-checksum-kind/CHANGES (original)
+++ subversion/branches/pristine-checksum-kind/CHANGES Fri Dec 6 13:59:05 2024
@@ -11,6 +11,73 @@ https://svn.apache.org/repos/asf/subvers
- Client-side improvements and bugfixes:
* Support multiple working copy formats (1.8-onward, 1.15) (issue #????)
+ - Other tool improvements and bugfixes:
+ * When building on Unix, change default configure option to enable support
+ for the simple (plaintext) credential store unless disabled at configure
+ time with --disable-plaintext-password-storage. This reverts r1845377
+ (r1909351).
+
+Version 1.14.5
+(7 Dec 2024, from /branches/1.14.x)
+https://svn.apache.org/repos/asf/subversion/tags/1.14.5
+ User-visible changes:
+ Developer-visible changes:
+ * Fix detection of zlib version 1.3 in gen-make.py on Windows (r1921266)
+ * Supress gen-make.py errors on Windows without Perl or Ruby (r1921267)
+ * Fix printf-format build warnings in swig-rb (r1921264)
+ * Add a regression test for CVE-2024-45720 (r1921266)
+ * Make swig-py compatible with SWIG 4.3.0 (r1921505)
+
+Version 1.14.4
+(8 Oct 2024, from /branches/1.14.x)
+https://svn.apache.org/repos/asf/subversion/tags/1.14.4
+ User-visible changes:
+ - Client-side improvements and bugfixes:
+ * Fix CVE-2024-45720: command line argument injection on Windows
+ * Fix unbounded memory usage in propget and proplist --xml (r1918138, -39)
+ * Fix cmdline parsing bugs in --change (-c) argument (r1917864, -944)
+ * Improve help message for svnmucc PUT (r1914222)
+ - Server-side bugfixes:
+ * mailer.py: Fix inconsistency in Config.which_group() arguments (r1914518)
+
+ Developer-visible changes:
+ * Fix svnadmin_tests.py failing with Python 3.11+ on Windows (r1910464)
+ * Support building swig-rb with clang 16 / GCC14 (r1915236, -39)
+ * Convert path to local style in error message from diff API (r1917946)
+ * Fix `invalid escape sequence` in .py scripts for Python 3.12 (r1912632)
+ * swig-py: Fix `none_dealloc` error caused by refcount issue (r1915316)
+ * Fix a msgid in svnadmin.c which was not a valid C string (r1887710)
+
+Version 1.14.3
+(20 Dec 2023, from /branches/1.14.x)
+https://svn.apache.org/repos/asf/subversion/tags/1.14.3
+ User-visible changes:
+ - Client-side bugfixes:
+ * Fix svn:mergeinfo diff parser bug when parsing forward merges (r1906502)
+ * Fix redirected URL handling with file externals (r1908926, issue #4911)
+
+ - Server-side bugfixes:
+ (none)
+
+ Developer-visible changes:
+ * swig-rb: Fix uses of 'File.exist?', deprecated since Ruby 2.1 (r1904472)
+ * Build: Fix uses of deprecated Python APIs (r1900882, issue #4899)
+ * Build: Retain ability to build SWIG Python 2 bindings (r1900890)
+ * Fix reading WC lock status with svn_wc_status2_t (r1904193, issue #4908)
+ * JavaHL: Add @Deprecated to silence compiler warnings (r1904936)
+ * JavaHL: Fix crash in case of null message in getMessage (r1904938)
+ * Fix build breakage of release tarballs by installed swig (r1878379 et al)
+ * Add regression test for issue #4711 "invalid xml file" (r1877310)
+ * swig-py: Fix building with SWIG 4.1.0 (r1904167)
+ * Makefile.in: Fix cleaning of __pycache__ dirs and *.pyc (r1903267)
+ * swig-py: Avoid deprecated options to SWIG >= 4.1.0 (r1904198, r1904287)
+ * swig-py: Use sysconfig to allow building with Python 3.12 (r1910098)
+ * INSTALL: Document not to use SVN with APR 1.7.3 on Windows (r1911278)
+ * Fix test suite broken by syntax error when --enable-sasl (r1907124)
+ * swig-py: Fix issues #4916, #4917, #4918 (r1912500 et al)
+ * swig-py: Improve error when no external diff (r1912724, -743, issue
#1778)
+ * autogen.sh: Fix building when Python is not named "python" (r1903245)
+
Version 1.14.2
(12 Apr 2022, from /branches/1.14.x)
User-visible changes:
Modified: subversion/branches/pristine-checksum-kind/COMMITTERS
URL:
http://svn.apache.org/viewvc/subversion/branches/pristine-checksum-kind/COMMITTERS?rev=1922345&r1=1922344&r2=1922345&view=diff
==============================================================================
--- subversion/branches/pristine-checksum-kind/COMMITTERS [UTF-8] (original)
+++ subversion/branches/pristine-checksum-kind/COMMITTERS [UTF-8] Fri Dec 6
13:59:05 2024
@@ -60,12 +60,13 @@ Blanket commit access:
kotkov Evgeny Kotkov <[email protected]>
astieger Andreas Stieger <[email protected]>
jamessan James McCoy <[email protected]>
- luke1410 Stefan Hett <[email protected]>
troycurtisjr Troy Curtis, Jr <[email protected]>
hartmannathan Nathan Hartman <[email protected]>
futatuki Yasuhito Futatsuki <[email protected]>
jun66j5 Jun Omae <[email protected]>
dsahlberg Daniel Sahlberg <[email protected]>
+ vinc17 Vincent Lefevre <[email protected]>
+ rinrab Timofei Zhakov <[email protected]>
[[END ACTIVE FULL COMMITTERS. LEAVE THIS LINE HERE; SCRIPTS LOOK FOR IT.]]
@@ -84,6 +85,7 @@ Full committers who have asked to be lis
naked Nuutti Kotivuori <[email protected]>
ringstrom Tobias Ringström <[email protected]>
ivan Ivan Zhakov <[email protected]>
+ luke1410 Stefan Hett <[email protected]>
Partial committers who have asked to be listed as dormant:
Modified: subversion/branches/pristine-checksum-kind/INSTALL
URL:
http://svn.apache.org/viewvc/subversion/branches/pristine-checksum-kind/INSTALL?rev=1922345&r1=1922344&r2=1922345&view=diff
==============================================================================
--- subversion/branches/pristine-checksum-kind/INSTALL (original)
+++ subversion/branches/pristine-checksum-kind/INSTALL Fri Dec 6 13:59:05 2024
@@ -20,6 +20,7 @@ Contents:
C. Building under Unix in Different Directories
D. Installing from a Zip or Installer File under Windows
E. Building the Latest Source under Windows
+ F. Building using CMake
III. BUILDING A SUBVERSION SERVER
A. Setting Up Apache Httpd
@@ -28,11 +29,7 @@ Contents:
D. Running and Testing
E. Alternative: 'svnserve' and ra_svn
- IV. PLATFORM-SPECIFIC ISSUES
- A. Windows XP
- B. Mac OS X
-
- V. PROGRAMMING LANGUAGE BINDINGS (PYTHON, PERL, RUBY, JAVA)
+ IV. PROGRAMMING LANGUAGE BINDINGS (PYTHON, PERL, RUBY, JAVA)
@@ -242,22 +239,42 @@ I. INTRODUCTION
$ ./configure --with-apr=/usr/local/apache2 \
--with-apr-util=/usr/local/apache2 ...
- Be sure to use a native Windows SVN client (as opposed to
- Cygwin's version) so that the .dsp files get carriage-returns at
- the ends of their lines. Otherwise Visual Studio will complain
- that it doesn't recognize the .dsp files.
-
- If you use APR libraries checked out from svn in an Unix
- environment, you need to run the 'buildconf' script in each
- library's directory, to regenerate the configure scripts and
- other files required for compiling the libraries:
+ Notes on Windows platforms:
- $ cd apr; ./buildconf; ./configure ...; make; make install; cd ..
+ * Do not use APR version 1.7.3 as that release contains a bug that
+ makes it impossible for Subversion to use it properly. This issue
+ only affects APR builds on Windows. This issue was fixed in APR
+ version 1.7.4. See:
+ https://lists.apache.org/thread/xd5t922jvb9423ph4j84rsp5fxks1k0z
+
+ * If you check out APR and APR-util sources from their Subversion
+ repository, be sure to use a native Windows SVN client (as opposed
+ to Cygwin's version) so that the .dsp files get carriage-returns at
+ the ends of their lines. Otherwise Visual Studio will complain that
+ it doesn't recognize the .dsp files.
+
+ Notes on Unix platforms:
+
+ * If you check out APR and APR-util sources from their Subversion
+ repository, you need to run the 'buildconf' script in each library's
+ directory to regenerate the configure scripts and other files
+ required for compiling the libraries. Afterwards, configure, build,
+ and install both libraries before running Subversion's configure
+ script. For example:
- $ cd apr-util; ./buildconf; ./configure ...; make; make install; cd ..
+ $ cd apr
+ $ ./buildconf
+ $ ./configure <options...>
+ $ make
+ $ make install
+ $ cd ..
- Configure build and install both libraries before running Subversion's
- configure script.
+ $ cd apr-util
+ $ ./buildconf
+ $ ./configure <options...>
+ $ make
+ $ make install
+ $ cd ..
2. SQLite (REQUIRED)
@@ -426,14 +443,6 @@ I. INTRODUCTION
the detection to succeed, the dynamic linker must be able to find
the libraries at configure time.
- If you are on the Windows platform and want to build Subversion,
- a precompiled version of the Berkeley DB library is available for
- download at the Subversion web site "Documents & files" area:
-
-
http://subversion.tigris.org/servlets/ProjectDocumentList?folderID=688
-
- Look in the "Releases > Windows > Windows BDB" section.
-
10. Cyrus SASL library (OPTIONAL)
@@ -656,6 +665,19 @@ I. INTRODUCTION
II. INSTALLATION
============
+ Subversion support three different build systems:
+ - Autoconf/make, for Unix builds
+ - Visual Studio vcproj, for Windows builds
+ - CMake, for both Unix and Windows
+
+ The first two have been in use since 2001. Sections A-E below describe
+ the classic build system.
+
+ The CMake build system was created in 2024 and is still under
+ development. It will be included in Subversion 1.15 and is expected to
+ be the default build system starting with Subversion 1.16. Section F
+ below describes the CMake build system.
+
A. Building from a Tarball
------------------------------
@@ -834,9 +856,8 @@ II. INSTALLATION
* Python 2.7 or higher, downloaded from https://www.python.org/ which is
used to generate the project files.
* Perl 5.8 or higher from https://www.perl.org/get.html
- * Awk (from https://www.cs.princeton.edu/~bwk/btl.mirror/awk95.exe) is
- needed to compile Apache. Note that this is the actual awk program,
- not an installer - just rename it to awk.exe and it is ready to use.
+ * Awk is needed to compile Apache. Source code is available in
+ tools\dev\awk, run the buildwin.bat program to compile.
* Apache apr, apr-util, and optionally apr-iconv libraries, version
1.4 or later (1.2 for apr-iconv). If you are building from a Subversion
checkout and have not downloaded Apache 2, then get these 3 libraries
@@ -859,7 +880,7 @@ II. INSTALLATION
are available from
http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/downloads/index-082944.html
(Version 4.4.20 or in specific cases some higher version recommended)
- For more information see Section I.C.7.
+ For more information see Section I.C.9.
* [Optional] Openssl can be obtained from https://www.openssl.org/source/
* [Optional] NASM can be obtained from http://www.nasm.us/
* [Optional] A modified version of GNU libintl, called
@@ -877,7 +898,7 @@ II. INSTALLATION
The Apache Serf library supports secure connections with OpenSSL
and on-the-wire compression with zlib. If you want to use the
secure connections feature, you should pass the option
- "--with-openssl" to the gen-make.py script. See Section I.C.6 for
+ "--with-openssl" to the gen-make.py script. See Section I.C.7 for
more details.
E.3 Preparation
@@ -1168,6 +1189,66 @@ II. INSTALLATION
C:>python win-tests.py -c -r -v -u http://localhost
C:>cd ..
+
+
+ F. Building using CMake
+ --------------------
+
+ Get the sources, either a release tarball or by checking out the
+ official repository. The CMake build system currently only exists in
+ /trunk and it will be included in the 1.15 release.
+
+ The process for building on Unix and Windows is the same.
+
+ $ python gen-make.py -t cmake
+ $ cmake -B out [build options]
+ $ cmake --build out
+
+ "out" in the commands above is the build directory used by CMake.
+
+ Build options can be added, for example:
+
+ $ cmake -B out -DCMAKE_INSTALL_PREFIX=/usr/local/subversion
-DSVN_ENABLE_RA_SERF=ON
+
+ Build options can be listed using:
+
+ $ cmake -LH
+
+ Windows tricks:
+
+ - Modern versions of Microsoft Visual Studio provide support for
+ CMake projects out-of-box, including intellisense, integrated
+ options editor, test explorer, and more.
+
+ In order to use it for Subversion, open the source directory with
+ Visual Studio, and the configuration should start automatically.
+ For editing the cache (options), do right-click to the CMakeLists.txt
+ file and clicking `CMake Settings for Subversion` will open the
+ editor. After the required settings are configured, hit `F7` in
+ order to build. For more info, check the article bellow:
+
+
https://learn.microsoft.com/en-us/cpp/build/cmake-projects-in-visual-studio
+
+ - There is a useful tool for bootstrapping the dependencies,
+ vcpkg. It provides ports for the most of the Subversion's
+ dependencies, which then could be installed via a single
+ command.
+
+ To start using it, download the registry from GitHub, bootstrap
+ vcpkg, and install the dependencies:
+
+ $ git clone https://github.com/microsoft/vcpkg
+ $ cd vcpkg && .\bootstrap-vcpkg.bat -disableMetrics
+ $ .\vcpkg install apr apr-util expat zlib sqlite3 [any other
dependency]
+
+ After this is done, vcpkg can be integrated into CMake by passing
+ the vcpkg toolchain to CMAKE_TOOLCHAIN_FILE option. In order to do
+ it with Visual Studio, open the CMake cache editor as explained in
+ the previous step, and put the following into `CMake toolchain
+ file` field, where VCPKG_ROOT is the path to vcpkg registry:
+
+ <VCPKG_ROOT>/scripts/buildsystems/vcpkg.cmake
+
III. BUILDING A SUBVERSION SERVER
============================
@@ -1220,7 +1301,7 @@ III. BUILDING A SUBVERSION SERVER
line. Make sure this is the same db as the one Subversion uses.
This note assumes you have installed Berkeley DB 4.2.52
at its default locations. For more info about the db requirement,
- see section I.C.7.
+ see section I.C.9.
You may also want to include other modules in your build. Add
--enable-ssl to turn on SSL support, and --enable-deflate to turn on
@@ -1433,38 +1514,7 @@ III. BUILDING A SUBVERSION SERVER
-IV. PLATFORM-SPECIFIC ISSUES
- ========================
-
- A. Windows XP
- ----------
-
- There is an error in the Windows XP TCP/IP stack which causes
- corruption in certain cases. This problem is exposed only
- through ra_dav.
-
- The root of the matter is caused by duplicating file handles
- between parent and child processes. The httpd Apache group
- explains this a lot better:
-
- https://www.apache.org/dist/httpd/binaries/win32/#xpbug
-
- And there's an item about this in the Subversion FAQ:
-
- https://subversion.apache.org/faq.html#windows-xp-server
-
- The only known workaround for now is to update to Windows XP
- SP1 (or higher).
-
-
- B. Mac OS X
- --------
-
- [TBD: Describe BDB 4.0.x problem]
-
-
-
-V. PROGRAMMING LANGUAGE BINDINGS (PYTHON, PERL, RUBY, JAVA)
+IV. PROGRAMMING LANGUAGE BINDINGS (PYTHON, PERL, RUBY, JAVA)
========================================================
For Python, Perl and Ruby bindings, see the file
Modified: subversion/branches/pristine-checksum-kind/LICENSE
URL:
http://svn.apache.org/viewvc/subversion/branches/pristine-checksum-kind/LICENSE?rev=1922345&r1=1922344&r2=1922345&view=diff
==============================================================================
--- subversion/branches/pristine-checksum-kind/LICENSE (original)
+++ subversion/branches/pristine-checksum-kind/LICENSE Fri Dec 6 13:59:05 2024
@@ -367,35 +367,6 @@ subversion/libsvn_subr/x509.h
* 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 (modified) 'linenoise' library in tools/dev/svnmover/linenoise
-
- Copyright (c) 2010-2014, Salvatore Sanfilippo <antirez at gmail dot com>
- Copyright (c) 2010-2013, Pieter Noordhuis <pcnoordhuis at gmail dot com>
-
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice,
- this list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- LIABILITY, WHETHER 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 (modified) LZ4 library files in subversion/libsvn_subr/lz4
LZ4 Library
Modified: subversion/branches/pristine-checksum-kind/Makefile.in
URL:
http://svn.apache.org/viewvc/subversion/branches/pristine-checksum-kind/Makefile.in?rev=1922345&r1=1922344&r2=1922345&view=diff
==============================================================================
--- subversion/branches/pristine-checksum-kind/Makefile.in (original)
+++ subversion/branches/pristine-checksum-kind/Makefile.in Fri Dec 6 13:59:05
2024
@@ -288,6 +288,7 @@ libsvn_diff_LDFLAGS = @libsvn_diff_LDFLA
libsvn_fs_LDFLAGS = @libsvn_fs_LDFLAGS@
libsvn_fs_base_LDFLAGS = @libsvn_fs_base_LDFLAGS@
libsvn_fs_fs_LDFLAGS = @libsvn_fs_fs_LDFLAGS@
+libsvn_fs_x_LDFLAGS = @libsvn_fs_x_LDFLAGS@
libsvn_fs_util_LDFLAGS = @libsvn_fs_util_LDFLAGS@
libsvn_ra_LDFLAGS = @libsvn_ra_LDFLAGS@
libsvn_ra_local_LDFLAGS = @libsvn_ra_local_LDFLAGS@
Modified: subversion/branches/pristine-checksum-kind/NOTICE
URL:
http://svn.apache.org/viewvc/subversion/branches/pristine-checksum-kind/NOTICE?rev=1922345&r1=1922344&r2=1922345&view=diff
==============================================================================
--- subversion/branches/pristine-checksum-kind/NOTICE (original)
+++ subversion/branches/pristine-checksum-kind/NOTICE Fri Dec 6 13:59:05 2024
@@ -1,5 +1,5 @@
Apache Subversion
-Copyright 2022 The Apache Software Foundation
+Copyright 2024 The Apache Software Foundation
This product includes software developed by many people, and distributed
under Contributor License Agreements to The Apache Software Foundation
Modified: subversion/branches/pristine-checksum-kind/build.conf
URL:
http://svn.apache.org/viewvc/subversion/branches/pristine-checksum-kind/build.conf?rev=1922345&r1=1922344&r2=1922345&view=diff
==============================================================================
--- subversion/branches/pristine-checksum-kind/build.conf (original)
+++ subversion/branches/pristine-checksum-kind/build.conf Fri Dec 6 13:59:05
2024
@@ -48,8 +48,6 @@ private-includes =
subversion/bindings/cxx/tests/*.hpp
subversion/bindings/javahl/native/*.hpp
subversion/bindings/javahl/native/jniwrapper/jni_*.hpp
- tools/dev/svnmover/linenoise/linenoise.h
- tools/dev/svnmover/linenoise/linenoise.c
subversion/libsvn_subr/utf8proc/utf8proc_internal.h
subversion/libsvn_subr/utf8proc/utf8proc.c
subversion/libsvn_subr/utf8proc/utf8proc_data.c
@@ -137,7 +135,6 @@ swig-checkout-files = common.swg swigrun
# msvc-libs - additional libraries to link with on Windows
# msvc-export - additional list of files to expose in dsp/vc(x)proj
# msvc-static - visual studio target produces only a static lib
-# msvc-force-static- visual studio always uses static libraries for svn libs
# add-deps - expands to additional autoconf-defined dependencies
# add-install-deps - like add-deps, but for the install step
# external-lib - expands to additional autoconf-defined libs
@@ -153,7 +150,7 @@ libs = libsvn_client libsvn_wc libsvn_ra
apriconv apr
manpages = subversion/svn/svn.1
install = bin
-msvc-libs = setargv.obj
+msvc-libs = wsetargv.obj
# The subversion repository administration tool
[svnadmin]
@@ -163,7 +160,7 @@ path = subversion/svnadmin
install = bin
manpages = subversion/svnadmin/svnadmin.1
libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr apriconv apr
-msvc-libs = setargv.obj
+msvc-libs = wsetargv.obj
# The subversion repository dump filtering tool
[svndumpfilter]
@@ -190,7 +187,7 @@ path = subversion/svnserve
install = bin
manpages = subversion/svnserve/svnserve.8 subversion/svnserve/svnserve.conf.5
libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr libsvn_ra_svn
- apriconv apr sasl
+ apriconv apr aprutil sasl
msvc-libs = advapi32.lib ws2_32.lib
[svnsync]
@@ -249,7 +246,9 @@ type = lib
path = subversion/libsvn_client
libs = libsvn_wc libsvn_ra libsvn_delta libsvn_diff libsvn_subr apriconv apr
install = lib
-msvc-export = svn_client.h private/svn_client_mtcc.h
private/svn_client_private.h private/svn_client_shelf.h
private/svn_client_shelf2.h
+msvc-export = svn_client.h private/svn_client_mtcc.h
private/svn_client_private.h
+ private/svn_client_shelf.h private/svn_client_shelf2.h
+ ../libsvn_client/mergeinfo.h ../libsvn_client/client.h
# Routines for binary diffing and tree-deltas
[libsvn_delta]
@@ -258,7 +257,7 @@ type = lib
install = fsmod-lib
path = subversion/libsvn_delta
libs = libsvn_subr aprutil apriconv apr zlib
-msvc-export = svn_delta.h private/svn_editor.h private/svn_delta_private.h
private/svn_element.h private/svn_branch.h private/svn_branch_compat.h
private/svn_branch_impl.h private/svn_branch_nested.h private/svn_branch_repos.h
+msvc-export = svn_delta.h private/svn_editor.h private/svn_delta_private.h
# Routines for diffing
[libsvn_diff]
@@ -289,7 +288,12 @@ sources = *.c bdb/*.c util/*.c
install = bdb-lib
libs = libsvn_delta libsvn_subr aprutil apriconv apr bdb libsvn_fs_util
add-install-deps = $(SVN_FS_LIB_INSTALL_DEPS)
-msvc-export = ../libsvn_fs_base/fs_init.h
+msvc-export = ../libsvn_fs_base/fs_init.h ../libsvn_fs_base/fs.h
+ ../libsvn_fs_base/id.h ../libsvn_fs_base/key-gen.h
+ ../libsvn_fs_base/lock.h ../libsvn_fs_base/trail.h
+ ../libsvn_fs_base/util/fs_skels.h
../libsvn_fs_base/bdb/changes-table.h
+ ../libsvn_fs_base/bdb/txn-table.h
../libsvn_fs_base/bdb/nodes-table.h
+ ../libsvn_fs_base/bdb/strings-table.h
../libsvn_fs_base/bdb/reps-table.h
msvc-delayload = yes
[libsvn_fs_fs]
@@ -299,7 +303,13 @@ path = subversion/libsvn_fs_fs
install = fsmod-lib
libs = libsvn_delta libsvn_subr aprutil apriconv apr libsvn_fs_util
msvc-export = private/svn_fs_fs_private.h ../libsvn_fs_fs/fs_init.h
+ ../libsvn_fs_fs/fs_fs.h ../libsvn_fs_fs/fs.h
+ ../libsvn_fs_fs/id.h ../libsvn_fs_fs/index.h
+ ../libsvn_fs_fs/low_level.h ../libsvn_fs_fs/pack.h
+ ../libsvn_fs_fs/rep-cache.h ../libsvn_fs_fs/rev_file.h
+ ../libsvn_fs_fs/util.h
msvc-delayload = yes
+msvc-libs = ws2_32.lib
[libsvn_fs_x]
description = Subversion FSX Repository Filesystem Library
@@ -307,8 +317,11 @@ type = fs-module
path = subversion/libsvn_fs_x
install = fsmod-lib
libs = libsvn_delta libsvn_subr aprutil apriconv apr libsvn_fs_util
-msvc-export = ../libsvn_fs_x/fs_init.h
+msvc-export = ../libsvn_fs_x/fs_init.h ../libsvn_fs_x/batch_fsync.h
+ ../libsvn_fs_x/fs_init.h ../libsvn_fs_x/fs_x.h
../libsvn_fs_x/fs.h
+ ../libsvn_fs_x/hotcopy.h ../libsvn_fs_x/reps.h
../libsvn_fs_x/string_table.h
msvc-delayload = yes
+msvc-libs = ws2_32.lib
# Low-level grab bag of utilities
[libsvn_fs_util]
@@ -325,12 +338,12 @@ msvc-export = private/svn_fs_util.h
description = Subversion General Repository Access Library
type = lib
path = subversion/libsvn_ra
-libs = libsvn_delta libsvn_subr ra-libs apriconv apr
+libs = libsvn_delta libsvn_subr ra-libs apriconv apr aprutil
# conditionally add more dependencies
add-deps = $(SVN_RA_LIB_DEPS)
add-install-deps = $(SVN_RA_LIB_INSTALL_DEPS)
install = lib
-msvc-export = svn_ra.h private\svn_ra_private.h
+msvc-export = svn_ra.h private/svn_ra_private.h
msvc-delayload = yes
# Accessing repositories via DAV through serf
@@ -342,6 +355,7 @@ install = serf-lib
libs = libsvn_delta libsvn_subr aprutil apriconv apr serf zlib
add-install-deps = $(SVN_FS_LIB_INSTALL_DEPS)
msvc-static = yes
+msvc-export = ../libsvn_ra_serf/ra_init.h ../libsvn_ra_serf/ra_serf.h
# Accessing repositories via SVN
[libsvn_ra_svn]
@@ -351,6 +365,7 @@ path = subversion/libsvn_ra_svn
install = ramod-lib
libs = libsvn_delta libsvn_subr aprutil apriconv apr sasl
msvc-static = yes
+msvc-export = ../libsvn_ra_svn/ra_init.h svn_ra_svn.h
private/svn_ra_svn_private.h
# Accessing repositories via direct libsvn_fs
[libsvn_ra_local]
@@ -360,6 +375,7 @@ path = subversion/libsvn_ra_local
install = ramod-lib
libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr apriconv apr
msvc-static = yes
+msvc-export = ../libsvn_ra_local/ra_init.h ../libsvn_ra_local/ra_local.h
# Routines built on top of libsvn_fs
[libsvn_repos]
@@ -380,7 +396,7 @@ sources = *.c lz4/*.c
libs = aprutil apriconv apr xml zlib apr_memcache
sqlite magic intl lz4 utf8proc macos-plist macos-keychain
msvc-libs = kernel32.lib advapi32.lib shfolder.lib ole32.lib
- crypt32.lib version.lib
+ crypt32.lib version.lib ws2_32.lib
msvc-export =
svn_auth.h svn_base64.h svn_cache_config.h svn_checksum.h svn_cmdline.h
svn_compat.h svn_config.h svn_ctype.h svn_dirent_uri.h svn_dso.h
@@ -388,19 +404,20 @@ msvc-export =
svn_nls.h svn_opt.h svn_path.h svn_pools.h svn_props.h svn_quoprint.h
svn_sorts.h svn_string.h svn_subst.h svn_time.h svn_types.h svn_user.h
svn_utf.h svn_version.h svn_xml.h svn_x509.h
- private\svn_atomic.h private\svn_cache.h private\svn_cmdline_private.h
- private\svn_debug.h private\svn_error_private.h private\svn_fspath.h
- private\svn_log.h private\svn_mergeinfo_private.h
- private\svn_opt_private.h private\svn_skel.h private\svn_sqlite.h
- private\svn_utf_private.h private\svn_eol_private.h
- private\svn_token.h private\svn_adler32.h
- private\svn_temp_serializer.h private\svn_io_private.h
- private\svn_sorts_private.h private\svn_auth_private.h
- private\svn_string_private.h private\svn_magic.h
- private\svn_subr_private.h private\svn_mutex.h private\svn_task.h
- private\svn_thread_cond.h private\svn_waitable_counter.h
- private\svn_packed_data.h private\svn_object_pool.h private\svn_cert.h
- private\svn_config_private.h private\svn_dirent_uri_private.h
+ private/svn_atomic.h private/svn_cache.h private/svn_cmdline_private.h
+ private/svn_debug.h private/svn_error_private.h private/svn_fspath.h
+ private/svn_log.h private/svn_mergeinfo_private.h
+ private/svn_opt_private.h private/svn_skel.h private/svn_sqlite.h
+ private/svn_utf_private.h private/svn_eol_private.h
+ private/svn_token.h private/svn_adler32.h
+ private/svn_temp_serializer.h private/svn_io_private.h
+ private/svn_sorts_private.h private/svn_auth_private.h
+ private/svn_string_private.h private/svn_magic.h
+ private/svn_subr_private.h private/svn_mutex.h private/svn_task.h
+ private/svn_thread_cond.h private/svn_waitable_counter.h
+ private/svn_packed_data.h private/svn_object_pool.h private/svn_cert.h
+ private/svn_config_private.h private/svn_dirent_uri_private.h
+ ../libsvn_subr/crypto.h
# Working copy management lib
[libsvn_wc]
@@ -409,8 +426,11 @@ type = lib
path = subversion/libsvn_wc
libs = libsvn_delta libsvn_diff libsvn_subr aprutil apriconv apr
install = lib
-msvc-export = svn_wc.h private\svn_wc_private.h
-
+msvc-export = svn_wc.h private/svn_wc_private.h ../libsvn_wc/conflicts.h
+ ../libsvn_wc/lock.h ../libsvn_wc/token-map.h
+ ../libsvn_wc/tree_conflicts.h ../libsvn_wc/wc_db_private.h
+ ../libsvn_wc/wc_db.h ../libsvn_wc/wc-queries.h
+ ../libsvn_wc/wc.h ../libsvn_wc/workqueue.h
# Subversion plugin for Apache's mod_dav
[mod_dav_svn]
description = Subversion plug-in for the Apache DAV module
@@ -447,6 +467,7 @@ type = exe
path = subversion/svnfsfs
install = bin
libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr apriconv apr
+msvc-libs = ws2_32.lib
# ----------------------------------------------------------------------------
#
@@ -785,7 +806,6 @@ sources = fs-base-test.c
install = bdb-test
libs = libsvn_test libsvn_wc libsvn_fs libsvn_fs_base libsvn_delta
libsvn_fs_util libsvn_subr apriconv apr
-msvc-force-static = yes
[strings-reps-test]
description = Test strings/reps in libsvn_fs_base
@@ -795,7 +815,6 @@ sources = strings-reps-test.c
install = bdb-test
libs = libsvn_test libsvn_wc libsvn_fs libsvn_fs_base libsvn_delta
libsvn_subr apriconv apr
-msvc-force-static = yes
[changes-test]
description = Test changes in libsvn_fs_base
@@ -805,7 +824,6 @@ sources = changes-test.c
install = bdb-test
libs = libsvn_test libsvn_wc libsvn_fs libsvn_fs_base libsvn_delta
libsvn_subr apriconv apr
-msvc-force-static = yes
# ----------------------------------------------------------------------------
# Tests for libsvn_fs_fs
@@ -817,7 +835,6 @@ sources = fs-fs-pack-test.c
install = test
libs = libsvn_test libsvn_wc libsvn_fs libsvn_fs_fs libsvn_delta
libsvn_subr apriconv apr
-msvc-force-static = yes
[fs-fs-fuzzy-test]
description = Use fuzzying to test FSFS corruption resilience
@@ -827,17 +844,15 @@ sources = fs-fs-fuzzy-test.c
install = sub-test
libs = libsvn_test libsvn_wc libsvn_fs libsvn_fs_fs libsvn_delta
libsvn_repos libsvn_subr apriconv apr
-msvc-force-static = yes
[fs-fs-private-test]
-description = Test FSSF private API
+description = Test FSFS private API
type = exe
path = subversion/tests/libsvn_fs_fs
sources = fs-fs-private-test.c
install = test
libs = libsvn_test libsvn_wc libsvn_fs libsvn_fs_fs libsvn_delta
libsvn_repos libsvn_subr apriconv apr
-msvc-force-static = yes
# ----------------------------------------------------------------------------
# Tests for libsvn_fs_x
@@ -849,7 +864,6 @@ sources = fs-x-pack-test.c
install = test
libs = libsvn_test libsvn_wc libsvn_fs libsvn_fs_x libsvn_delta
libsvn_subr apriconv apr
-msvc-force-static = yes
[string-table-test]
description = Test fsfs string tables
@@ -858,7 +872,6 @@ path = subversion/tests/libsvn_fs_x
sources = string-table-test.c
install = test
libs = libsvn_test libsvn_wc libsvn_fs_x libsvn_subr apr
-msvc-force-static = yes
# ----------------------------------------------------------------------------
# Tests for libsvn_fs
@@ -870,7 +883,6 @@ path = subversion/tests/libsvn_fs
sources = locks-test.c
install = test
libs = libsvn_test libsvn_wc libsvn_fs libsvn_delta libsvn_subr apriconv apr
-msvc-force-static = yes
[fs-test]
description = Tests in libsvn_fs
@@ -951,7 +963,6 @@ path = subversion/tests/libsvn_subr
sources = checksum-test.c
install = test
libs = libsvn_test libsvn_wc libsvn_subr apr zlib
-msvc-force-static = yes
[compat-test]
description = Test compatibility functions
@@ -976,7 +987,6 @@ path = subversion/tests/libsvn_subr
sources = crypto-test.c
install = test
libs = libsvn_test libsvn_wc libsvn_subr aprutil apr
-msvc-force-static = yes
[dirent_uri-test]
description = Test dirent_uri library
@@ -1223,7 +1233,6 @@ path = subversion/tests/libsvn_client
sources = client-test.c
install = test
libs = libsvn_test libsvn_client libsvn_wc libsvn_repos libsvn_ra libsvn_fs
libsvn_delta libsvn_subr apriconv apr
-msvc-force-static = yes
[mtcc-test]
description = Test Multi Command Context
@@ -1240,7 +1249,6 @@ path = subversion/tests/libsvn_client
sources = conflicts-test.c ../libsvn_wc/utils.c
install = test
libs = libsvn_test libsvn_client libsvn_wc libsvn_repos libsvn_ra libsvn_fs
libsvn_delta libsvn_subr apriconv apr
-msvc-force-static = yes
# ----------------------------------------------------------------------------
# Tests for libsvn_diff
@@ -1295,7 +1303,6 @@ path = subversion/tests/libsvn_wc
sources = conflict-data-test.c utils.c
install = test
libs = libsvn_client libsvn_test libsvn_wc libsvn_subr apriconv apr
-msvc-force-static = yes
[db-test]
description = Test the wc-ng database subsystem
@@ -1304,7 +1311,6 @@ path = subversion/tests/libsvn_wc
sources = db-test.c utils.c
install = test
libs = libsvn_client libsvn_test libsvn_wc libsvn_subr apriconv apr
-msvc-force-static = yes
[pristine-store-test]
description = Test the wc-ng pristine text storage subsystem
@@ -1313,7 +1319,6 @@ path = subversion/tests/libsvn_wc
sources = pristine-store-test.c utils.c
install = test
libs = libsvn_client libsvn_test libsvn_wc libsvn_subr apriconv apr
-msvc-force-static = yes
[entries-compat-test]
description = Test backwards compat for the entry interface
@@ -1322,7 +1327,6 @@ path = subversion/tests/libsvn_wc
sources = entries-compat.c utils.c
install = test
libs = libsvn_client libsvn_test libsvn_wc libsvn_subr apriconv apr
-msvc-force-static = yes
[op-depth-test]
description = Test layered tree changes
@@ -1331,13 +1335,12 @@ path = subversion/tests/libsvn_wc
sources = op-depth-test.c utils.c
install = test
libs = libsvn_client libsvn_test libsvn_wc libsvn_subr apriconv apr
-msvc-force-static = yes
[wc-queries-test]
description = Test Sqlite query evaluation
type = exe
path = subversion/tests/libsvn_wc
-sources = wc-queries-test.c
+sources = wc-queries-test.c ../../libsvn_subr/sqlite3wrapper.c
install = test
libs = libsvn_test libsvn_wc libsvn_subr apriconv apr sqlite
@@ -1348,7 +1351,6 @@ path = subversion/tests/libsvn_wc
sources = wc-test.c utils.c
install = test
libs = libsvn_client libsvn_test libsvn_wc libsvn_subr apriconv apr
-msvc-force-static = yes
# ----------------------------------------------------------------------------
# Tests for the client's internal functions
@@ -1360,7 +1362,6 @@ path = subversion/tests/client
sources = filesize-test.c
install = test
libs = libsvn_client libsvn_test libsvn_wc libsvn_subr apriconv apr
-msvc-force-static = yes
# ----------------------------------------------------------------------------
# These are not unit tests at all, they are small programs that exercise
@@ -1392,7 +1393,6 @@ path = subversion/tests/cmdline
sources = entries-dump.c
install = test
libs = libsvn_wc libsvn_subr apriconv apr
-msvc-force-static = yes
testing = skip
[atomic-ra-revprop-change]
@@ -1417,7 +1417,6 @@ path = subversion/tests/libsvn_wc
sources = wc-lock-tester.c
install = test
libs = libsvn_wc libsvn_subr apriconv apr
-msvc-force-static = yes
testing = skip
[wc-incomplete-tester]
@@ -1426,7 +1425,6 @@ path = subversion/tests/libsvn_wc
sources = wc-incomplete-tester.c
install = test
libs = libsvn_wc libsvn_subr apriconv apr
-msvc-force-static = yes
testing = skip
[svn-wc-db-tester]
@@ -1435,7 +1433,6 @@ path = tools/dev/wc-ng
sources = svn-wc-db-tester.c
install = test
libs = libsvn_wc libsvn_subr apr
-msvc-force-static = yes
testing = skip
# ----------------------------------------------------------------------------
@@ -1576,7 +1573,7 @@ libs = svn svnadmin svndumpfilter svnloo
svnversion
mod_authz_svn mod_dav_svn mod_dontdothat
svnauthz svnauthz-validate svnraisetreeconflict
- svnfsfs svnbench svnmover
+ svnfsfs svnbench
[__ALL_TESTS__]
type = project
@@ -1745,14 +1742,6 @@ sources = x509-parser.c
install = tools
libs = libsvn_subr apr
-[svnmover]
-description = Subversion Mover Command Client
-type = exe
-path = tools/dev/svnmover
-sources = *.c
-libs = libsvn_client libsvn_ra libsvn_subr libsvn_delta apriconv apr
-install = tools
-
[svnconflict]
type = exe
path = tools/client-side/svnconflict
Modified: subversion/branches/pristine-checksum-kind/build/ac-macros/swig.m4
URL:
http://svn.apache.org/viewvc/subversion/branches/pristine-checksum-kind/build/ac-macros/swig.m4?rev=1922345&r1=1922344&r2=1922345&view=diff
==============================================================================
--- subversion/branches/pristine-checksum-kind/build/ac-macros/swig.m4
(original)
+++ subversion/branches/pristine-checksum-kind/build/ac-macros/swig.m4 Fri Dec
6 13:59:05 2024
@@ -116,7 +116,7 @@ AC_DEFUN(SVN_DETERMINE_SWIG_OPTS,
SWIG_PY_OPTS="none"
SWIG_PY_ERRMSG="check config.log for details"
if test "$SWIG_PY_PYTHON" = "none"; then
- SWIG_PY_ERRMSG="You specfied not to build Python bindings or \
+ SWIG_PY_ERRMSG="You specified not to build Python bindings or \
suitable Python interpreter is not found."
else
if test "$SWIG" = "none"; then
@@ -217,7 +217,7 @@ suitable Python interpreter is not found
SWIG_PL_ERRMSG="check config.log for details"
if test "$SWIG_PL_PERL" = "none"; then
- SWIG_PL_ERRMSG="You specfied not to build Perl bindings or \
+ SWIG_PL_ERRMSG="You specified not to build Perl bindings or \
suitable Perl interpreter is not found."
else
if test "$SWIG" = "none"; then
@@ -246,12 +246,16 @@ suitable Perl interpreter is not found."
SWIG_RB_LINK="none"
SWIG_RB_ERRMSG="check config.log for details"
if test "$SWIG_RB_RUBY" = "none"; then
- SWIG_RB_ERRMSG="You specfied not to build Ruby bindings or \
+ SWIG_RB_ERRMSG="You specified not to build Ruby bindings or \
suitable Ruby interpreter is not found."
else
if test "$SWIG" = "none"; then
AC_MSG_WARN([You specified to build SWIG Ruby bindings, but SWIG is
not found.])
SWIG_RB_ERRMSG="SWIG is need to build SWIG Ruby bindings, but it is
not found."
+ elif test x"$SWIG_VERSION" = x"4""02""000"; then
+ ruby_swig_issue_2751='https://github.com/swig/swig/issues/2751'
+ AC_MSG_WARN([Ruby bindings cannot be built with swig 4.2.0; see
$ruby_swig_issue_2751])
+ SWIG_RB_ERRMSG="SWIG 4.2.0 was found but it cannot be used for
building SWIG Ruby bindings."
else
if test x"$SWIG_VERSION" = x"3""00""008"; then
# Use a local variable to escape the '#' sign.
@@ -382,7 +386,7 @@ int main()
SWIG_PY_OPTS="none"
SWIG_PY_ERRMSG="check config.log for details"
if test "$SWIG_PY_PYTHON" = "none"; then
- SWIG_PY_ERRMSG="You specfied not to build Python bindings or \
+ SWIG_PY_ERRMSG="You specified not to build Python bindings or \
suitable Python interpreter is not found."
else
AC_MSG_NOTICE([Configuring python swig binding])
@@ -439,7 +443,7 @@ suitable Python interpreter is not found
SWIG_PL_ERRMSG="check config.log for details"
if test "$SWIG_PL_PERL" = "none"; then
- SWIG_PL_ERRMSG="You specfied not to build Perl bindings or \
+ SWIG_PL_ERRMSG="You specified not to build Perl bindings or \
suitable Perl interpreter is not found."
else
AC_MSG_CHECKING([perl version])
@@ -463,7 +467,7 @@ suitable Perl interpreter is not found."
SWIG_RB_LINK="none"
SWIG_RB_ERRMSG="check config.log for details"
if test "$SWIG_RB_RUBY" = "none"; then
- SWIG_RB_ERRMSG="You specfied not to build Ruby bindings or \
+ SWIG_RB_ERRMSG="You specified not to build Ruby bindings or \
suitable Ruby interpreter is not found."
else
rbconfig="$SWIG_RB_RUBY -rrbconfig -e "
Modified:
subversion/branches/pristine-checksum-kind/build/generator/extractor.py
URL:
http://svn.apache.org/viewvc/subversion/branches/pristine-checksum-kind/build/generator/extractor.py?rev=1922345&r1=1922344&r2=1922345&view=diff
==============================================================================
--- subversion/branches/pristine-checksum-kind/build/generator/extractor.py
(original)
+++ subversion/branches/pristine-checksum-kind/build/generator/extractor.py Fri
Dec 6 13:59:05 2024
@@ -33,7 +33,7 @@ import re
# or
# void svn_foo_bar (args)
#
-_funcs = re.compile(r'^(?:(?:(?:\w+|\*) )+\*?)?((?:svn|apr)_[a-z_0-9]+)\s*\(',
re.M)
+_funcs = re.compile(r'^(?:(?:(?:\w+|\*)
)+\*?)?((?:svn|apr)_[A-Za-z0-9_]+)\s*\(', re.M)
def extract_funcs(fname):
funcs = [ ]
@@ -57,6 +57,9 @@ _filter_names = [
'svn_auth_kwallet_version',
'svn_auth_get_gpg_agent_simple_provider',
'svn_auth_gpg_agent_version',
+
+ # Unavailable in release mode
+ 'svn_fs_base__trail_debug',
]
if __name__ == '__main__':
@@ -67,6 +70,8 @@ if __name__ == '__main__':
for func in extract_funcs(fname):
print(func)
if os.path.basename(fname) == 'svn_ctype.h':
+ # See libsvn_subr/ctype.c for an explanation why we use CONSTANT and not
+ # DATA, even though it causes an LNK4087 warning!
print('svn_ctype_table = svn_ctype_table_internal CONSTANT')
elif os.path.basename(fname) == 'svn_wc_private.h':
# svn_wc__internal_walk_children() is now internal to libsvn_wc
Modified: subversion/branches/pristine-checksum-kind/build/generator/gen_base.py
URL:
http://svn.apache.org/viewvc/subversion/branches/pristine-checksum-kind/build/generator/gen_base.py?rev=1922345&r1=1922344&r2=1922345&view=diff
==============================================================================
--- subversion/branches/pristine-checksum-kind/build/generator/gen_base.py
(original)
+++ subversion/branches/pristine-checksum-kind/build/generator/gen_base.py Fri
Dec 6 13:59:05 2024
@@ -658,13 +658,11 @@ class TargetExe(TargetLinked):
self.manpages = options.get('manpages', '')
self.testing = options.get('testing')
- self.msvc_force_static = options.get('msvc-force-static') == 'yes'
-
def add_dependencies(self):
TargetLinked.add_dependencies(self)
# collect test programs
- if 'svnauthz' in self.name or 'svnmover' in self.name: # special case
+ if 'svnauthz' in self.name: # special case
self.gen_obj.test_deps.append(self.filename)
self.gen_obj.test_helpers.append(self.filename)
elif self.install == 'test':
Modified: subversion/branches/pristine-checksum-kind/build/generator/gen_win.py
URL:
http://svn.apache.org/viewvc/subversion/branches/pristine-checksum-kind/build/generator/gen_win.py?rev=1922345&r1=1922344&r2=1922345&view=diff
==============================================================================
--- subversion/branches/pristine-checksum-kind/build/generator/gen_win.py
(original)
+++ subversion/branches/pristine-checksum-kind/build/generator/gen_win.py Fri
Dec 6 13:59:05 2024
@@ -241,21 +241,6 @@ class WinGeneratorBase(gen_win_dependenc
dll_targets.append(self.create_dll_target(target))
install_targets.extend(dll_targets)
- # Fix up targets that can't be linked to libraries
- if not self.disable_shared:
- for target in install_targets:
- if isinstance(target, gen_base.TargetExe) and target.msvc_force_static:
-
- # Make direct dependencies of all the indirect dependencies
- linked_deps = {}
- self.get_linked_win_depends(target, linked_deps)
-
- for lk in linked_deps.keys():
- if not isinstance(lk, gen_base.TargetLib) or not lk.msvc_export:
- self.graph.add(gen_base.DT_LINK, target.name, lk)
- else:
- self.graph.remove(gen_base.DT_LINK, target.name, lk)
-
for target in install_targets:
target.project_guid = self.makeguid(target.name)
@@ -574,7 +559,7 @@ class WinGeneratorBase(gen_win_dependenc
# This section parses those dependencies and adds them to the dependency
list
# for this target.
if name.startswith('javahl') or name == 'libsvnjavahl':
- for dep in re.findall('\$\(([^\)]*)_DEPS\)', target.add_deps):
+ for dep in re.findall(r'\$\(([^\)]*)_DEPS\)', target.add_deps):
dep = dep.replace('_', '-')
depends.extend(self.sections[dep].get_targets())
@@ -728,7 +713,7 @@ class WinGeneratorBase(gen_win_dependenc
for dep in self.get_win_depends(target, FILTER_EXTERNALLIBS):
if dep.external_lib:
- for elib in re.findall('\$\(SVN_([^\)]*)_LIBS\)', dep.external_lib):
+ for elib in re.findall(r'\$\(SVN_([^)]*)_LIBS\)', dep.external_lib):
external_lib = elib.lower()
if external_lib in self._libraries:
@@ -758,7 +743,7 @@ class WinGeneratorBase(gen_win_dependenc
for dep in self.get_win_depends(target, FILTER_EXTERNALLIBS):
if dep.external_lib:
- for elib in re.findall('\$\(SVN_([^\)]*)_LIBS\)', dep.external_lib):
+ for elib in re.findall(r'\$\(SVN_([^)]*)_LIBS\)', dep.external_lib):
external_lib = elib.lower()
if external_lib in self._libraries:
@@ -833,7 +818,7 @@ class WinGeneratorBase(gen_win_dependenc
for dep in self.get_win_depends(target, FILTER_LIBS):
if dep.external_lib:
- for elib in re.findall('\$\(SVN_([^\)]*)_LIBS\)', dep.external_lib):
+ for elib in re.findall(r'\$\(SVN_([^)]*)_LIBS\)', dep.external_lib):
external_lib = elib.lower()
if external_lib not in self._libraries:
@@ -887,7 +872,7 @@ class WinGeneratorBase(gen_win_dependenc
nondeplibs.extend(dep.msvc_libs)
if dep.external_lib:
- for elib in re.findall('\$\(SVN_([^\)]*)_LIBS\)', dep.external_lib):
+ for elib in re.findall(r'\$\(SVN_([^)]*)_LIBS\)', dep.external_lib):
external_lib = elib.lower()
@@ -938,7 +923,7 @@ class WinGeneratorBase(gen_win_dependenc
for dep in self.get_win_depends(target, FILTER_EXTERNALLIBS):
if dep.external_lib:
- for elib in re.findall('\$\(SVN_([^\)]*)_LIBS\)', dep.external_lib):
+ for elib in re.findall(r'\$\(SVN_([^)]*)_LIBS\)', dep.external_lib):
external_lib = elib.lower()
if external_lib in self._libraries:
Modified:
subversion/branches/pristine-checksum-kind/build/generator/gen_win_dependencies.py
URL:
http://svn.apache.org/viewvc/subversion/branches/pristine-checksum-kind/build/generator/gen_win_dependencies.py?rev=1922345&r1=1922344&r2=1922345&view=diff
==============================================================================
---
subversion/branches/pristine-checksum-kind/build/generator/gen_win_dependencies.py
(original)
+++
subversion/branches/pristine-checksum-kind/build/generator/gen_win_dependencies.py
Fri Dec 6 13:59:05 2024
@@ -235,22 +235,22 @@ class GenDependenciesBase(gen_base.Gener
elif opt == '-D':
self.cpp_defines.append(val)
elif opt == '--vsnet-version':
- if val == '2002' or re.match('^7(\.\d+)?$', val):
+ if val == '2002' or re.match(r'^7(\.\d+)?$', val):
self.vs_version = '2002'
self.sln_version = '7.00'
self.vcproj_version = '7.00'
self.vcproj_extension = '.vcproj'
- elif val == '2003' or re.match('^8(\.\d+)?$', val):
+ elif val == '2003' or re.match(r'^8(\.\d+)?$', val):
self.vs_version = '2003'
self.sln_version = '8.00'
self.vcproj_version = '7.10'
self.vcproj_extension = '.vcproj'
- elif val == '2005' or re.match('^9(\.\d+)?$', val):
+ elif val == '2005' or re.match(r'^9(\.\d+)?$', val):
self.vs_version = '2005'
self.sln_version = '9.00'
self.vcproj_version = '8.00'
self.vcproj_extension = '.vcproj'
- elif val == '2008' or re.match('^10(\.\d+)?$', val):
+ elif val == '2008' or re.match(r'^10(\.\d+)?$', val):
self.vs_version = '2008'
self.sln_version = '10.00'
self.vcproj_version = '9.00'
@@ -290,14 +290,14 @@ class GenDependenciesBase(gen_base.Gener
self.sln_version = '12.00'
self.vcproj_version = '14.3'
self.vcproj_extension = '.vcxproj'
- elif re.match('^20\d+$', val):
+ elif re.match(r'^20\d+$', val):
print('WARNING: Unknown VS.NET version "%s",'
' assuming VS2012. Your VS can probably upgrade')
self.vs_version = '2012'
self.sln_version = '12.00'
self.vcproj_version = '11.0'
self.vcproj_extension = '.vcxproj'
- elif re.match('^1\d+$', val):
+ elif re.match(r'^1\d+$', val):
self.vs_version = val
self.sln_version = '12.00'
self.vcproj_version = val + '.0'
@@ -769,11 +769,11 @@ class GenDependenciesBase(gen_base.Gener
txt = open(version_file_path).read()
vermatch = re.search(
- r'^\s*#define\s+ZLIB_VERSION\s+"(\d+)\.(\d+)\.(\d+)(?:\.\d)?"',
+ r'^\s*#define\s+ZLIB_VERSION\s+"(\d+(?:\.\d+){1,3})(?:-\w+)?"',
txt, re.M)
- version = tuple(map(int, vermatch.groups()))
- self.zlib_version = '%d.%d.%d' % version
+ version = tuple(map(int, vermatch.group(1).split('.')))
+ self.zlib_version = '.'.join(map(str, version))
if version < minimal_zlib_version:
sys.stderr.write("ERROR: ZLib %s or higher is required "
@@ -935,6 +935,11 @@ class GenDependenciesBase(gen_base.Gener
def _find_perl(self, show_warnings):
"Find the right perl library name to link swig bindings with"
+ try:
+ subprocess.run(['perl', '-v'], capture_output=True)
+ except OSError:
+ return # not found, permission error, ...
+
fp = os.popen('perl -MConfig -e ' + escape_shell_arg(
'print "$Config{libperl}\\n"; '
'print "$Config{PERL_REVISION}.$Config{PERL_VERSION}.'
@@ -974,6 +979,11 @@ class GenDependenciesBase(gen_base.Gener
def _find_ruby(self, show_warnings):
"Find the right Ruby library name to link swig bindings with"
+ try:
+ subprocess.run(['ruby', '--version'], capture_output=True)
+ except OSError:
+ return # not found, permission error, ...
+
lib_dir = None
inc_dirs = []
@@ -1045,12 +1055,13 @@ class GenDependenciesBase(gen_base.Gener
"Find the appropriate options for creating SWIG-based Python modules"
try:
- from distutils import sysconfig
-
- inc_dir = sysconfig.get_python_inc()
- lib_dir = os.path.join(sysconfig.PREFIX, "libs")
+ import sysconfig
except ImportError:
return
+ config_vars = sysconfig.get_config_vars()
+ inc_dir = config_vars['INCLUDEPY']
+ base_dir = config_vars.get('installed_base') or config_vars.get('base')
+ lib_dir = os.path.join(base_dir, 'libs')
if sys.version_info[0] >= 3:
if self.swig_version < (3, 0, 10):
Modified:
subversion/branches/pristine-checksum-kind/build/generator/swig/__init__.py
URL:
http://svn.apache.org/viewvc/subversion/branches/pristine-checksum-kind/build/generator/swig/__init__.py?rev=1922345&r1=1922344&r2=1922345&view=diff
==============================================================================
--- subversion/branches/pristine-checksum-kind/build/generator/swig/__init__.py
(original)
+++ subversion/branches/pristine-checksum-kind/build/generator/swig/__init__.py
Fri Dec 6 13:59:05 2024
@@ -72,7 +72,7 @@ class Generator:
if not self._swigVersion:
swig_version = subprocess.check_output([self.swig_path,
"-version"]).decode('utf8')
- m = re.search("Version (\d+).(\d+).(\d+)", swig_version)
+ m = re.search(r"Version (\d+).(\d+).(\d+)", swig_version)
if m:
self._swigVersion = tuple(map(int, m.groups()))
else:
Modified: subversion/branches/pristine-checksum-kind/build/get-py-info.py
URL:
http://svn.apache.org/viewvc/subversion/branches/pristine-checksum-kind/build/get-py-info.py?rev=1922345&r1=1922344&r2=1922345&view=diff
==============================================================================
--- subversion/branches/pristine-checksum-kind/build/get-py-info.py (original)
+++ subversion/branches/pristine-checksum-kind/build/get-py-info.py Fri Dec 6
13:59:05 2024
@@ -44,15 +44,24 @@ if len(sys.argv) != 2:
usage()
try:
- from distutils import sysconfig
+ if sys.version_info[0] == 2:
+ from distutils import sysconfig
+ get_include = lambda: sysconfig.get_python_inc()
+ get_platinclude = lambda: sysconfig.get_python_inc(plat_specific=1)
+ get_purelib = lambda: sysconfig.get_python_lib()
+ else:
+ import sysconfig
+ get_include = lambda: sysconfig.get_path('include')
+ get_platinclude = lambda: sysconfig.get_path('platinclude')
+ get_purelib = lambda: sysconfig.get_path('purelib')
except ImportError:
# No information available
print("none")
sys.exit(1)
if sys.argv[1] == '--includes':
- inc = sysconfig.get_python_inc()
- plat = sysconfig.get_python_inc(plat_specific=1)
+ inc = get_include()
+ plat = get_platinclude()
if inc == plat:
print("-I" + inc)
else:
@@ -140,7 +149,7 @@ if sys.argv[1] == '--libs':
sys.exit(0)
if sys.argv[1] == '--site':
- print(sysconfig.get_python_lib())
+ print(get_purelib())
sys.exit(0)
usage()
Modified: subversion/branches/pristine-checksum-kind/build/run_tests.py
URL:
http://svn.apache.org/viewvc/subversion/branches/pristine-checksum-kind/build/run_tests.py?rev=1922345&r1=1922344&r2=1922345&view=diff
==============================================================================
--- subversion/branches/pristine-checksum-kind/build/run_tests.py (original)
+++ subversion/branches/pristine-checksum-kind/build/run_tests.py Fri Dec 6
13:59:05 2024
@@ -24,8 +24,8 @@
#
'''usage: python run_tests.py
- [--verbose] [--log-to-stdout] [--cleanup] [--bin=<path>]
- [--parallel | --parallel=<n>] [--global-scheduler]
+ [--verbose] [--log-to-stdout] [--cleanup] [--tools-bin=<path>]
+ [--bin=<path>] [--parallel | --parallel=<n>] [--global-scheduler]
[--url=<base-url>] [--http-library=<http-library>] [--enable-sasl]
[--fs-type=<fs-type>] [--fsfs-packing] [--fsfs-sharding=<n>]
[--list] [--milestone-filter=<regex>] [--mode-filter=<type>]
@@ -285,6 +285,8 @@ class TestHarness:
cmdline.append('--parallel')
else:
cmdline.append('--parallel-instances=%d' % self.opts.parallel)
+ if self.opts.tools_bin is not None:
+ cmdline.append('--tools-bin=%s' % self.opts.tools_bin)
if self.opts.svn_bin is not None:
cmdline.append('--bin=%s' % self.opts.svn_bin)
if self.opts.url is not None:
@@ -1034,17 +1036,19 @@ class TestHarness:
def create_parser():
- def set_log_level(option, opt, value, parser, level=None):
- if level is None:
- level = value
- parser.values.set_log_level = getattr(logging, level, None) or int(level)
+ def set_log_level(option, opt, value, parser):
+ if value.isdigit():
+ value = int(value)
+ else:
+ value = getattr(logging, value)
+ parser.values.set_log_level = value
parser = optparse.OptionParser(usage=__doc__);
parser.add_option('-l', '--list', action='store_true', dest='list_tests',
help='Print test doc strings instead of running them')
- parser.add_option('-v', '--verbose', action='callback',
- callback=set_log_level, callback_args=(logging.DEBUG, ),
+ parser.add_option('-v', '--verbose', action='store_const',
+ dest='set_log_level', const=logging.DEBUG,
help='Print binary command-lines')
parser.add_option('-c', '--cleanup', action='store_true',
help='Clean up after successful tests')
@@ -1060,6 +1064,8 @@ def create_parser():
help="Make svn use this DAV library (neon or serf)")
parser.add_option('--bin', action='store', dest='svn_bin',
help='Use the svn binaries installed in this path')
+ parser.add_option('--tools-bin', action='store', dest='tools_bin',
+ help='Use the svn tools installed in this path')
parser.add_option('--fsfs-sharding', action='store', type='int',
help='Default shard size (for fsfs)')
parser.add_option('--fsfs-packing', action='store_true',
Modified: subversion/branches/pristine-checksum-kind/build/transform_sql.py
URL:
http://svn.apache.org/viewvc/subversion/branches/pristine-checksum-kind/build/transform_sql.py?rev=1922345&r1=1922344&r2=1922345&view=diff
==============================================================================
--- subversion/branches/pristine-checksum-kind/build/transform_sql.py (original)
+++ subversion/branches/pristine-checksum-kind/build/transform_sql.py Fri Dec
6 13:59:05 2024
@@ -50,7 +50,7 @@ class Processor(object):
# a few SQL comments that act as directives for this transform system
re_format = re.compile('-- *format: *([0-9]+)')
- re_statement = re.compile('-- *STMT_([A-Z_0-9]+)( +\(([^\)]*)\))?')
+ re_statement = re.compile(r'-- *STMT_([A-Z_0-9]+)( +\(([^)]*)\))?')
re_include = re.compile('-- *include: *([-a-z]+)')
re_define = re.compile('-- *define: *([A-Z_0-9]+)')
Modified: subversion/branches/pristine-checksum-kind/configure.ac
URL:
http://svn.apache.org/viewvc/subversion/branches/pristine-checksum-kind/configure.ac?rev=1922345&r1=1922344&r2=1922345&view=diff
==============================================================================
--- subversion/branches/pristine-checksum-kind/configure.ac (original)
+++ subversion/branches/pristine-checksum-kind/configure.ac Fri Dec 6 13:59:05
2024
@@ -872,21 +872,18 @@ fi
dnl plaintext passwords -------------------
AC_ARG_ENABLE(plaintext-password-storage,
-AS_HELP_STRING([--enable-plaintext-password-storage],
- [Enable on-disk caching of plaintext passwords and passphrases.
- (Enabling this functionality will not force Subversion
+AS_HELP_STRING([--disable-plaintext-password-storage],
+ [Disable on-disk caching of plaintext passwords and passphrases.
+ (Leaving this functionality enabled will not force Subversion
to store passwords in plaintext, but does permit users to
explicitly allow that behavior via runtime configuration.)]),
-[plaintext_passwordd_storage="$enableval"],
-[plaintext_passwordd_storage="no"])
-
-if test "$plaintext_passwordd_storage" = "yes"; then
- AC_MSG_WARN([Enabling plaintext password/passphrase storage])
-else
- AC_MSG_NOTICE([Disabling plaintext password/passphrase storage])
- AC_DEFINE(SVN_DISABLE_PLAINTEXT_PASSWORD_STORAGE, 1,
- [Defined if plaintext password/passphrase storage is disabled])
-fi
+[
+ if test "$enableval" = "no"; then
+ AC_MSG_NOTICE([Disabling plaintext password/passphrase storage])
+ AC_DEFINE(SVN_DISABLE_PLAINTEXT_PASSWORD_STORAGE, 1,
+ [Defined if plaintext password/passphrase storage is disabled])
+ fi
+])
dnl Build and install rules -------------------
@@ -1028,6 +1025,7 @@ AC_SUBST([libsvn_diff_LDFLAGS])
AC_SUBST([libsvn_fs_LDFLAGS])
AC_SUBST([libsvn_fs_base_LDFLAGS])
AC_SUBST([libsvn_fs_fs_LDFLAGS])
+AC_SUBST([libsvn_fs_x_LDFLAGS])
AC_SUBST([libsvn_fs_util_LDFLAGS])
AC_SUBST([libsvn_ra_LDFLAGS])
AC_SUBST([libsvn_ra_local_LDFLAGS])
@@ -1494,22 +1492,22 @@ AS_HELP_STRING([--enable-runtime-module-
fi
AC_DEFINE(SVN_USE_DSO, 1,
[Defined if svn should try to load DSOs])
-
- dnl Mac OS X uses libname.MAJOR.SOVERSION.dylib
- dnl Most other unixes use libname.MAJOR.so.SOVERSION
- case "$host" in
- *-*-darwin*)
- AC_DEFINE(SVN_DSO_SUFFIX_FMT, ["%d.%d.dylib"],
- [Shared library file name suffix format])
- ;;
- *)
- AC_DEFINE(SVN_DSO_SUFFIX_FMT, ["%d.so.%d"],
- [Shared library file name suffix format])
- ;;
- esac
fi
])
+dnl Mac OS X uses libname.MAJOR.SOVERSION.dylib
+dnl Most other unixes use libname.MAJOR.so.SOVERSION
+case "$host" in
+ *-*-darwin*)
+ AC_DEFINE(SVN_DSO_SUFFIX_FMT, ["%d.%d.dylib"],
+ [Shared library file name suffix format])
+ ;;
+ *)
+ AC_DEFINE(SVN_DSO_SUFFIX_FMT, ["%d.so.%d"],
+ [Shared library file name suffix format])
+ ;;
+esac
+
if test "$svn_enable_shared" = "no" || test "$use_dso" != "yes"; then
AC_DEFINE(SVN_LIBSVN_RA_LINKS_RA_LOCAL, 1,
[Defined if libsvn_ra should link against libsvn_ra_local])
@@ -1766,7 +1764,6 @@ done
SVN_CONFIG_SCRIPT(tools/backup/hot-backup.py)
SVN_CONFIG_SCRIPT(tools/hook-scripts/commit-access-control.pl)
-SVN_CONFIG_SCRIPT(subversion/tests/cmdline/svneditor.sh)
SVN_CONFIG_SCRIPT(subversion/bindings/swig/perl/native/Makefile.PL)
if test -e packages/solaris/pkginfo.in; then
SVN_CONFIG_SCRIPT(packages/solaris/pkginfo)
Modified:
subversion/branches/pristine-checksum-kind/contrib/client-side/svn_apply_autoprops.py
URL:
http://svn.apache.org/viewvc/subversion/branches/pristine-checksum-kind/contrib/client-side/svn_apply_autoprops.py?rev=1922345&r1=1922344&r2=1922345&view=diff
==============================================================================
---
subversion/branches/pristine-checksum-kind/contrib/client-side/svn_apply_autoprops.py
(original)
+++
subversion/branches/pristine-checksum-kind/contrib/client-side/svn_apply_autoprops.py
Fri Dec 6 13:59:05 2024
@@ -1,4 +1,5 @@
#!/usr/bin/env python
+# coding=utf-8
# To do:
# 1) Switch to using the Subversion Python bindings.
@@ -27,11 +28,15 @@
import getopt
import fnmatch
import os
+import platform
import re
+import subprocess
import sys
# The default path to the Subversion configuration file.
-SVN_CONFIG_FILENAME = os.path.expandvars('$HOME/.subversion/config')
+SVN_CONFIG_FILENAME = os.path.expandvars(
+ r'%APPDATA%\Subversion\config' if platform.system() == 'Windows'
+ else '$HOME/.subversion/config')
# The name of Subversion's private directory in working copies.
SVN_WC_ADM_DIR_NAME = '.svn'
@@ -63,10 +68,10 @@ def get_autoprop_lines(fd):
lines = []
reading_autoprops = 0
- re_start_autoprops = re.compile('^\s*\[auto-props\]\s*')
- re_end_autoprops = re.compile('^\s*\[\w+\]\s*')
+ re_start_autoprops = re.compile(r'^\s*\[auto-props\]\s*')
+ re_end_autoprops = re.compile(r'^\s*\[\w+\]\s*')
- for line in fd.xreadlines():
+ for line in fd:
if reading_autoprops:
if re_end_autoprops.match(line):
reading_autoprops = 0
@@ -111,7 +116,7 @@ def process_autoprop_lines(lines):
prop_value = prop_value.strip()
except ValueError:
prop_name = prop
- prop_value = '*'
+ prop_value = 'ON'
if len(prop_name):
props_list += [(prop_name, prop_value)]
@@ -119,13 +124,14 @@ def process_autoprop_lines(lines):
return result
-def filter_walk(autoprop_lines, dirname, filenames):
+def filter_walk(autoprop_lines, dirname, dirnames, filenames):
# Do not descend into a .svn directory.
try:
- filenames.remove(SVN_WC_ADM_DIR_NAME)
+ dirnames.remove(SVN_WC_ADM_DIR_NAME)
except ValueError:
pass
+ filenames += dirnames
filenames.sort()
# Find those filenames that match each fnmatch.
@@ -142,9 +148,11 @@ def filter_walk(autoprop_lines, dirname,
for prop in prop_list:
command = ['svn', 'propset', prop[0], prop[1]]
for f in matching_filenames:
+ if '@' in f:
+ f += '@'
command += ["%s/%s" % (dirname, f)]
- status = os.spawnvp(os.P_WAIT, 'svn', command)
+ status = subprocess.call(command)
if status:
print('Command %s failed with exit status %s' \
% (command, status))
@@ -177,7 +185,7 @@ def main():
return 1
try:
- fd = file(config_filename)
+ fd = open(config_filename)
except IOError:
print("Cannot open svn configuration file '%s' for reading: %s" \
% (config_filename, sys.exc_value.strerror))
@@ -189,7 +197,8 @@ def main():
autoprop_lines = process_autoprop_lines(autoprop_lines)
- os.path.walk(wc_path, filter_walk, autoprop_lines)
+ for root, dirs, files in os.walk(wc_path):
+ filter_walk(autoprop_lines, root, dirs, files)
if __name__ == '__main__':
sys.exit(main())
