svn_cmdline_private.h

Checkout Tools
  • last updated 1 hour ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Rename and move the new-for-1.10 function 'svn_io_stdin_readline()' to

'svn_cmdline__stdin_readline()'.

It is just a wrapper around existing API functions and lacks some checking and

options so was deemed not suitable to go into the public API in its current

form.

* subversion/include/private/svn_cmdline_private.h,

subversion/libsvn_subr/cmdline.c

(svn_cmdline__stdin_readline): Rename and move to here...

* subversion/include/svn_io.h

* subversion/libsvn_subr/io.c

(svn_io_stdin_readline): ... from here.

* subversion/svnbench/svnbench.c,

subversion/svnmucc/svnmucc.c,

subversion/svnrdump/svnrdump.c,

subversion/svn/svn.c,

tools/client-side/svnconflict/svnconflict.c,

tools/client-side/svn-mergeinfo-normalizer/svn-mergeinfo-normalizer.c,

tools/dev/svnmover/svnmover.c

(sub_main): Track the rename.

  1. … 10 more files in changeset.
Try to fix the Windows build by removing the conditionals around

an obsolete function.

* subversion/include/private/svn_cmdline_private.h

(svn_cmdline__auth_gnome_keyring_unlock_prompt): Make unconditional.

* subversion/libsvn_subr/prompt.c

(svn_cmdline__auth_gnome_keyring_unlock_prompt): Make unconditional.

  1. … 1 more file in changeset.
Try to fix Windows build.

* subversion/include/private/svn_cmdline_private.h: Include

svn_private_config.h, make declaration of deprecated function

conditional on SVN_HAVE_GNOME_KEYRING.

Use libsecret to implement the GNOME Keyring provider by default

instead of libgnome-keyring. The GNOME project have deprecated

libgnome-keyring and libsecret is the preferred replacement. The old

implementation using libgnome-keyring can still be chosen at configure

time. Both implementations read and write passwords that can be used

by the other implementation.

The configure option '--with-gnome-keyring' now controls the new

implementation while the option '--with-old-gnome-keyring' controls

the previous implementation.

* build/ac-macros/libsecret.m4: New, provides --with-gnome-keyring.

* configure.ac: Change --with-gnome-keyring to --with-old-gnome-keyring

and disable by default.

* aclocal.m4: Include libsecret.m4.

* subversion/libsvn_auth_gnome_keyring/gnome_keyring.c: Add new

libsecret implementation conditional on SVN_HAVE_LIBSECRET, make old

code conditional on SVN_HAVE_GNOME_KEYRING,

* subversion/libsvn_subr/auth.c

(svn_auth_get_platform_specific_provider): Make already conditional

code depend on SVN_HAVE_LIBSECRET.

* subversion/include/svn_auth.h

(SVN_AUTH_PARAM_GNOME_KEYRING_UNLOCK_PROMPT_FUNC,

SVN_AUTH_PARAM_GNOME_KEYRING_UNLOCK_PROMPT_BATON): Deprecate.

* subversion/include/private/svn_cmdline_private.h

(svn_cmdline__auth_gnome_keyring_unlock_prompt): Deprecate.

* subversion/libsvn_subr/prompt.c

(svn_cmdline__auth_gnome_keyring_unlock_prompt): Make conditional.

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

(test_platform_specific_auth_providers): Make already conditional

code depend on SVN_HAVE_LIBSECRET.

  1. … 8 more files in changeset.
Move a bit more of the signal handling code from the programs to the library.

* subversion/include/private/svn_cmdline_private.h

(svn_cmdline__get_cancellation_signal): Remove.

(svn_cmdline__cancellation_exit): New.

* subversion/libsvn_subr/cmdline.c

(svn_cmdline__get_cancellation_signal): Remove.

(svn_cmdline__cancellation_exit): New.

* subversion/svn/svn.c

* subversion/svnadmin/svnadmin.c

* subversion/svnbench/svnbench.c

* subversion/svnfsfs/svnfsfs.c

* subversion/svnlook/svnlook.c

