Checkout Tools
  • last updated 4 hours ago
Constraints: committers
Constraints: files
Constraints: dates

Changeset 1560864 is being indexed.

On further thought just remove support for ASM Zlib entirely.

Since the ASM implementations of Zlib have bugs that we run into there's

no reason anyone should use them. If that changes we can revert this

in the future.


(_usage_exit, __main__): Remove enable-ml option.

* build/generator/

(GenDependenciesBase.parse_options): Remove enable-ml option

(GenDependenciesBase._find_ml): Remove

(GenDependenciesBase._find_zlib): Remove call to _find_ml

* build/generator/

(WinGeneratorBase.__init__, WinGeneratorBase.write_zlib_project_file):

remove use_ml from data sent to ezt.

* build/generator/templates/build_zlib.ezt

(): Remove the code to use the assembler from bat file

Note to self: next time, try to make a trivial documentation change in one go.

* subversion/include/svn_ra.h (svn_ra_open_tunnel_func_t):

Fix typo and tweak the docstring a bit more.

* subversion/include/svn_ra.h (svn_ra_open_tunnel_func_t):

Fix wrong docstring that was left over from an earlier iteration

of the API.

[Reverted in r1585516]

When hotcopying non-sharded repositories, checkpoint the progress after

every revision. This is not strictly necessary and adds a performance

penalty but improves behavior if we re-run hotcopy after cancelling a

previous one.

* subversion/libsvn_fs_fs/hotcopy.c

(hotcopy_body): Checkpoint "current" after each rev in non-sharded reps

and give a detailed rationale.

* branches/1.7.x/STATUS: Vote for r1560690.

* branches/1.8.x/STATUS: Vote for r1560690, r1560701.

* STATUS: Nominate r1560690.
* STATUS: Nominate r1560690, r1560701
Follow up to r1560690: add a test case for copying relocated sources.

* subversion/tests/cmdline/ Import 'sys'.

(copy_relocate): New test case.

(test_list): Add copy_relocate.

Patch by: rhuijben (tweaked by me)

* subversion/libsvn_wc/wc_db.c

(db_op_copy): Properly convert the repository id to copy from when

performing a wc-wc copy between separate working copy databases.

Remove some rep-cache validation code that was not used. Change an

error to that expected by the caller, this will cause commits that

would previously have succeeded, and thus hidden the potential

future corruption, to fail.

* subversion/libsvn_fs_fs/rep-cache.c

(rep_has_been_born): Remove.

(svn_fs_fs__get_rep_reference): Return SVN_ERR_FS_CORRUPT as expected

by caller.

(svn_fs_fs__set_rep_reference): Remove parameter that is always false.

* subversion/libsvn_fs_fs/rep-cache.h

(svn_fs_fs__get_rep_reference): Document error.

(svn_fs_fs__set_rep_reference): Remove parameter, document error.

* subversion/libsvn_fs_fs/transaction.c

(write_reps_to_cache): Adjust call.

Add two tests for 'svnadmin recover/hotcopy' failing with non-empty old FSFS

repositories (--compatible-version=1.3 / 1.2 / 1.1).

* subversion/tests/cmdline/

(recover_old): Rename this...

(recover_old_empty): this. This helps to distinguish between old and

new tests for similiar cases. Tweak the docstring for consistency.

(fsfs_recover_old_non_empty): New test for the erroneous 'svnadmin recover'

behavior. Marked as XFail.

(fsfs_hotcopy_old_non_empty): New test for the erroneous 'svnadmin hotcopy'

behavior. Marked as XFail.

(test_list): Add references to new tests and update reference to the

renamed test.

Patch by: Evgeny Kotkov <evgeny.kotkov{_AT_}>

* subversion/libsvn_ra_serf/commit.c

(apply_textdelta): Remove obsolete part of comment.

* build/generator/

(_find_apr): Explicitly check for install location, to avoid

setting wrong values in fallback scenario.

Permit building with apr-2 (aka trunk).

* build/ac-macros/apr.m4

(SVN_LIB_APR): Add major 2 to the list of acceptable majors.

Followup to r1560558, unbreak builds with installed APR/APR-util builds.

* build/generator/


GenDependenciesBase._find_apr_util_and_expat): Need both tests since the

debug_dll_dir will be None with binary installs.

Don't fail when apr and apr-util only have Release mode built.

* build/generator/


GenDependenciesBase._find_apr_util_and_expat): Check that the directory

exists before trying to get the files in the directory.

* build/generator/

(GenDependenciesBase._find_ml): Add a warning to discourage the use of

ASM sources with ZLib.

* tools/dev/ Use stable URL for zlib.

