subversion

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

Changeset 1370801 is being indexed.

* build/transform_config_hw.py (_wincpu_map): s/alfa/alpha/g; add amd64.

Found by: julianf

* CHANGES: Sync with trunk (a mergeinfo change only).
* CHANGES: Estimate 1.7.6 release date.

* CHANGES: Sync with trunk, estimate release date.

[note from the future: release date change should have been made on trunk first]

* CHANGES: Add more 1.7.6 items.

* STATUS: Propose r1370557 which fixes breakage in r1370526.

Fix breakage from r1370526: expose the svn_python variable to the svn_config

project file generator.

* build/generator/gen_vcnet_vcproj.py (svn_config): Expose svn_python

outside the SQL-file-specific enumeration.

* build/generator/templates/svn_config.vcxproj.ezt,

build/generator/templates/svn_config.vcproj.ezt: Update temppates.

Add Windows-specific r1370526 to proposal for r1368662

and update votes.

* INSTALL: Update URL for Windows AWK binary download.

Replace CPU type and Windows version in SVN_BUILD_HOST during the build.

* build/transform_config_hw.py: New script, Windows-specific.

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

build/generator/templates/svn_config.vcxproj.ezt: Use transform_config_hw.py

to generate svn_private_config.h instead of just copying.

* subversion/svn_private_config.hw: Remove ### comment for SVN_BUILD_HOST.

    • ?
    /trunk/build/transform_config_hw.py
APR's static builds use LibD/LibR to store the build artefacts.

* build/generator/gen_win.py (get_win_lib_dirs): Translate APR/APR-Util

artefact paths if linking against static APR libs.

* STATUS: Suggest more revisions to include in the commit-performance branch.
On the 1.7.x-commit-performance branch: sync with 1.7.x@1370416.
  1. … 30 more files in changeset.
* STATUS: Fix a typo in a branch name.
* STATUS: Query the justification for sorting 'svn import' output.
On the 'master-passphrase' branch: sync with recent trunk changes.

(Merged /subversion/trunk:r1368649-1370241.)

  1. … 19 more files in changeset.
On the 'master-passphrase' branch: Delay the acquisition of the master

password until it's needed to read from the store.

* subversion/libsvn_subr/pathetic_auth_store.c

(acquire_secret): Move higher in the source file.

(get_cred_hash, set_cred_hash): Call acquire_secret() as needed.

(pathetic_store_open): No longer call acquire_secret().

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

(open_auth_store): New helper function, cored from ...

(test_auth_store_basic): ... here.

In symmetric merge, defer the target WC checks for mixed-rev, local mods

and switched subtrees until after determining whether a reintegrate-like

merge is required, so that we can force doing the strict checks if so.

* subversion/include/private/svn_client_private.h

(svn_client__symmetric_merge_t): Add flags to store the requested

allow_mixed_rev, allow_local_mods, allow_switched_subtrees options.

* subversion/libsvn_client/merge.c

(svn_client__find_symmetric_merge): Don't check here; store the options

instead.

(do_symmetric_merge_locked): Do the requested checks here, or if it's a

reintegrate-like merge then force all three of the checks.

* subversion/svn/merge-cmd.c

(svn_cl__merge): Simplify the code slightly, as we know that the

'reintegrate' option is false in this block.

On the 'master-passphrase' branch:

* subversion/libsvn_subr/auth_store.h

(svn_auth__pathetic_store_create): Fix a stale comment.

Remove the "--symmetric" command-line option, which was made redundant in

r1369896.

* subversion/svn/cl.h

(svn_cl__opt_state_t): Remove the 'symmetric_merge' member.

* subversion/svn/main.c

(svn_cl__longopt_t): Remove the 'opt_symmetric' member.

(sub_main): Remove handling of the '--symmetric' option.

* subversion/tests/cmdline/merge_symmetric_tests.py

(symmetric_merge, subtree_to_and_fro,

merge_to_reverse_cherry_subtree_to_merge_to): Remove the '--symmetric'

option from merge commands.

On the 'master-passphrase' branch: Disentangle auth store

opening/creation actions.

* subversion/libsvn_subr/auth_store.h

(svn_auth__store_cb_open_t, svn_auth__store_open): Lose 'create' parameter.

(svn_auth__pathetic_store_get): Remove notes about store creation.

(svn_auth__config_store_get): Add note about auto-creation.

* subversion/libsvn_subr/auth_store.c

(svn_auth__store_open): Remove 'create' parameter and handling.

(svn_auth__get_store_from_parameters): Update call to svn_auth__store_open().

* subversion/libsvn_subr/cmdline.c

(open_auth_store): Update call to svn_auth__store_open().

* subversion/libsvn_subr/config_auth_store.c

(config_store_open): Remove 'create' parameter.