* subversion/svnrdump/svnrdump.c

* subversion/svnsync/svnsync.c

(main): Call new function.

  1. … 8 more files in changeset.
Move signal handling and cancellation code to libsvn_subr to avoid

duplication in multiple programs.

* subversion/include/private/svn_cmdline_private.h

(svn_cmdline__setup_cancellation_handler,

svn_cmdline__disable_cancellation_handler,

svn_cmdline__get_cancellation_signal): New.

* subversion/libsvn_subr/cmdline.c

(signal_handler, check_cancel,

svn_cmdline__setup_cancellation_handler,

svn_cmdline__disable_cancellation_handler,

svn_cmdline__get_cancellation_signal): New, code from svn.c and svnadmin.c.

* subversion/svn/cl.h

(svn_cl__check_cancel): Change type to pointer.

* subversion/svn/svn.c

(svn_cl__check_cancel): Change type to pointer.

(signal_handler): Remove.

(sub_main, main): Call new functions.

* subversion/svnadmin/svnadmin.c

(check_cancel): Change type to pointer.

(signal_handler, setup_cancellation_signalsl): Remove.

(repos_notify_handler, subcommand_recover, subcommand_upgrade,

sub_main, main): Call new functions.

* subversion/svnbench/cl.h

(svn_cl__check_cancel): Change type to pointer.

* subversion/svnbench/svnbench.c

(svn_cl__check_cancel): Change type to pointer.

(signal_handler): Remove.

(sub_main, main): Call new functions.

* subversion/svnfsfs/svnfsfs.h

(check_cancel): Change type to pointer.

* subversion/svnfsfs/svnfsfs.c

(check_cancel): Change type to pointer.

(signal_handler, setup_cancellation_signals): Remove.

(sub_main, main): Call new functions.

* subversion/svnlook/svnlook.c

(check_cancel): Change type to pointer.

(signal_handler): Remove.

(sub_main, main): Call new functions.

* subversion/svnrdump/svnrdump.c

(check_cancel): Change type to pointer.

(signal_handler): Remove.

(sub_main, main): Call new functions.

* subversion/svnsync/svnsync.c

(check_cancel): Change type to pointer.

(signal_handler): Remove.

(sub_main, main): Call new functions.

  1. … 11 more files in changeset.
Merge the 'svnmover' prototype from the 'move-tracking-2' branch to trunk.

See the dev@ email thread "Merge 'svnmover' demo tool to trunk" started on

2015-11-10, archived at e.g. <http://mail-archives.apache.org/mod_mbox/subversion-dev/201511.mbox/%3CCAEcU=1YE5Ci02j_4aAeB_roS1X0H2QWPP3juu0exjVJ-FGCLyg@mail.gmail.com%3E>.

This is a reintegration (performed as an automatic merge) followed by

reverting the unwanted parts. As such, those unwanted parts (such as shim

insertions in several libraries) will be treated as 'record-only merged' and

will not be picked up by any subsequent automatic merge to trunk.

A brief description of the changes follows.

* build.conf

Adjust to build the new files.

* configure.ac

Adjust compiler warning flags to not warn about passing or returning a

structure, because some of the code does so.

* LICENSE

Add the licence text for the embedded 'linenoise' library.

* notes/move-tracking/README

New file, describing this work.

* subversion/include/private/svn_branch.h,

subversion/include/private/svn_branch_compat.h,

subversion/include/private/svn_branch_impl.h,

subversion/include/private/svn_branch_nested.h,

subversion/include/private/svn_branch_repos.h,

subversion/include/private/svn_element.h

New files.

* subversion/libsvn_delta/branch.c,

subversion/libsvn_delta/branch_compat.c,

subversion/libsvn_delta/branch_migrate.c,

subversion/libsvn_delta/branch_nested.c,

subversion/libsvn_delta/branch_repos.c,

subversion/libsvn_delta/element.c

New files.

* subversion/include/private/svn_cmdline_private.h

subversion/libsvn_subr/cmdline.c