* CHANGES: Remove an entry I forgot to remove and fix grammar

Following up on r1558470, only enable the sqlite errorlog in C tests when

a new --sqlite-logging argument is passed. This disables the option during

normal test runs.

* subversion/tests/svn_test_main.c

(test_options_e): Name enum and add value.

(cl_options): Add and document option.

(main): Only enable logging when explicitly requested.

Expose the inheritable server-side configuration property names in JavaHL.

* subversion/bindings/javahl/src/org/apache/subversion/javahl/types/


* CHANGES: Fix names of RA tunnel management callbacks and mention the

check_tunnel_func callback, too.

* CHANGES: Fix typos in 1.9.0 section.

* CHANGES: Fill in 1.9.0 entries up to r1560112.

Use the new mergeinfo-mod flag to speed up other loggy operations.

* subversion/libsvn_repos/rev_hunt.c

(get_merged_mergeinfo): Shortcut if we know for sure that there is no

mergeinfo change.

Follow-up on r1559912: Docstring & formatting fixes.

No functional change.

* subversion/include/svn_fs.h

(svn_fs_path_change2_t): Mark new stuct member as 'new in 1.9'.

* subversion/libsvn_fs_fs/low_level.c

(write_change_entry): Fix indentation.

* tools/dev/unix-build/Makefile.svn: Update my custom build script, and in

turn the bb-openbsd buildbot, to latest serf and sqlite releases.

When installing unmodified files (as part of update/checkout) use a Windows

Vista and later API to avoid reopening the file as part of the rename

operation. Fall back to the old (common) code on older Windows versions.

This reduces the amount of time spend on the rename itself and avoids

virusscanners and other file system hooks to take action on the open

that is part of the rename, which would make us wait until the file

is completely scanned.

* subversion/include/private/svn_io_private.h

(svn_io__utf8_to_unicode_longpath): New function.

* subversion/libsvn_subr/io.c

(io_utf8_to_unicode_path): Rename to ...

(svn_io__utf8_to_unicode_longpath): ... this to allow using from stream.c

(io_win_file_attrs_set): Update caller.

* subversion/libsvn_subr/stream.c

(includes): Add 3 files.

(_FILE_RENAME_INFO): New struct.



SetFileInformationByHandle_a): Define if necessary.

(find_SetFileInformationByHandle): New function.

(create_tempfile): New function.

(install_close): New function.


svn_stream__install_stream): Add Windows specific code.

Speed up 'svn log -g' to almost the same speed as 'svn log'. Also, provide

a basis for speeding up other mergeinfo detection based code.

The problem is that svn_fs_path_change2_t used to report mergeinfo changes

as simple prop changes. Since most files are being created with default

props attached to them, this creates a lot of unnecessary property read

and comparison operations.

The idea is to a derive a mergeinfo-mod flag from the FS propset function

and store that in FSFS f7+ repositories (FSX will follow later). An extended

svn_fs_path_change2_t makes the information visible to the user.

* subversion/include/svn_fs.h

(svn_fs_path_change2_t): Add mergeinfo-mod as a tristate since we don't

have that information in old repositories.

* subversion/libsvn_fs_util/fs-util.c

(svn_fs__path_change_create_internal): Make sure the new member is always

initialized properly.

* subversion/libsvn_repos/log.c

(fs_mergeinfo_changed): Use the new information to skip unnecessary node

prop processing.

* subversion/libsvn_fs_fs/structure

(): Extend documentation to cover the new flag as well.

* subversion/libsvn_fs_fs/fs.h

(SVN_FS_FS__MIN_MERGEINFO_IN_CHANGES_FORMAT): New format capability flag.

* subversion/libsvn_fs_fs/low_level.c

(read_change): Detect the presense of the mergeinfo-mod flag and parse

it if found.

(write_change_entry): Write the mergeinfo-mod flag dependent on whether

its value is known and the new INCLUDE_MERGEINFO_MODS

parameter has been set.

(svn_fs_fs__write_changes): Include mergeinfo-mod only if supported by

the current FS format.

* subversion/libsvn_fs_fs/transaction.h

(svn_fs_fs__add_change): Add mergeinfo-mod parameter.

* subversion/libsvn_fs_fs/transaction.c

(replace_change): Copy mergeinfo-mod info as well.

(fold_change): Combine mergeinfo-mod info as well.

(svn_fs_fs__add_change): Store mergeinfo-mod info as well.

* subversion/libsvn_fs_fs/tree.c

(add_change): Add mergeinfo-mod pass-through parameter.

(fs_change_node_prop): Determine whether merge info was touched.






apply_text): These never modify mergeinfo.