subversion

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

Changeset 1372560 is being indexed.

On the 'master-passphrase' branch: implement the KDE Wallet master

passphrase provider.

Disclaimer: I'm not setup to compile against KDE, so ... this may be

completely broken.

* subversion/include/svn_auth.h

(svn_auth_get_kwallet_master_passphrase_provider): New function.

* subversion/libsvn_auth_kwallet/kwallet.cpp

(kwallet_master_passphrase_first_creds,

kwallet_master_passphrase_save_creds,

svn_auth_get_kwallet_master_passphrase_provider): New functions.

(kwallet_master_passphrase_provider): New static structure instance.

Update branch for r1242759 group.
On the '1.7.x-r1242759' branch: merge from trunk r1242759, r1242770, and

r1242794, resolving the conflict caused by gpg_agent.c not existing in

the 1.7.x history.

Create backport branch for r1242759 and friends.
Propose r1242759 and friends for backport to 1.7.x.
Avoid warnings about testing an undefined macro 'SVN_HAVE_MACOS_PLIST'.

A follow-up to r1371942.

* subversion/libsvn_subr/sysinfo.c

Everywhere, use '#ifdef' or 'defined()' with 'SVN_HAVE_MACOS_PLIST'.

The embedded, self-signed, SSL certificate in davautocheck.sh had

expired causing the SSL tests to fail.

* subversion/tests/cmdline/davautocheck.sh: Replace the SSL certificate.

On the 'master-passphrase' branch: sync with recent trunk changes.

(Merged /subversion/trunk:r1370242-1372417.)

    • ?
    /branches/master-passphrase/aclocal.m4
  1. … 24 more files in changeset.
On the inheritable-props branch: Sync with ^/subversion/trunk through

r1372409.

    • ?
    /branches/inheritable-props/aclocal.m4
* publish/docs/release-notes/1.7.html

(prop-test-35-issue): Add know regression test FAIL.

Add a regression test for issue #4213.

* subversion/tests/cmdline/svnadmin_tests.py

(recover_old): New test.

(test_list): Run it.

Sqlite amalgamation distributions are now distributed as .zip and with a new

naming convention.

* configure.ac: update url of sqlite amalgamation file to its current location.

Maybe this time really fix windows build with visual studio < 2010.

* build/generator/templates/svn_config.vcproj.ezt: Fix relative path to

svn_private_config.hw. Also fix the declared output of the build command

for that file, so that it matches the actual location.

* build/transform_config_hw.py

(svn:eol-style): Set to native.

Maybe fix fallout from r1371633.

* build/generator/templates/svn_config_vcproj.ezt: Use [configs] instead of

$(ConfigurationName) when defining IntDir; the latter probably contains

the platform name, too.

Display Mac OS release name with svn --version --verbose.

* configure.ac: Remove KeyChain test to build/ac-macros/macosx.m4.

* aclocal.m4: Include build/ac-macros/macosx.m4.

* build/ac-macros/macosx.m4: New file.

(SVN_LIB_MACOS_PLIST): New. Check for Mac OS property list utilities.

(SVN_LIB_MACOS_KEYCHAIN): New. Implementation moved from configure.ac.

Don't check anything if SVN_LIB_MACOS_PLIST failed.

* subversion/libsvn_subr/sysinfo.c: Include apr_strings.h.

[SVN_HAVE_MACOS_PLIST]: Include CoreFoundation/CoreFoundation.h.

(svn_sysinfo__release_name): Conditionionally call macos_release_name.

(system_version_plist, value_from_dict,

release_name_from_version, macos_release_name): New, conditional.

Adjust the expected merge notification in merge_tests.py 78 to account for a

harmless change due to the 'symmetric merge' code: issue #4217. Remove the

XFail.

* subversion/tests/cmdline/merge_tests.py

(dont_merge_revs_into_subtree_that_predate_it): Adjust expectations and

remove XFail.

On the inheritable-props branch: Sync with ^/subversion/trunk through

r1371831.

  1. … 54 more files in changeset.
Remove a comment in merge_tests.py 78 that has been wrong since the change