(svn_cmdline__stdin_is_a_terminal,

svn_cmdline__stdout_is_a_terminal,

svn_cmdline__stderr_is_a_terminal): New.

* subversion/tests/cmdline/svnmover_tests.py

New file.

* subversion/tests/cmdline/svntest/actions.py

(run_and_verify_svnmover,

run_and_verify_svnmover2): New.

* subversion/tests/cmdline/svntest/main.py

(svnmover_binary,

run_svnmover): New.

(execute_tests): Initialize 'svnmover_binary'.

* subversion/tests/cmdline/svntest/wc.py

(State): Add 'rename' and 'from_eids' methods.

(StateItem): Add an 'eid' attribute.

* tools/dev/svnmover

New tool.

  1. … 25 more files in changeset.
* subversion/include/private/svn_cmdline_private.h

(svn_cmdline__parse_config_option): Update docstring to reflect merge

of r1674301 to 1.9.x in 1679307.

Following up on r1678734, remove unneeded prefix from error message.

* subversion/include/private/svn_cmdline_private.h

* subversion/libsvn_subr/cmdline.c

(svn_cmdline__parse_trust_options): Remove unneeded argument and usage.

* subversion/svn/svn.c

* subversion/svnbench/svnbench.c

* subversion/svnmucc/svnmucc.c

* subversion/svnrdump/svnrdump.c

* subversion/svnsync/svnsync.c

(sub_main): Update caller.

  1. … 6 more files in changeset.
Following up on an irc discussion integrate the --trust-unknown-ca,

--trust-cn-mismatch, --trust-expired, --trust-not-yet-valid and

--trust-other-failure commandline options of svn, svnbench, svnmucc,

svnrdump and svnsync into a new --trust-server-cert-failures option

with arguments that specify which error will be ignored.

This patch is based on an initial (much smaller)

Patch by: danielsh

This patch should be released in 1.9.0 or at least partially reverted.

* subversion/include/private/svn_cmdline_private.h

(svn_cmdline__parse_trust_options): New function.

* subversion/libsvn_subr/cmdline.c

(svn_cmdline__parse_trust_options): New function.

* subversion/svn/svn.c

(svn_cl__longopt_t): Tweak options.

(svn_cl__options): Update definition and documentation.

(svn_cl__global_options): Update.

(sub_main): Use new api. Tweak error.

* subversion/svnbench/svnbench.c

(svn_cl__longopt_t): Tweak options.

(svn_cl__options): Update definition and documentation.

(svn_cl__global_options): Update.

(sub_main): Use new api. Tweak error.

* subversion/svnmucc/svnmucc.c

(help): Update documentation.

(sub_main): Tweak options, definition and usage.

* subversion/svnrdump/svnrdump.c

(svn_svnrdump__longopt_t,

SVN_SVNRDUMP__BASE_OPTIONS): Tweak options.

(svnrdump__options): Update definition and documentation.

(sub_main): Use new api. Tweak error.

* subversion/svnsync/svnsync.c

(svnsync__opt,

SVNSYNC_OPTS_DEFAULT): Tweak options.

(svnsync_options): Update definition and documentation.

(sub_main): Use new api. Tweak error.

* subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout

Update expected output.

  1. … 7 more files in changeset.
--config-option: Warn when the FILE:SECTION:OPTION combination may be invalid.

Currently there are false negatives: if each component is individually known,

then there won't be a warning, even if the tuple as a whole is invalid.

The implementation is as follows: first, parse svn_config.h to generate a list

of valid file/section/option names:

* subversion/libsvn_subr/config_keys.inc:

Not a versioned file, but will be generated by gen-make.py.

* build/generator/gen_base.py

(collections): Import.

(GeneratorBase.FileSectionOptionEnum): New class.

(GeneratorBase._client_configuration_defines): New method.

(GeneratorBase.write_config_keys): New method.

(IncludeDependencyInfo._scan_for_includes):

Exempt config_keys.inc from dependency scanning.

* build/generator/templates/build-outputs.mk.ezt

(EXTRACLEAN_FILES): Clean config_keys.inc.

* gen-make.py

(main): Generate config_keys.inc.

