Checkout Tools
  • last updated 50 mins ago
Constraints: committers
Constraints: files
Constraints: dates

Changeset 874298 is being indexed.

* www/tools_contrib.html: Add Chinese translation links.

* www/tools_contrib.zh.html: Chinese translation based on English r33959

Follow-up to r34221:

* subversion/svnsync/main.c

(main): Add 2 missing calls to svn_cmdline_terminate_auth_baton().

Properly terminate KWallet authentication providers.

* subversion/libsvn_auth_kwallet/kwallet.cpp

(kwallet_password_get, kwallet_password_set): Set "kwallet-initialized" in

'parameters' of authentication baton after opening wallet.

Delete some comments.

(kwallet_terminate): New function which disconnects Subversion from KWallet

and deletes pointer to wallet.

(kwallet_simple_provider, kwallet_ssl_client_cert_pw_provider): Initialize

terminate_provider() field with kwallet_terminate().

Implement termination of authentication providers.

* subversion/include/svn_auth.h

(svn_auth_provider_t.terminate_provider): New function which terminates

authentication provider.

* subversion/include/svn_cmdline.h

(svn_cmdline_terminate_auth_baton): New function which terminates all

authentication providers in authentication baton, which have non-NULL

terminate_provider() function.

* subversion/libsvn_subr/cmdline.c

(provider_set_t): New structure.

(svn_cmdline_terminate_auth_baton): New function which terminates all

authentication providers in authentication baton, which have non-NULL

terminate_provider() function.

* subversion/libsvn_subr/auth.c

(svn_auth_baton_t): Move from here ...

* subversion/include/private/svn_auth_private.h

(svn_auth_baton_t): ... to here.

* subversion/svn/main.c

(main): Call svn_cmdline_terminate_auth_baton().

* subversion/svnsync/main.c

(main): Call svn_cmdline_terminate_auth_baton().

To complete issue #2489, implement secure client certificate passphrase

caching for Windows CryptoAPI.

* subversion/include/private/svn_auth_private.h

(svn_auth__ssl_client_cert_pw_file_save_creds_helper): Update documentation

to note that it is used by the windows cryptoapi store.

(svn_auth__ssl_client_cert_pw_get): Add passphrase getter for use by the

Windows crypto provider.

(svn_auth__ssl_client_cert_pw_set): Add passphrase setter for use by the

Windows crypto provider.

* subversion/include/svn_auth.h

(svn_auth_get_windows_ssl_client_cert_pw_provider): Add Windows Crypto api

ssl client certificate passphrase provider.

* subversion/libsvn_subr/auth.c

(svn_auth_get_platform_specific_provider): Handle requests for windows


* subversion/libsvn_subr/cmdline.c

(svn_cmdline_create_auth_baton): Register Windows Crypto api ssl client

certificate passphrase provider in the auth batton.

* subversion/libsvn_subr/ssl_client_cert_pw_providers.c

(simple_passphrase_get): Renamed to ...

(svn_auth__ssl_client_cert_pw_get): .... and remove static to allow reuse

by the Windows Crypto api implementation.

(simple_passphrase_set): Renamed to ...

svn_auth__ssl_client_cert_pw_set): ... and remove static to allow reuse

by the Windows Crypto api implementation.

(svn_auth__ssl_client_cert_pw_file_save_creds_helper): Mark that passphrases

saved by the Windows Crypto api are encrypted to remove the confirmation



ssl_client_cert_pw_file_save_credentials): Update references to


* subversion/libsvn_subr/win32_crypto.c





windows_ssl_client_cert_pw_provider): Add ssl client certificate passphrase

provider, forwarding caching and save requests to the file provider like

the simple provider.

(svn_auth_get_windows_ssl_client_cert_pw_provider): Add registration function

for the Windows Crypto api ssl client certificate passphrase provider.

* subversion/tests/libsvn_subr/auth-test.c

(test_platform_specific_auth_providers): Test registration of the CryptoApi

provider via svn_auth_get_platform_specific_provider.

Follow-up to r34130:

Store pointer to wallet in parameters of authentication baton instead of using

global variable.

* subversion/libsvn_auth_kwallet/kwallet.cpp

(wallet): Delete.

(get_wallet): New.

(kwallet_password_get, kwallet_password_set): Use get_wallet().

Found by: gstein

Follow-up to r34085:

* subversion/libsvn_subr/auth.c

(svn_auth_get_platform_specific_provider): Rename local constant.

* subversion/libsvn_subr/cmdline.c

(svn_cmdline_create_auth_baton): Consistently use SVN_ERR() and improve


* subversion/bindings/javahl/native/SVNClient.cpp

(SVNClient::getContext): Consistently use SVN_JNI_ERR() and improve


* subversion/tests/libsvn_subr/auth-test.c: Fix copyright year.

* www/index.html: Add Chinese FAQ translation links.

* www/faq.html: Add Chinese translation links.

* www/faq.zh.html: Chinese translation based on English r33959

Add missing NULL checks.

* subversion/libsvn_fs_fs/tree.c

(fs_file_checksum, apply_textdelta): Add missing NULL check.

Reviewed by: markphip



[Reverted in r34252.]

Follow up on r34178, getting rid of compiler warnings.

* subversion/include/svn_string.h,

* subversion/libsvn_subr/svn_string.c

(svn_cstring_join): Make first parameter STRINGS const.

* subversion/libsvn_fs_fs/tree.c


Fix excessive memory usage during commit in repositories with high

commit rates where the transactions modify nodes that have 20,000

siblings nodes.

