Checkout Tools
  • last updated 1 hour ago
Constraints: committers
Constraints: files
Constraints: dates

Changeset 874174 is being indexed.

On the issue-2843-dev branch: resolve conflicts from the r34098 merge.

* subversion/libsvn_wc/entries.c

(read_entries): Resolve conflict between r31713 and r34093.

On the fsfs-pack branch:

Bring up-to-date with trunk.

  1. … 54 more files in changeset.
On the issue-2843-dev branch: bring up-to-date with trunk@HEAD (r34097):

svn merge

There was one conflict. I am committing it with conflict markers

intact, to be resolved in a separate revision:


  1. … 73 more files in changeset.
Add r34096 to the r34082 group, and remove note about needing extra eyes --

I got the best eyes possible on it already.

Minor follow-up to r34082.

* subversion/mod_dav_svn/mirror.c

(dav_svn__proxy_merge_fixup): Move a return statement to avoid unnecessary

processing when a GET or PROPFIND is not proxied through.

Suggested by: jerenkrantz

* subversion/mod_dav_svn/repos.c

(parse_querystring): use authz_read_func when tracing node locations.

Follow-up to r34091, adjust expected output in a merge test to work with

debug builds.

Suggested by: cmpilato

* subversion/tests/cmdline/

(reintegrate_with_subtree_mergeinfo): Debug builds also output the

file/lineno of the error, so expect that.

Fix the entries walker again: allow it to walk into a deleted-but-re-added

directory. This is a follow-up to r34084 which fixed a similar bug but broke

this case. Also factor out the test used here and in several other places to

make it easier to keep it consistent.

* subversion/libsvn_wc/entries.c

(entry_is_hidden): New function.

(handle_start_tag, read_entries): Use it. (No functional change.)

(walker_helper, visit_tc_too_found_entry): Use it, fixing the bug mentioned.

Delete the reintegrate-improvements branch, it was merged back to trunk.
Reintegrate the reintegrate-improvements branch back to trunk.
  1. … 7 more files in changeset.
On the reintegrate-improvements branch: Merge r34059-34089 from trunk.
    • ?
  1. … 36 more files in changeset.
Implement a WC entries walker like svn_wc_walk_entries3() but that also

visits unversioned tree conflict victims.

This may well want to become public, perhaps as a new revision of

svn_wc_walk_entries3(). It could do with a better name than ..._and_tc().

* subversion/libsvn_wc/wc.h

(svn_wc__walk_entries_and_tc): New function.

* subversion/libsvn_wc/entries.c

(visit_tc_too_baton_t): New type.

(visit_tc_too_callbacks): New constant.

(visit_tc_too_found_entry, visit_tc_too_error_handler,

svn_wc__walk_entries_and_tc): New functions.

Allow FSFS rep-caching to be configurable.

* subversion/libsvn_fs_fs/fs_fs.c

(write_config): Add section for rep-sharing, currently disabled by default.

(svn_fs_fs__open, svn_fs_fs__create): Check the config before opening or

creating rep cache.

* subversion/libsvn_fs_fs/fs.h


* subversion/libsvn_fs_fs/rep-cache.c

(svn_fs_fs__get_rep_reference): If the database isn't open, just return a

NULL rep, meaning we didn't find a match.

(svn_fs_fs__inc_rep_reference, svn_fs_fs__set_rep_reference): If the database

isn't open, just no op.

* subversion/libsvn_fs_fs/rep-cache.h

(svn_fs_fs__set_rep_reference, svn_fs_fs__get_rep_reference,

svn_fs_fs__inc_rep_reuse): Document new behaviors.

* subversion/libsvn_subr/auth.c

(svn_auth_get_platform_specific_provider): Use proper syntax when checking for

GNOME Keyring and KWallet services. Follow-up to r34085.

Found by: hwright

* notes/http-protocol-v2.txt: rename 'revprop stub' to 'revision stub'
Refactor how Subversion accesses platform-specific auth providers.

* build.conf

(auth-test): New section for the auth tests.

(__LIBS__): Added auth-test to lib.

* subversion/libsvn_subr/cmdline.c

(get_auth_provider): Removed.

(svn_cmdline_create_auth_baton): Use the new API to access

platform-specific auth providers.

* subversion/libsvn_subr/auth.c

(svn_auth_get_platform_specific_provider): Added.

* subversion/tests/libsvn_subr

(svn:ignore): Ignore auth-test.

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

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

(get_auth_provider): Removed.