Second, have the --config-option parser warn to stderr about unknown values:

* subversion/include/private/svn_cmdline_private.h

(svn_cmdline__parse_config_option): Add PREFIX argument, document new

functionality.

* subversion/libsvn_subr/cmdline.c

(config_keys.inc): Include.

(most_similar, string_in_array, validate_config_option): New functions.

(svn_cmdline__parse_config_option): Validate the config option's coordinates

and warn if they may be invalid.

* subversion/svn/similarity.c

(svn_cl__similarity_check): Cross-reference most_similar().

No functional change.

Third, add a unit test:

* subversion/tests/cmdline/getopt_tests.py

(getopt_config_option): New test.

Finally, update callers for the trivial signature change:

* subversion/svn/svn.c (sub_main),

* subversion/svnbench/svnbench.c (sub_main),

* subversion/svnmucc/svnmucc.c (sub_main),

* subversion/svnrdump/svnrdump.c (sub_main):

Pass new PREFIX argument.

* subversion/svnsync/svnsync.c

(sub_main): Ditto, in two places.

  1. … 11 more files in changeset.
Move some private functions prototypes into the associated private

header files.

* subversion/include/private/svn_cmdline_private.h

(svn_cmdline__getopt_init, svn_cmdline__be_interactive): Move

here...

* subversion/include/svn_cmdline.h

...from here.

* subversion/svnadmin/svnadmin.c,

* subversion/svndumpfilter/svndumpfilter.c,

* subversion/svnserve/svnserve.c,

* subversion/svnversion/svnversion.c,

* subversion/tests/svn_test_main.c,

* tools/dev/svnraisetreeconflict/svnraisetreeconflict.c,

* tools/server-side/svn-rep-sharing-stats.c,

* tools/server-side/svnauthz.c

Now #include svn_cmdline_private.h, too.

  1. … 9 more files in changeset.
Move some fairly useful utility functions from the command-line client

to libsvn_subr, exposing as private svn_cmdline__ APIs.

* subversion/include/private/svn_cmdline_private.h

(svn_cmdline__edit_file_externally,

svn_cmdline__edit_string_externally): Rename and move here ...

* subversion/svn/cl.h

(svn_cl__edit_file_externally, svn_cl__edit_string_externally):

... from here. Callers updated.

* subversion/libsvn_subr/cmdline.c

(find_editor_binary, svn_cmdline__edit_file_externally,

svn_cmdline__edit_string_externally): Rename and move here ...

* subversion/svn/util.c

(find_editor_binary, svn_cl__edit_file_externally,

svn_cl__edit_string_externally): ... from here. Callers updated.

* subversion/svn/conflict-callbacks.c,

* subversion/svn/file-merge.c,

* subversion/svn/propedit-cmd.c

Track function renames.

  1. … 6 more files in changeset.
Add --show-inherited-props support to 'svnlook propget' and

'svnlook proplist' and '--verbose' support to 'svnlook propget'.

The output of these new options now mimics the output of 'svn pl' and

'svn pg' with the same options. The only change to *existing* 1.7 behavior

is for 'svnlook pl' and 'svnlook pl -v', which now mimics 'svn pl' and

'svn pl -v':

Old:

>svnlook pl autoprop_tests-30 /

svn:auto-props

>svnlook pl autoprop_tests-30 / -v

svn:auto-props : *.h=svn:eol-style=native

New:

>svnlook pl autoprop_tests-30 /

Properties on '/':

svn:auto-props

>svnlook pl autoprop_tests-30 / -v

Properties on '/':

svn:auto-props

*.h=svn:eol-style=native

See http://svn.haxx.se/dev/archive-2012-11/0508.shtml and

http://svn.haxx.se/dev/archive-2012-11/0510.shtml

* subversion/include/svn_repos.h

(svn_repos_fs_get_inherited_props): Add a new argument signaling retrieval

of only a particular property.

* subversion/libsvn_repos/fs-wrap.c

(svn_repos_fs_get_inherited_props): Implement new argument.

* subversion/libsvn_ra_local/ra_plugin.c