* subversion/libsvn_wc/update_editor.c

(check_wc_root): Add a minimal doc string. Separate it from the large

documentation comment above it.

* subversion/include/svn_wc.h

(svn_wc_is_wc_root): Clarify the doc string: "WC root" might not mean what

you would think.

The new composition is cool... but let's have the stream closure take

precedence over the file removal error. It was the closure, after all,

that caused us to attempt the file removal.

* subversion/libsvn_subr/subst.c:

(svn_subst_copy_and_translate3): swap order of error precedence

If update or switch skips a conflicted tree, don't set the new

revision, URL, etc. on anything in the conflicted tree.

On updating or switching a prop-conflicted directory, skip the

directory and its descendants as we do for tree conflicts.

This is a follow-up to the skip-conflicts improvements in r34158.

* subversion/libsvn_wc/adm_ops.c

(tweak_entries): When finishing an update or switch, skip all

descendants of an excluded path.

* subversion/libsvn_wc/update_editor.c

(edit_baton): Note in comments the new (recursive) meaning of the

skipped_paths field. Rename current_tree_conflict to

current_conflict to reflect that it may contain the path of a

prop-conflicted dir.







make_editor): Track field renames.

(open_directory): Track field renames. Ensure that an existing

property conflict causes the dir tree to be skipped.

* subversion/tests/cmdline/


tree_conflicts_on_switch_3): Expected status shows old revision

numbers. Now consistent with the other tests.

* subversion/tests/cmdline/


update_conflicted): Expected output and status show improved

skipping and old revision numbers.



tree_conflicts_on_update_3): Expected status shows old revision

numbers. Now consistent with the other tests.

* subversion/tests/cmdline/svntest/

(deep_trees_skipping_on_update): Check status before the skipping,

too. Comment out a print statement (whoops).

Followup to r34205.

* subversion/libsvn_subr/error.c

(svn_error_compose_create): Simplify, simplify...

Suggested by: gstein

Followup to r34206.

* subversion/libsvn_subr/subst.c

(svn_subst_copy_and_translate3): Just return the composed error

chain as soon as you know it's non-NULL, rather than testing it

again later.

Suggested by: gstein

Simplify some cleanup logic.

* subversion/libsvn_subr/subst.c

(svn_subst_copy_and_translate3): Use new svn_error_compose_create()

to simply some logic.

Add a version of svn_error_compose that is SVN_NO_ERROR-tolerant.

* subversion/include/svn_error.h,

* subversion/libsvn_subr/error.c

(svn_error_compose_create): New function.

* subversion/libsvn_client/resolved.c

(svn_client_resolved): Move below svn_client_resolve() which it calls,

because that's the natural order in C.

Add some error-scenario cleanup logic, some of it needed since r34187

stopped using delete-on-close semantics for the tempfile, some of it

needed probably since the inception of this code.

* subversion/libsvn_subr/subst.c

(svn_subst_copy_and_translate3): Clean up streams and temporary

files in the error case. The lack of this code was causing

translate-tests 14 to leave two tempfile turds.

* STATUS: Nominate r34171 (fix a character encoding failure).
Revert r34200 because it accidentally included the nominated change as well as the nomination.
* STATUS: Nominate r34171 (fix a character encoding failure).
Followup to r34197.

* subversion/tests/svn_test_main.c

(main): Oops. Fix a use of an AND where an OR was intended.

Found by: danielsh


(rocksun): Whups, say "zh" instead of "cn", following up to r34195.

Found by: arfrever

Bang support for --server-minor-version testing into the C test

framework, and use it in the FS and Repos tests.

NOTE: Only one failure that I didn't expect turned up:

$ ./fs-test --server-minor-version=4 --fs-type=fsfs


subversion/tests/libsvn_fs/fs-test.c:369: (apr_err=160000)

svn_tests: the transaction name '0-3' was reused

FAIL: lt-fs-test 5: check that transaction names are not reused


* subversion/tests/svn_test.h

(svn_test_opts_t): Add server_minor_version.

* subversion/tests/svn_test_main.c

(server_minor_version_opt): New enum.

(cl_options): Add bits for new --server-minor-version option.

(main): Add handling of new --server-minor-version option.

* subversion/tests/svn_test_fs.h

(svn_test__create_bdb_fs): Add 'opts' parameter.

* subversion/tests/svn_test_fs.c

(make_fs_config, create_fs): Add 'server_minor_version' parameter

and handling.

(svn_test__create_bdb_fs): Add 'opts' parameter, and update call to


(svn_test__create_fs, svn_test__create_repos): Update call to create_fs().

* subversion/tests/libsvn_fs/fs-test.c

(node_origin_rev): Bail (with success) when testing BDB with

server-minor-version 4.

* subversion/tests/libsvn_repos/repos-test.c

(node_location_segments): Bail (with success) when testing BDB with

server-minor-version 4.

* subversion/tests/libsvn_fs_base/changes-test.c,

* subversion/tests/libsvn_fs_base/fs-base-test.c,

* subversion/tests/libsvn_fs_base/strings-reps-test.c

Update calls to svn_test__create_bdb_fs().

JavaHL: A follow-up to r34184, adjust the JavaHL tests to no

longer expect property modifications when an item is moved.

[ in subversion/bindings/javahl/ ]

* tests/org/tigris/subversion/javahl/

(testMove): Remove expectations of mergeinfo creation.


(rocksun): Add as a new Chinese translator for the www area.

(nmiyo): While here, expand domain from faq to www; anyone who can

translate the faq can obviously translate other documents in www.