made in r871974 ("Fix issue #3067, 'subtrees that don't exist at the start

or end of a merge range shouldn't break the merge'").

* subversion/tests/cmdline/merge_tests.py

(dont_merge_revs_into_subtree_that_predate_it): Remove a comment.

On the inheritable-props branch: Atomically update cached iprops with

work queue items during update/switch editor drives. Remove the temporary

svn_client__update_inheritable_props API.

* subversion/include/private/svn_wc_private.h

(svn_wc__cache_iprops): Deleted, no callers.

(svn_wc__get_update_editor,

svn_wc__get_switch_editor): Add argument

* subversion/libsvn_client/client.h

(svn_client__update_inheritable_props): Delete.

(svn_client__get_inheritable_props): New.

* subversion/libsvn_client/iprops.c

(need_to_cache_iprops): Gracefully handle the case where we ask about a

non-existant path.

(svn_client__update_inheritable_props): Delete.

(svn_client__get_inheritable_props):

* subversion/libsvn_client/switch.c (switch_internal):

* subversion/libsvn_client/update.c (update_internal):

Grab inheritable properties from the repository

for each WC root in the update target and pass these iprops to

svn_wc__get_[update|switch]_editor so it can set the iprops along with

the rest of the columns in the NODES table during the editor drive

callbacks. Also remove the call to the now defunct

svn_client__update_inheritable_props.

* subversion/libsvn_wc/deprecated.c

(svn_wc_get_update_editor4): Update call to svn_wc__get_update_editor.

(svn_wc_get_switch_editor4): Update call to svn_wc__get_switch_editor.

* subversion/libsvn_wc/externals.c

(close_edit): Update call to svn_wc__db_op_bump_revisions_post_update.

* subversion/libsvn_wc/update_editor.c

(edit_baton): Add a new member to stash the set of iprops for all

working copy roots in the update target.

(close_directory): Pass along any iprops to

svn_wc__db_base_add_directory.

(close_edit): Pass along hash of WC root iprops to

svn_wc__db_op_bump_revisions_post_update.

(make_editor,

svn_wc__get_update_editor,

svn_wc__get_switch_editor):

Add new argument corresponding to new edit baton member.

(svn_wc__get_update_editor):

* subversion/libsvn_wc/wc-queries.sql

(STMT_INSERT_NODE): Add inherited props parameter.

(STMT_INSERT_IPROP): Rename to...

(STMT_UPDATE_IPROP): ...this and remove op_depth parameter, op_depth

is always zero for this statement.

* subversion/libsvn_wc/wc_db.c

(insert_base_baton_t): Add a new member to stash base node's iprops.

(insert_base_node): Bind iprops.

(svn_wc__db_base_add_directory): Add new argument corresponding to new

iprops.

(svn_wc__db_cache_iprops): Deleted, no longer used by any callers.

(db_op_set_rev_and_repos_relpath): Renamed to...

(db_op_set_rev_repos_relpath_iprops): ...this. Now handles setting iprops

too.

(bump_node_revision): Add an optional hash of iprops argument from which

to set the node's inherited properties.

(bump_revisions_baton_t): New hash of iprops member.

(bump_revisions_post_update): Pass hash of iprops to bump_node_revision().

(svn_wc__db_op_bump_revisions_post_update): Add an optional hash of iprops

argument from which to set the node's inherited properties.

* subversion/libsvn_wc/wc_db.h

(svn_wc__db_base_add_directory): Add new argument corresponding to new

iprops.

(svn_wc__db_cache_iprops): Deleted, no longer used by any callers.

(svn_wc__db_op_bump_revisions_post_update): Add an optional hash of iprops

argument from which to set the node's inherited properties.

* subversion/tests/libsvn_wc/db-test.c (test_inserting_nodes):

* subversion/tests/libsvn_wc/op-depth-test.c (svn_wc__db_base_add_directory):

Update calls to svn_wc__db_base_add_directory.

On Windows, create the generated svn_private_config.h in the intermediate

build directory so that different configurations don't all use the same

canonical host name. This incidentally allows Windows and Unix builds to

share the same working copy in parallel.

* build\generator\templates\svn_config.vcproj.ezt,

build\generator\templates\svn_config.vcxproj.ezt: Change output path

of svn_private_config.h. Add generated SQL headers to project.

* build\generator\templates\vcnet_vcproj.ezt,

build\generator\templates\vcnet_vcxproj.ezt: Add build directory to

list of project-specific include paths.

Merge r1371282 from trunk:

* r1371282

Fix a sandbox violation in a test suite test. (The test executes

'svn' outside the typical framework for doing so without pointing

the binary at the controlled runtime configuration directory used

by other tests.)

Justification:

Broken tests lead to false positives in the hunt for broken

software.

Votes:

+1: cmpilato, brane, julianfoad

subversion/libsvn_subr/sysinfo.c: spelling fix.

* STATUS: Vote, approving the test suite sandbox fix r1371282.
On the 'master-passphrase' branch: fix a segfault triggered by running

in --non-interactive mode.

* subversion/libsvn_subr/cmdline.c

(get_master_passphrase_auth_baton): Initialize the provider list

when non_interactive is set, too.

* STATUS: Vote for r1371282.
Teach serf build on Windows to use static APR/Util and OpenSSL.

Note: The APR_STATIC support requires a patch to serf.mak,

see http://code.google.com/p/serf/issues/detail?id=88

* gen-make.py: New option --with-static-openssl.

* build/generator/gen_win.py (write_serf_project_file):

Send configuration for static APR and OpenSSL linking to the serf

project file generator.

* build/generator/templates/serf.vcproj.ezt,

build/generator/templates/serf.vcxproj.ezt: Update nmake command templates.

Indentation fix only.
Propose r1371282 for backport to 1.7.x.
Fix a sandbox violation in prop_tests.py 35.

* subversion/tests/cmdline/prop_tests.py

(propget_redirection): Consult the controlled test-suite runtime

config when invoking 'svn' directly.