(get_node_props):

* subversion/mod_dav_svn/reports/inherited-props.c

(dav_svn__get_inherited_props_report):

* subversion/svnserve/serve.c

(get_props):

Update calls to svn_repos_fs_get_inherited_props() to account for new

argument.

* subversion/svn/cl.h

(svn_cl__print_prop_hash,

svn_cl__print_xml_commit,

svn_cl__indent_string): Renamed and moved to svn_cmdline_private.h

* subversion/include/private/svn_cmdline_private.h

(svn_cmdline__indent_string,

svn_cmdline__print_prop_hash,

svn_cmdline__print_xml_prop_hash): New. Moved here from cl.h.

* subversion/svn/props.c

(svn_cl__print_prop_hash,

svn_cl__print_xml_prop_hash): Renamed and moved these implementations to

subversion/libsvn_subr/cmdline.c.

* subversion/svn/util.c

(next_line,

svn_cl__indent_string): Renamed and moved these implementations to

subversion/libsvn_subr/cmdline.c.

* subversion/libsvn_subr/cmdline.c

(next_line,

svn_cmdline__indent_string): New. Renamed and moved here from

subversion/svn/util.c.

(svn_cmdline__print_prop_hash,

svn_cmdline__print_xml_prop_hash): New. Renamed and moved here from

subversion/svn/props.c.

* subversion/svn/log-cmd.c

(log_entry_receiver_xml):

* subversion/svn/propget-cmd.c

(print_single_prop):

* subversion/svn/proplist-cmd.c

(proplist_receiver_xml,

proplist_receiver,

svn_cl__proplist):

Account for svn_cl__* --> svn_cmdline__* renamed functions.

* subversion/svnlook/svnlook.c

(svnlook__show_inherited_props): New enum for --show-inherited-props

option.

(options_table): New help line for --show-inherited-props.

(cmd_table): Add '-v' and '--show-inherited-props' options to

'svnlook propget'. Add '--show-inherited-props' option to

'svnlook proplist'.

(svnlook_opt_state): Add member to track --show-inherited-props.

(stream_write):

(do_pget): Add new arguments corresponding to the --verbose and

--show-inherited-props options.

(do_plist): Remove comment about returning SVN_ERR_PROPERTY_NOT_FOUND

if no properties are found, we haven't done that ever for proplist,

it appears to simply be a copy & paste typo from way back in r845574.

Add new argument corresponding to the --show-inherited-props option.

(subcommand_pget): Update call to do_plist() and do_pget().

(main): Handle --show-inherited-props. Raise an error if --revprop and

--show-inherited-props options are used together.

* subversion/svnserve/serve.c

(get_props): Update caller.

* subversion/tests/cmdline/svnlook_tests.py

(output_command): Adjust test expectations to account for change in default

output of .svnlook pl'.

* tools/client-side/svn-bench/cl.h

(svn_cl__print_prop_hash): Remove declaration. No need to rename to

svn_cmdline__print_prop_hash, as it was no longer referenced in

tools\client-side\svn-bench.

  1. … 15 more files in changeset.
Merge the inheritable-props branch back to trunk.

See http://svn.haxx.se/dev/archive-2012-09/0177.shtml

  1. … 68 more files in changeset.
* subversion/include/private/svn_cmdline_private.h

(svn_cmdline__apply_config_options): Grammar improvements to docstring.

Add "const" to all "apr_array_header_t *" input parameters in public and

private APIs.