* subversion/libsvn_subr/pathetic_auth_store.c

(pathetic_store_open): Remove 'create' parameter.

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

(create_ephemeral_auth_store, test_auth_store_basic): Update calls

to svn_auth__store_open().

Remove the #ifdef SVN_WITH_SYMMETRIC_MERGE marker that was surrounding most

of the symmetric merge code.

* subversion/include/private/svn_client_private.h,

subversion/libsvn_client/merge.c,

subversion/svn/merge-cmd.c

Remove definition and all uses of SVN_WITH_SYMMETRIC_MERGE.

Remove a helper function that has lost its helpfulness.

* subversion/libsvn_client/merge.c

(open_source_session): Remove.

(merge_locked, open_reintegrate_source_and_target, merge_peg_locked,

open_source_and_target): Adjust accordingly.

On the 'master-passphrase' branch: Get the GNOME Keyring master

passphrase provider working, too. At least, in theory. Doesn't seem

to work in practice on my machine just yet ... something about symbol

names not resolving or somesuch.

* subversion/include/svn_auth.h

svn_auth_get_gnome_keyring_master_passphrase_provider): New function.

* subversion/libsvn_auth_gnome_keyring/gnome_keyring.c

(master_passphrase_gnome_keyring_first_creds,

master_passphrase_gnome_keyring_save_creds,

svn_auth_get_gnome_keyring_master_passphrase_provider): New functions.

(gnome_keyring_master_passphrase_provider): New structure instance.

* subversion/libsvn_subr/cmdline.c

(get_master_passphrase_auth_baton): New helper function, abstracted from...

(open_auth_store): ...here.

* subversion/libsvn_subr/masterpass_providers.c

(get_provider): Fix expected symbol name for gnome-keyring and kwallet

master passphrase providers.

(svn_auth_get_platform_specific_master_passphrase_providers): Enable

GNOME Keyring master passphrase provider support.

Enable symmetric merge as the default 'svn merge' behaviour when there

is one source, no revision range, no --reintegrate option, and no

--ignore-ancestry option. Ignore the '--symmetric' option.

* subversion/include/private/svn_client_private.h

(svn_client__symmetric_merge_t): Move structure definition to here ...

* subversion/libsvn_client/merge.c

(svn_client__symmetric_merge_t): ... from here.

(do_symmetric_merge_locked): Reject unsupported options in reintegrate

mode.

* subversion/svn/merge-cmd.c

(symmetric_merge): If a reintegrate-like merge is required, reject

options that are unsupported options in reintegrate mode.

(svn_cl__merge): Do a symmetric merge if there is one source and no

revision range, '--reintegrate' or '--ignore-ancestry' options.

* subversion/tests/cmdline/merge_tests.py

(dont_merge_revs_into_subtree_that_predate_it): Mark as XFail, because of

issue #4217 "Symmetric merge changes merge range notification

(merge_tests 78)".

* subversion/tests/cmdline/merge_reintegrate_tests.py

(multiple_reintegrates_from_the_same_branch): Specify the revision range

explicitly for a record-only merge, since this merge would otherwise be

a reintegrate-like symmetric merge, for which record-only is no longer

allowed.

Symmetric merge doesn't make sense with the 'ignore ancestry' option, since

it is all about merge tracking, so remove that option from its API and make

'svn merge' error out if both '--ignore-ancestry' and '--symmetric' options

are specified. (This makes sense at the moment, while symmetric merge is

specified explicitly. When we later teach 'svn merge' to do a symmetric

merge by default, then we may want to to handle this a different way.)

* subversion/include/private/svn_client_private.h

(svn_client__do_symmetric_merge): Remove the 'ignore_ancestry' parameter.

The doc string was wrong anyway: the option did prevent mergeinfo from

being used.

* subversion/libsvn_client/merge.c

(do_symmetric_merge_locked, svn_client__do_symmetric_merge): Remove the

'ignore_ancestry' parameter and use FALSE instead.

* subversion/svn/merge-cmd.c

(symmetric_merge): Remove the 'ignore_ancestry' parameter.

(svn_cl__merge): Error out if both '--ignore-ancestry' and '--symmetric'

options are specified.

* CHANGES: Add two more 1.7.6 items.
* build/generator/templates/build_locale.ezt:

Fix the relative path to the po directory, broken since build_locale.bat

was moved in r1034362. (Obvious fix.)

* build/generator/templates/build_locale.ezt,

* build/generator/templates/build_zlib.ezt:

s/not errorlevel 0/errorlevel 1/. "not errorlevel 0" is always false, since

"errorlevel X" tests for %errorlevel% >= X.

Obvious fix.

* subversion/svn/file-merge.c

(get_term_width): Plug a file descriptor leak: Close the file descriptor

used for the TIOCGWINSZ ioctl() call.