(SVNClient::getContext): Use the new API to access platform-specific

auth providers.

* subversion/bindings/ctypes-python/

(build.get_apr_config): Removed the libsvn_auth_gnome_keyring and

libsvn_auth_kwallet libs.

* subversion/bindings/swig/core.i,

* subversion/bindings/swig/svn_client.i: Add explicit ignores for all

platform-specific auth providers.

* subversion/bindings/swig/python/tests/

(test_conditional_auth_provider_support): Removed.

* subversion/bindings/swig/include/svn_global.swg


* subversion/include/svn_auth.h

(svn_auth_get_platform_specific_provider): Added.










svn_auth_get_kwallet_ssl_client_cert_pw_provider): Removed exposure to

swig and ctypesgen.

    • ?
Correct a bug in the WC entries walker. In "show_hidden" mode, it tried to

recurse into a 'deleted' or 'absent' directory.

There is no regression test. I tested by modifying svn_client_info() to use

"show_hidden=TRUE" in the call to svn_wc_walk_entries3(), and modifying to run "svn info -R <target>" before resolving. It

failed on test 13.

* subversion/libsvn_wc/entries.c

(walker_helper): Do not try to recurse into a 'deleted' or 'absent'


Propose r34082 for backport.
Fix issue #3275 by teaching the mod_dav_svn proxy logic to hand off

GET and PROPFIND requests that are aimed at working resource URIs to

the proxy instead of trying to field them in the slave server.

WARNING: I'm relying on my compiler and the testimony of the

attributed tester to determine the legitimacy of this patch.

Developers familiar with the proxy code are encouraged to

review this commit!

* subversion/mod_dav_svn/mirror.c

(proxy_request_fixup): New helper function, cored from


(dav_svn__proxy_merge_fixup): Look for GET and PROPFIND requests

aimed at working resource URIs, and proxy those away, too.

Tested by: Kylo Ginsberg <kylo{_AT_}>

Reviewed by: jerenkrantz

Follow-up to r34047, add a new merge test that demonstrates yet another

merge bug.

* subversion/tests/cmdline/


(test_list): Add XFailing merge_range_prior_to_rename_source_existence.

Follow-up to r34076, make variable declarations C89 friendly.

* subversion/mod_dav_svn/repos.c


Move variable declarations to start of code block.

Unconditionally load the FSFS configuration when creating/opening the


* subversion/libsvn_fs_fs/fs_fs.c

(svn_fs_fs__get_config): Remove.

(svn_fs_fs__open, svn_fs_fs__create): Read the fsfs.conf file.

* subversion/libsvn_fs_fs/fs_fs.h

(svn_fs_fs__get_config): Remove.

* subversion/libsvn_fs_fs/caching.c

(read_config): Don't worry about loading the config, since it's already

loaded by opening the FS.

* notes/http-protocol-v2.txt: rewrite based on New Orleans meeting.

* subversion/libsvn_wc/entries.c

(walker_helper): Add comments.

Augment mod_dav_svn support for a 'public' rev-path query syntax:


Both 'p' and 'r' arguments are optional: they can both be present, or

only one may be present. Just like the commandline client, an absent

pegrev defaults to HEAD, and an absent working rev defaults to pegrev.

* subversion/mod_dav_svn/repos.c

(get_resource): move code into parse_querystring().

(parse_querystring, querystring_to_table): new functions.

On issue-2897-take2 branch:

Merge r33537 through r34074 from trunk.

  1. … 368 more files in changeset.
On issue-2897-take2 branch:

Merge r33536 from trunk.

  1. … 8 more files in changeset.
Tidy up r34071. Should not have touched

* subversion/tests/cmdline/

(test_list): Revert r34071

On issue-2897-take2 branch:

Merge r33235 through r33535 from trunk.

  1. … 251 more files in changeset.
Make tree conflict tests check unversioned/nonexistent victims by default

in the verify-status step.

* subversion/tests/cmdline/svntest/



deep_trees_run_tests_scheme_for_merge): Verify operation with

"unquiet" status check.

* subversion/tests/cmdline/




tree_conflicts_on_switch_3): Put unversioned/nonexistent victims

in expected_status.

* subversion/tests/cmdline/




tree_conflicts_on_update_3): Put unversioned/nonexistent victims

in expected_status.

* subversion/tests/cmdline/




tree_conflicts_on_merge_local_ci_6): Put unversioned/nonexistent

victims in expected_status.

* subversion/tests/cmdline/

(test_list): Accidental change reverted in r34073.