(Note that we are allowed to add "const" to a pointer parameter of a public

API, and have done so before, because that is a backward-compatible API

change and doesn't change the ABI at all.)

The public functions whose prototypes are changed are listed individually

below; the private functions are not.

* subversion/include/svn_auth.h

(svn_auth_open)

* subversion/include/svn_client.h

(svn_client_get_commit_log_t,

svn_client_copy5,

svn_client_copy4,

svn_client_move5,

svn_client_patch)

* subversion/include/svn_delta.h

(svn_delta_path_driver,

svn_file_rev_handler_t,

svn_file_rev_handler_old_t)

* subversion/include/svn_fs.h

(svn_fs_change_txn_props)

* subversion/include/svn_mergeinfo.h

(svn_rangelist_diff,

svn_rangelist_merge,

svn_rangelist_remove,

svn_rangelist_intersect,

svn_rangelist_inheritable2,

svn_rangelist_inheritable,

svn_rangelist_dup)

* subversion/include/svn_opt.h

(svn_opt_args_to_target_array3,

svn_opt_args_to_target_array2,

svn_opt_args_to_target_array,

svn_opt_eat_peg_revisions)

* subversion/include/svn_ra.h

(svn_ra_file_rev_handler_t,

svn_ra_get_locations,

svn_ra_plugin_t.get_locations)

* subversion/include/svn_ra_svn.h

(svn_ra_svn_command_handler,

svn_ra_svn_set_capabilities,

svn_ra_svn_parse_tuple,

svn_ra_svn_parse_proplist)

* subversion/include/svn_repos.h

(svn_repos_file_rev_handler_t,

svn_repos_trace_node_locations,

svn_repos_fs_get_mergeinfo,

svn_repos_fs_change_txn_props,

svn_repos_remember_client_capabilities)

* subversion/include/svn_sorts.h

(svn_sort__bsearch_lower_bound)

* subversion/include/svn_string.h

(svn_cstring_match_glob_list)

* subversion/include/svn_wc.h

(svn_wc_get_status_editor3,

svn_wc_get_update_editor4,

svn_wc_get_update_editor3,

svn_wc_get_switch_editor4,

svn_wc_get_switch_editor3,

svn_wc_match_ignore_list)

* subversion/include/private/svn_cmdline_private.h

* subversion/include/private/svn_opt_private.h

* subversion/libsvn_client/blame.c

* subversion/libsvn_client/client.h

* subversion/libsvn_client/commit.c

* subversion/libsvn_client/commit_util.c

* subversion/libsvn_client/copy.c

* subversion/libsvn_client/deprecated.c

* subversion/libsvn_client/merge.c

* subversion/libsvn_client/mergeinfo.c

* subversion/libsvn_client/mergeinfo.h

* subversion/libsvn_client/patch.c

* subversion/libsvn_client/ra.c

* subversion/libsvn_delta/compat.c

* subversion/libsvn_delta/path_driver.c

* subversion/libsvn_fs_base/reps-strings.c

* subversion/libsvn_fs_base/revs-txns.c

* subversion/libsvn_fs_base/revs-txns.h

* subversion/libsvn_fs_fs/fs_fs.c

* subversion/libsvn_fs_fs/fs_fs.h

* subversion/libsvn_fs/fs-loader.c

* subversion/libsvn_fs/fs-loader.h

* subversion/libsvn_ra/compat.c

* subversion/libsvn_ra/ra_loader.c

* subversion/libsvn_ra/ra_loader.h

* subversion/libsvn_ra/wrapper_template.h

* subversion/libsvn_ra_local/ra_plugin.c

* subversion/libsvn_ra_neon/get_locations.c

* subversion/libsvn_ra_neon/props.c

* subversion/libsvn_ra_neon/ra_neon.h

* subversion/libsvn_ra_serf/getlocations.c

* subversion/libsvn_ra_serf/ra_serf.h

* subversion/libsvn_ra_svn/client.c

* subversion/libsvn_ra_svn/cyrus_auth.c

* subversion/libsvn_ra_svn/editorp.c

* subversion/libsvn_ra_svn/internal_auth.c

* subversion/libsvn_ra_svn/marshal.c

* subversion/libsvn_ra_svn/ra_svn.h

* subversion/libsvn_repos/fs-wrap.c

* subversion/libsvn_repos/log.c

* subversion/libsvn_repos/repos.c

* subversion/libsvn_repos/repos.h

* subversion/libsvn_repos/rev_hunt.c

* subversion/libsvn_subr/auth.c

* subversion/libsvn_subr/cmdline.c

* subversion/libsvn_subr/deprecated.c

* subversion/libsvn_subr/mergeinfo.c

* subversion/libsvn_subr/opt.c

* subversion/libsvn_subr/sorts.c

* subversion/libsvn_subr/svn_string.c

* subversion/libsvn_wc/adm_ops.c

* subversion/libsvn_wc/deprecated.c

* subversion/libsvn_wc/diff.c

* subversion/libsvn_wc/status.c

* subversion/libsvn_wc/update_editor.c

* subversion/libsvn_wc/util.c

* subversion/mod_dav_svn/dav_svn.h

* subversion/mod_dav_svn/reports/file-revs.c

* subversion/mod_dav_svn/util.c

* subversion/svn/cl.h

* subversion/svn/props.c

* subversion/svn/switch-cmd.c

* subversion/svn/util.c

* subversion/svndumpfilter/main.c

* subversion/svnserve/serve.c

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

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

  1. … 78 more files in changeset.
Test out my new and fancy ASF commit priviledges by changing the copyright

wording in our license headers to reflect ownership by the ASF.

* NOTICE:

Change terminology to ASF, and update a link.

* subversion/libsvn_subr/opt.c

(svn_opt__print_version_info): Note that the product as a whole is

copyrighted by the ASF, and update the project website.

* everywhere:

Change license text to reflect ASF ownership.

  1. … 891 more files in changeset.
Scrub trailing whitespace throughout (see r35894).

  1. … 146 more files in changeset.
Relicense Subversion under the Apache License, Version 2.0.

* NOTICE: New.

* LICENSE: New.

* COPYING,

subversion/LICENSE: Remove.

* subversion/libsvn_subr/opt.c

(svn_opt__print_version_info): Note that the product as a whole is

copyrighted by the SVN Corp, and that it contains contributions from

many people, as referenced in NOTICE.

* subversion/bindings/swig/python/LICENSE_FOR_PYTHON_BINDINGS:

Relicense the SVN parts under Apache 2.0.

* everywhere:

Change copyright notices in file headers to reflect the Apache 2.0 license.

  1. … 882 more files in changeset.
Move the --config-option processing from svn to the svn_cmdline__ part of

libsvn_subr to make it possible to use the same parser in svnsync.

* subversion/include/private/svn_cmdline_private.h

(svn_cmdline__config_argument_t): New struct.

(svn_cmdline__parse_config_option): New function.

(svn_cmdline__apply_config_options): New function.

* subversion/libsvn_subr/cmdline.c

(svn_cmdline__parse_config_option): New function.

(svn_cmdline__apply_config_options): New function.

* subversion/svn/main.c

(includes): Include private/svn_cmdline_private.h.

(config_option_t): Remove struct.

(parse_config_option): Remove function.

(main): Use svn_cmdline__parse_config_option and

svn_cmdline__apply_config_options for config option parsing.

  1. … 2 more files in changeset.
Add necessary includes to provide types used by these headers. Each header

now includes everything it needs to be compiled standalone.

* include/private/svn_cmdline_private.h:

* include/private/svn_fs_util.h:

* include/private/svn_mergeinfo_private.h:

* include/private/ra_svn_sasl.h:

* include/private/svn_utf_private.h:

* include/private/svn_auth_private.h:

* include/private/svn_opt_private.h:

(): add some #include lines

  1. … 6 more files in changeset.
Rename svn_auth_unlock_prompt_func_t to

svn_auth_gnome_keyring_unlock_prompt_func_t.

Rename svn_cmdline_auth_unlock_prompt() to

svn_cmdline__auth_gnome_keyring_unlock_prompt().

* subversion/include/svn_auth.h

(svn_auth_unlock_prompt_func_t): Rename to ...

(svn_auth_gnome_keyring_unlock_prompt_func_t): ... this.

(svn_auth_get_gnome_keyring_simple_provider,

svn_auth_get_gnome_keyring_ssl_client_cert_pw_provider): Fix doc string.

* subversion/include/svn_cmdline.h

* subversion/libsvn_subr/prompt.c

(svn_cmdline_auth_unlock_prompt): Rename to ...

* subversion/include/private/svn_cmdline_private.h

* subversion/libsvn_subr/prompt.c

(svn_cmdline__auth_gnome_keyring_unlock_prompt): ... this.

* subversion/libsvn_auth_gnome_keyring/gnome_keyring.c

(simple_gnome_keyring_first_creds,

simple_gnome_keyring_save_creds,

ssl_client_cert_pw_gnome_keyring_first_creds,

ssl_client_cert_pw_gnome_keyring_save_creds): Update.

* subversion/libsvn_subr/cmdline.c

(svn_cmdline_create_auth_baton): Update.

  1. … 5 more files in changeset.
* contrib/server-side/svnstsw/include/svnstsw/exec_svnserve.h,

* contrib/server-side/svnstsw/include/svnstsw/fso_is_changeable.h,

* contrib/server-side/svnstsw/include/svnstsw/get_tunnel_user_name.h,

* contrib/server-side/svnstsw/include/svnstsw/svnstsw.h,

* contrib/server-side/svnstsw/src/exec_svnserve.c,

* contrib/server-side/svnstsw/src/fso_is_changeable.c,

* contrib/server-side/svnstsw/src/get_tunnel_user_name.c,

* contrib/server-side/svnstsw/src/main.c,

* contrib/server-side/svnstsw/src/svnstsw_compat.c,

* contrib/server-side/svnstsw/src/svnstsw_compat.h,

* subversion/include/private/svn_auth_private.h,

* subversion/include/private/svn_cmdline_private.h,

* subversion/include/private/svn_doxygen.h,

* subversion/include/private/svn_log.h,

* subversion/include/private/svn_opt_private.h,

* subversion/include/private/svn_ra_private.h,

* subversion/include/private/svn_utf_private.h,

* subversion/include/svn_cache.h,

* subversion/libsvn_client/cmdline.c,

* subversion/libsvn_fs_fs/caching.c,

* subversion/libsvn_ra/util.c,

* subversion/libsvn_subr/cache-inprocess.c,

* subversion/libsvn_subr/cache-memcache.c,

* subversion/libsvn_subr/cache.c,

* subversion/libsvn_subr/cache.h,

* subversion/libsvn_subr/log.c,

* subversion/libsvn_wc/ambient_depth_filter_editor.c,

* subversion/svnserve/log-escape.c,

* subversion/tests/libsvn_client/client-test.c,

* subversion/tests/libsvn_subr/cache-test.c:

Set the svn:eol-style property to native.

  1. … 29 more files in changeset.
Factor out an XML-printing function that was common to "svn" and "svnlook"

since r31978.

This follows up to r32015, r32018, r32021, r32022, r32043, r32060 and

the discussions in this thread:

http://svn.haxx.se/dev/archive-2008-07/0227.shtml

* build.conf

(libsvn_subr): Add svn_cmdline_private.h to msvc-export.

* subversion/libsvn_subr/cmdline.c

(): Include svn_xml.h, svn_base64.h

(svn_cmdline__print_xml_prop): New name for svn_cl__print_xml_prop().

* subversion/svn/props.c

(): Include svn_cmdline_private.h

(svn_cl__print_xml_prop): Removed, since it is renamed to

svn_cmdline__print_xml_prop.

(svn_cl__print_xml_prop_hash): Use svn_cmdline__print_xml_prop due to

above change.

* subversion/svn/cl.h

(svn_cl__print_xml_prop): Move to ..

* subversion/include/private/svn_cmdline_private.h

(svn_cmdline__print_xml_prop): .. here

* subversion/svn/propget-cmd.c

(): Include svn_cmdline_private.h

(print_properties_xml, svn_cl__propget): Use svn_cmdline__print_xml_prop

due to above change.

* subversion/svnlook/main.c

(): Include svn_cmdline_private.h

(print_xml_prop): Removed since we can use svn_cmdline__print_xml_prop now.

(do_plist): Use svn_cmdline__print_xml_prop due to above changes.

Patch by: stylesen

Suggested by: glasser

  1. … 6 more files in changeset.