Checkout Tools
  • last updated 25 mins ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Issue #4828: by default, hide global options too.

* subversion/libsvn_subr/opt.c

(print_command_info3, subcommand_help): Let 'verbose' apply to global options a well.

* subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout

Adjust expected help output.

  1. … 1 more file in changeset.
Issue #4828: remind user they can use '-v' to show experimental subcommands.

* subversion/libsvn_subr/opt.c

(print_generic_help_body3): Show a reminder if experimental subcommands were

hidden.

Issue #4828: remind user they can use '-v' to show experimental options.

* subversion/libsvn_subr/opt.c

(print_command_info3): Show a reminder if experimental options were

hidden.

Issue #4828, Hide experimental commands and options by default.

* subversion/libsvn_subr/opt.c

(print_command_info3,

print_generic_help_body3): Show commands and options starting with

'x-' only if new 'with_experimental' option is true.

(print_generic_help): Extracted from 'svn_opt_print_generic_help3', to

take the new 'with_experimental' option.

(subcommand_help): Extracted from 'svn_opt_subcommand_help4', to

take the new 'with_experimental' option.

(svn_opt_print_help5): Let the 'verbose' option control 'with

experimental', when printing help. The 'verbose' option previously was

not used here except for the case of printing version info.

* subversion/svn/svn.c

Let 'help' take the '-v' option.

* subversion/tests/cmdline/getopt_tests_data/svn_help_stdout

* subversion/tests/cmdline/getopt_tests_data/svn--help_stdout

Adjust the expected output.

* tools/dist/backport.pl

[Accidental change; reverted in 1866189.]

  1. … 4 more files in changeset.
Deprecate the previous version of the command-line help text API, following

r1826328.

* subversion/include/svn_opt.h

Deprecate.

* subversion/libsvn_subr/opt.c

Move deprecated functions and their helpers (and copy one of them)...

* subversion/libsvn_subr/deprecated.c

... to here.

* subversion/svnmucc/svnmucc.c,

subversion/svnrdump/svnrdump.c,

subversion/svnserve/svnserve.c,

subversion/svnversion/svnversion.c,

tools/dev/svnmover/svnmover.c,

tools/dev/svnraisetreeconflict/svnraisetreeconflict.c,

tools/dev/wc-ng/svn-wc-db-tester.c

Bump remaining calls to svn_opt_print_help4() to svn_opt_print_help5().

  1. … 9 more files in changeset.
Allow splitting long help strings into paragraphs to ease translation.

Issue SVN-4724.

Some of the tools our translators use do not handle very long (multi-

paragraph) strings well, just showing the whole string has changed. The

recommended solution is to split long strings at paragraph boundaries in the

source code.

This patch revises svn_opt_subcommand_desc2_t into svn_opt_subcommand_desc3_t

supporting an array of strings instead of a single string for the main help

text, and revises all the supporting functions accordingly.

This patch does not split each long string into paragrpahs, it only adds the

mechanism for doing so.

* subversion/include/svn_opt.h,

subversion/libsvn_subr/opt.c

(SVN_OPT_MAX_PARAGRAPHS,

svn_opt_subcommand_desc3_t,

svn_opt_get_canonical_subcommand3,

svn_opt_get_option_from_code3,

svn_opt_subcommand_takes_option4,

svn_opt_print_generic_help3,

svn_opt_subcommand_help4,

svn_opt_print_help5): New.

  1. … 1 more file in changeset.
Refactor code to avoid goto statement and use consistent error handling.

* subversion/libsvn_subr/opt.c

(print_generic_help_body): Extract from svn_opt_subcommand_help3().

(svn_opt_print_generic_help2): Use print_generic_help_body() and handle

errors if any.

Don't reject command-line arguments of the form ".@abc", where "abc" is a

peg specifier that may be empty.

Since r878062, this form has been rejected with the error

svn: E125001: '@abc' is just a peg revision. Maybe try '@abc@' instead?

apparently as an unintended side effect of rejecting the potentially

ambiguous form "@abc". The fix is to move the check up to a higher level

function.

* subversion/include/svn_client.h,

subversion/libsvn_client/cmdline.c

(svn_client_args_to_target_array2): Reject an argument of the form "@abc".

At this point the argument has not yet been converted to internal style.

Document that an argument of the form "@abc" is an error.

* subversion/include/private/svn_opt_private.h,

subversion/libsvn_subr/opt.c

(svn_opt__split_arg_at_peg_revision): Don't throw an error when the path

portion of the target is empty.

  1. … 3 more files in changeset.
Fix another instance of issue #3014: "svn log | head" should not print

"Write error: Broken pipe". This time, it affects help on subcommands.

$ svn help up | head

subversion/libsvn_subr/opt.c:317,

subversion/libsvn_subr/cmdline.c:446: (apr_err=SVN_ERR_IO_PIPE_WRITE_ERROR)

svn: E135007: Write error in pipe

* subversion/libsvn_subr/opt.c

(svn_opt_subcommand_help3): Don't print anything for pipe-write errors.

Revert r1508225, which moved the include of svn_private_config.h before all

includes of our public headers. Public headers shouldn't depend on private

headers and all changes that required this are long reverted on trunk.

This patch excludes all conflicting cases.

* subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c

* subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c

* subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c

* subversion/libsvn_auth_gnome_keyring/gnome_keyring.c

* subversion/libsvn_client/add.c

* subversion/libsvn_client/cat.c

* subversion/libsvn_client/changelist.c

* subversion/libsvn_client/cleanup.c

* subversion/libsvn_client/commit.c

* subversion/libsvn_client/commit_util.c

* subversion/libsvn_client/copy.c

* subversion/libsvn_client/copy_foreign.c

* subversion/libsvn_client/ctx.c

* subversion/libsvn_client/delete.c

* subversion/libsvn_client/deprecated.c

* subversion/libsvn_client/diff.c

* subversion/libsvn_client/diff_local.c

* subversion/libsvn_client/diff_summarize.c

* subversion/libsvn_client/export.c

* subversion/libsvn_client/externals.c

* subversion/libsvn_client/import.c

* subversion/libsvn_client/info.c

* subversion/libsvn_client/iprops.c

* subversion/libsvn_client/list.c

* subversion/libsvn_client/locking_commands.c

* subversion/libsvn_client/log.c

* subversion/libsvn_client/merge.c

* subversion/libsvn_client/mergeinfo.c

* subversion/libsvn_client/patch.c

* subversion/libsvn_client/prop_commands.c

* subversion/libsvn_client/ra.c

* subversion/libsvn_client/repos_diff.c

* subversion/libsvn_client/resolved.c

* subversion/libsvn_client/revert.c

* subversion/libsvn_client/switch.c

* subversion/libsvn_client/update.c

* subversion/libsvn_client/util.c

* subversion/libsvn_delta/compat.c

* subversion/libsvn_delta/xdelta.c

* subversion/libsvn_diff/parse-diff.c

* subversion/libsvn_diff/util.c

* subversion/libsvn_fs/access.c

* subversion/libsvn_fs_base/bdb/changes-table.c

* subversion/libsvn_fs_base/bdb/env.c

* subversion/libsvn_fs_base/dag.c

* subversion/libsvn_fs_base/fs.c

* subversion/libsvn_fs_base/lock.c

* subversion/libsvn_fs_base/revs-txns.c

* subversion/libsvn_fs_base/tree.c

* subversion/libsvn_fs_fs/caching.c

* subversion/libsvn_fs_fs/lock.c

* subversion/libsvn_fs_fs/temp_serializer.c

* subversion/libsvn_fs_fs/tree.c

* subversion/libsvn_ra/compat.c

* subversion/libsvn_ra/deprecated.c

* subversion/libsvn_ra/ra_loader.c

* subversion/libsvn_ra_local/ra_plugin.c

* subversion/libsvn_ra_serf/blame.c

* subversion/libsvn_ra_serf/blncache.c

* subversion/libsvn_ra_serf/commit.c

* subversion/libsvn_ra_serf/getlocations.c

* subversion/libsvn_ra_serf/getlocationsegments.c

* subversion/libsvn_ra_serf/getlocks.c

* subversion/libsvn_ra_serf/inherited_props.c

* subversion/libsvn_ra_serf/log.c

* subversion/libsvn_ra_serf/merge.c

* subversion/libsvn_ra_serf/mergeinfo.c

* subversion/libsvn_ra_serf/options.c

* subversion/libsvn_ra_serf/property.c

* subversion/libsvn_ra_serf/replay.c

* subversion/libsvn_ra_serf/serf.c

* subversion/libsvn_ra_serf/update.c

* subversion/libsvn_ra_serf/util.c

* subversion/libsvn_ra_serf/xml.c

* subversion/libsvn_ra_svn/client.c

* subversion/libsvn_ra_svn/editorp.c

* subversion/libsvn_ra_svn/marshal.c

* subversion/libsvn_repos/authz.c

* subversion/libsvn_repos/commit.c

* subversion/libsvn_repos/delta.c

* subversion/libsvn_repos/deprecated.c

* subversion/libsvn_repos/fs-wrap.c

* subversion/libsvn_repos/hooks.c

* subversion/libsvn_repos/log.c

* subversion/libsvn_repos/replay.c

* subversion/libsvn_repos/reporter.c

* subversion/libsvn_repos/repos.c

* subversion/libsvn_repos/rev_hunt.c

* subversion/libsvn_subr/auth.c

* subversion/libsvn_subr/cmdline.c

* subversion/libsvn_subr/compat.c

* subversion/libsvn_subr/config.c

* subversion/libsvn_subr/config_auth.c

* subversion/libsvn_subr/deprecated.c

* subversion/libsvn_subr/dso.c

* subversion/libsvn_subr/hash.c

* subversion/libsvn_subr/io.c

* subversion/libsvn_subr/mergeinfo.c

* subversion/libsvn_subr/opt.c

* subversion/libsvn_subr/properties.c

* subversion/libsvn_subr/simple_providers.c

* subversion/libsvn_subr/sorts.c

* subversion/libsvn_subr/ssl_client_cert_providers.c

* subversion/libsvn_subr/ssl_client_cert_pw_providers.c

* subversion/libsvn_subr/ssl_server_trust_providers.c

* subversion/libsvn_subr/subst.c

* subversion/libsvn_subr/types.c

* subversion/libsvn_subr/username_providers.c

* subversion/libsvn_subr/utf.c

* subversion/libsvn_subr/win32_crypto.c

* subversion/libsvn_wc/adm_crawler.c

* subversion/libsvn_wc/adm_files.c

* subversion/libsvn_wc/conflicts.c

* subversion/libsvn_wc/copy.c

* subversion/libsvn_wc/deprecated.c

* subversion/libsvn_wc/diff_editor.c

* subversion/libsvn_wc/diff_local.c

* subversion/libsvn_wc/entries.c

* subversion/libsvn_wc/externals.c

* subversion/libsvn_wc/info.c

* subversion/libsvn_wc/lock.c

* subversion/libsvn_wc/node.c

* subversion/libsvn_wc/old-and-busted.c

* subversion/libsvn_wc/props.c

* subversion/libsvn_wc/revert.c

* subversion/libsvn_wc/status.c

* subversion/libsvn_wc/update_editor.c

* subversion/libsvn_wc/upgrade.c

* subversion/libsvn_wc/wc_db_update_move.c

* subversion/libsvn_wc/wc_db_wcroot.c

* subversion/mod_dav_svn/repos.c

* subversion/mod_dav_svn/version.c

* subversion/svn/cl-conflicts.c

* subversion/svn/commit-cmd.c

* subversion/svn/conflict-callbacks.c

* subversion/svn/diff-cmd.c

* subversion/svn/help-cmd.c

* subversion/svn/notify.c

* subversion/svn/propedit-cmd.c

* subversion/svn/propget-cmd.c

* subversion/svn/props.c

* subversion/svn/status-cmd.c

* subversion/svn/status.c

* subversion/svn/svn.c

* subversion/svn/util.c

* subversion/svnadmin/svnadmin.c

* subversion/svnlook/svnlook.c

* subversion/svnrdump/dump_editor.c

* subversion/svnrdump/svnrdump.c

* subversion/svnrdump/util.c

* subversion/svnserve/serve.c

* subversion/svnsync/svnsync.c

* subversion/svnsync/sync.c

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

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

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

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

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

* subversion/tests/libsvn_wc/conflict-data-test.c

* subversion/tests/libsvn_wc/op-depth-test.c

* subversion/tests/libsvn_wc/wc-test.c

* subversion/tests/svn_test_fs.c

* tools/server-side/fsfs-stats.c

Move the svn_string_private.h include back to the original location.

  1. … 162 more files in changeset.
Fix some typos.

* CHANGES:

* contrib/cgi/mirror_dir_through_svn.cgi:

* contrib/client-side/emacs/psvn.el:

* contrib/client-side/svn2cl/svn2cl.xsl:

* contrib/hook-scripts/remove-zombie-locks.py:

* contrib/hook-scripts/syntax-check.sh:

* contrib/server-side/svnstsw/configure.ac:

* notes/assurance.txt:

* notes/fs-improvements.txt:

* notes/knobs:

* notes/merge-tracking/func-spec.html:

* notes/merge-tracking/summit-survey.html:

* notes/wc-ng/design:

* notes/wc-ng/locking:

* notes/wc-ng/nodes:

* subversion/bindings/ctypes-python/csvn/core/__init__.py:

* subversion/bindings/ctypes-python/examples/example.py:

* subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictResult.java:

* subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java:

* subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNClient.java:

* subversion/bindings/javahl/src/org/apache/subversion/javahl/SVNRepos.java:

* subversion/bindings/javahl/src/org/tigris/subversion/javahl/ConflictResult.java:

* subversion/bindings/javahl/src/org/tigris/subversion/javahl/PropertyData.java:

* subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNAdmin.java:

* subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java:

* subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java:

* subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java:

* subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java:

* subversion/bindings/swig/include/proxy_apr.swg:

* subversion/bindings/swig/perl/native/Client.pm:

* subversion/bindings/swig/perl/native/t/3client.t:

* subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c:

* subversion/include/private/svn_diff_tree.h:

* subversion/include/private/svn_io_private.h:

* subversion/include/private/svn_ra_svn_private.h:

* subversion/include/private/svn_string_private.h:

* subversion/include/svn_io.h:

* subversion/include/svn_iter.h:

* subversion/include/svn_props.h:

* subversion/libsvn_client/copy_foreign.c:

* subversion/libsvn_client/diff.c:

* subversion/libsvn_client/merge.c:

* subversion/libsvn_delta/xdelta.c:

* subversion/libsvn_diff/diff4.c:

* subversion/libsvn_diff/util.c:

* subversion/libsvn_fs/editor.c:

* subversion/libsvn_fs_fs/index.c:

* subversion/libsvn_fs_fs/temp_serializer.c:

* subversion/libsvn_fs_fs/temp_serializer.h:

* subversion/libsvn_fs_fs/transaction.c:

* subversion/libsvn_fs_fs/tree.c:

* subversion/libsvn_fs_x/fs.h:

* subversion/libsvn_fs_x/index.c:

* subversion/libsvn_fs_x/reps.c:

* subversion/libsvn_fs_x/temp_serializer.c:

* subversion/libsvn_fs_x/temp_serializer.h:

* subversion/libsvn_fs_x/transaction.c:

* subversion/libsvn_fs_x/tree.c:

* subversion/libsvn_ra_serf/README:

* subversion/libsvn_ra_svn/protocol:

* subversion/libsvn_repos/dump.c:

* subversion/libsvn_repos/hooks.c:

* subversion/libsvn_repos/load-fs-vtable.c:

* subversion/libsvn_subr/dirent_uri.c:

* subversion/libsvn_subr/io.c:

* subversion/libsvn_subr/opt.c:

* subversion/libsvn_subr/string.c:

* subversion/libsvn_subr/subst.c:

* subversion/libsvn_wc/entries.c:

* subversion/libsvn_wc/externals.c:

* subversion/libsvn_wc/lock.c:

* subversion/libsvn_wc/update_editor.c:

* subversion/svn/file-merge.c:

* subversion/svn/status-cmd.c:

* subversion/svnlook/svnlook.c:

* subversion/svnrdump/load_editor.c:

* subversion/svnserve/svnserve.c:

* subversion/tests/cmdline/commit_tests.py:

* subversion/tests/cmdline/diff_tests.py:

* subversion/tests/cmdline/merge_reintegrate_tests.py:

* subversion/tests/cmdline/merge_tests.py:

* subversion/tests/cmdline/revert_tests.py:

* subversion/tests/cmdline/svnauthz_tests.py:

* subversion/tests/cmdline/svntest/factory.py:

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

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

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

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

* subversion/tests/libsvn_wc/db-test.c:

* subversion/tests/svn_test_main.c:

* tools/dev/trails.py: Fix some typos.

Patch by: Veres Lajos <vlajos{_AT_}gmail.com>

(I removed some changes that were wrong or can't be made due to API breakage)

  1. … 90 more files in changeset.
Introduce a null-pointer constant that we can use as a termination sentinel

in variable argument lists. This avoids the ugliness of writing

"(char *) NULL" all over the place.

* subversion/include/svn_types.h (SVN_VA_NULL): New symbol.

* subversion/include/svn_dirent_uri.h (svn_dirent_join_many),

subversion/include/svn_path.h (svn_path_join_many),

subversion/include/svn_xml.h (svn_xml_make_open_tag):

Update docstrings, mentioning SVN_VA_NULL as the argument list terminator.

[Lots of implementation files]: Replace typecast-NULL with SVN_VA_NULL in

function calls with variable argument lists.

  1. … 89 more files in changeset.
Fix the #include order such that svn_private_config.h is always

included first before any other svn header - if we also include

svn_hash.h.

* subversion/bindings/javahl/native/org_apache_subversion_javahl_ConfigImpl_Category.cpp,

subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c,

subversion/bindings/swig/python/libsvn_swig_py/swigutil_py.c,

subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c,

subversion/libsvn_auth_gnome_keyring/gnome_keyring.c,

subversion/libsvn_client/add.c,

subversion/libsvn_client/cat.c,

subversion/libsvn_client/changelist.c,

subversion/libsvn_client/cleanup.c,

subversion/libsvn_client/commit.c,

subversion/libsvn_client/commit_util.c,

subversion/libsvn_client/copy.c,

subversion/libsvn_client/copy_foreign.c,

subversion/libsvn_client/ctx.c,

subversion/libsvn_client/delete.c,

subversion/libsvn_client/deprecated.c,

subversion/libsvn_client/diff.c,

subversion/libsvn_client/diff_local.c,

subversion/libsvn_client/diff_summarize.c,

subversion/libsvn_client/export.c,

subversion/libsvn_client/externals.c,

subversion/libsvn_client/import.c,

subversion/libsvn_client/info.c,

subversion/libsvn_client/iprops.c,

subversion/libsvn_client/list.c,

subversion/libsvn_client/locking_commands.c,

subversion/libsvn_client/log.c,

subversion/libsvn_client/merge.c,

subversion/libsvn_client/mergeinfo.c,

subversion/libsvn_client/patch.c,

subversion/libsvn_client/prop_commands.c,

subversion/libsvn_client/ra.c,

subversion/libsvn_client/repos_diff.c,

subversion/libsvn_client/resolved.c,

subversion/libsvn_client/revert.c,

subversion/libsvn_client/status.c,

subversion/libsvn_client/switch.c,

subversion/libsvn_client/update.c,

subversion/libsvn_client/util.c,

subversion/libsvn_delta/compat.c,

subversion/libsvn_delta/xdelta.c,

subversion/libsvn_diff/parse-diff.c,

subversion/libsvn_diff/util.c,

subversion/libsvn_fs/access.c,

subversion/libsvn_fs_base/bdb/changes-table.c,

subversion/libsvn_fs_base/bdb/env.c,

subversion/libsvn_fs_base/dag.c,

subversion/libsvn_fs_base/fs.c,

subversion/libsvn_fs_base/lock.c,

subversion/libsvn_fs_base/revs-txns.c,

subversion/libsvn_fs_base/tree.c,

subversion/libsvn_fs_fs/caching.c,

subversion/libsvn_fs_fs/fs_fs.c,

subversion/libsvn_fs/fs-loader.c,

subversion/libsvn_fs_fs/lock.c,

subversion/libsvn_fs_fs/temp_serializer.c,

subversion/libsvn_fs_fs/tree.c,

subversion/libsvn_fs_util/fs-util.c,

subversion/libsvn_ra/compat.c,

subversion/libsvn_ra/deprecated.c,

subversion/libsvn_ra_local/ra_plugin.c,

subversion/libsvn_ra/ra_loader.c,

subversion/libsvn_ra_serf/blame.c,

subversion/libsvn_ra_serf/blncache.c,

subversion/libsvn_ra_serf/commit.c,

subversion/libsvn_ra_serf/getlocations.c,

subversion/libsvn_ra_serf/getlocationsegments.c,

subversion/libsvn_ra_serf/getlocks.c,

subversion/libsvn_ra_serf/inherited_props.c,

subversion/libsvn_ra_serf/log.c,

subversion/libsvn_ra_serf/merge.c,

subversion/libsvn_ra_serf/mergeinfo.c,

subversion/libsvn_ra_serf/options.c,

subversion/libsvn_ra_serf/property.c,

subversion/libsvn_ra_serf/replay.c,

subversion/libsvn_ra_serf/serf.c,

subversion/libsvn_ra_serf/update.c,

subversion/libsvn_ra_serf/util.c,

subversion/libsvn_ra_serf/xml.c,

subversion/libsvn_ra_svn/client.c,

subversion/libsvn_ra_svn/editorp.c,

subversion/libsvn_ra_svn/marshal.c,

subversion/libsvn_repos/authz.c,

subversion/libsvn_repos/commit.c,

subversion/libsvn_repos/delta.c,

subversion/libsvn_repos/deprecated.c,

subversion/libsvn_repos/fs-wrap.c,

subversion/libsvn_repos/hooks.c,

subversion/libsvn_repos/log.c,

subversion/libsvn_repos/replay.c,

subversion/libsvn_repos/reporter.c,

subversion/libsvn_repos/repos.c,

subversion/libsvn_repos/rev_hunt.c,

subversion/libsvn_subr/auth.c,

subversion/libsvn_subr/cmdline.c,

subversion/libsvn_subr/compat.c,

subversion/libsvn_subr/config_auth.c,

subversion/libsvn_subr/config.c,

subversion/libsvn_subr/deprecated.c,

subversion/libsvn_subr/dso.c,

subversion/libsvn_subr/hash.c,

subversion/libsvn_subr/io.c,

subversion/libsvn_subr/mergeinfo.c,

subversion/libsvn_subr/opt.c,

subversion/libsvn_subr/properties.c,

subversion/libsvn_subr/simple_providers.c,

subversion/libsvn_subr/sorts.c,

subversion/libsvn_subr/ssl_client_cert_providers.c,

subversion/libsvn_subr/ssl_client_cert_pw_providers.c,

subversion/libsvn_subr/ssl_server_trust_providers.c,

subversion/libsvn_subr/subst.c,

subversion/libsvn_subr/types.c,

subversion/libsvn_subr/username_providers.c,

subversion/libsvn_subr/utf.c,

subversion/libsvn_subr/win32_crypto.c,

subversion/libsvn_wc/adm_crawler.c,

subversion/libsvn_wc/adm_files.c,

subversion/libsvn_wc/adm_ops.c,

subversion/libsvn_wc/conflicts.c,

subversion/libsvn_wc/copy.c,

subversion/libsvn_wc/deprecated.c,

subversion/libsvn_wc/diff_editor.c,

subversion/libsvn_wc/diff_local.c,

subversion/libsvn_wc/entries.c,

subversion/libsvn_wc/externals.c,

subversion/libsvn_wc/info.c,

subversion/libsvn_wc/lock.c,

subversion/libsvn_wc/node.c,

subversion/libsvn_wc/old-and-busted.c,

subversion/libsvn_wc/props.c,

subversion/libsvn_wc/revert.c,

subversion/libsvn_wc/status.c,

subversion/libsvn_wc/translate.c,

subversion/libsvn_wc/update_editor.c,

subversion/libsvn_wc/upgrade.c,

subversion/libsvn_wc/wc_db.c,

subversion/libsvn_wc/wc_db_update_move.c,

subversion/libsvn_wc/wc_db_wcroot.c,

subversion/libsvn_wc/workqueue.c,

subversion/mod_dav_svn/activity.c,

subversion/mod_dav_svn/deadprops.c,

subversion/mod_dav_svn/lock.c,

subversion/mod_dav_svn/merge.c,

subversion/mod_dav_svn/mod_dav_svn.c,

subversion/mod_dav_svn/reports/update.c,

subversion/mod_dav_svn/repos.c,

subversion/mod_dav_svn/version.c,

subversion/svnadmin/svnadmin.c,

subversion/svnauth/svnauth.c,

subversion/svn/cl-conflicts.c,

subversion/svn/commit-cmd.c,

subversion/svn/conflict-callbacks.c,

subversion/svn/diff-cmd.c,

subversion/svn/help-cmd.c,

subversion/svnlook/svnlook.c,

subversion/svnmucc/svnmucc.c,

subversion/svn/notify.c,

subversion/svn/propedit-cmd.c,

subversion/svn/propget-cmd.c,

subversion/svn/props.c,

subversion/svnrdump/dump_editor.c,

subversion/svnrdump/svnrdump.c,

subversion/svnrdump/util.c,

subversion/svnserve/serve.c,

subversion/svn/status.c,

subversion/svn/status-cmd.c,

subversion/svn/svn.c,

subversion/svnsync/svnsync.c,

subversion/svnsync/sync.c,

subversion/svn/util.c,

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

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

subversion/tests/libsvn_subr/hashdump-test.c,

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

subversion/tests/libsvn_subr/subst_translate-test.c,

subversion/tests/libsvn_wc/conflict-data-test.c,

subversion/tests/libsvn_wc/op-depth-test.c,

subversion/tests/libsvn_wc/wc-test.c,

subversion/tests/svn_test_fs.c,

tools/dev/fsfs-reorg.c,

tools/server-side/fsfs-stats.c): #include svn_private_config.h first

  1. … 180 more files in changeset.
Use svn_hash_gets and svn_hash_sets.

* subversion/libsvn_subr/auth.c

* subversion/libsvn_subr/cmdline.c

* subversion/libsvn_subr/compat.c

* subversion/libsvn_subr/config.c

* subversion/libsvn_subr/config_auth.c

* subversion/libsvn_subr/deprecated.c

* subversion/libsvn_subr/dso.c

* subversion/libsvn_subr/hash.c

* subversion/libsvn_subr/io.c

* subversion/libsvn_subr/mergeinfo.c

* subversion/libsvn_subr/opt.c

* subversion/libsvn_subr/properties.c

* subversion/libsvn_subr/simple_providers.c

* subversion/libsvn_subr/ssl_client_cert_providers.c

* subversion/libsvn_subr/ssl_client_cert_pw_providers.c

* subversion/libsvn_subr/ssl_server_trust_providers.c

* subversion/libsvn_subr/subst.c

* subversion/libsvn_subr/types.c

* subversion/libsvn_subr/username_providers.c

* subversion/libsvn_subr/utf.c

* subversion/libsvn_subr/win32_crypto.c

* subversion/libsvn_subr/xml.c

  1. … 21 more files in changeset.
Coding style patch: in logical expressions, instead of comparing

with arithmetic constants use boolean operations. I.e. replace

<expr> == TRUE with <expr> and

<expr> == FALSE with !<expr>

* subversion/libsvn_delta/svndiff.c

(send_simple_insertion_window,

window_handler): change condition style

* subversion/libsvn_fs_base/fs.c

(svn_fs_base__clean_logs): ditto

* subversion/libsvn_fs_fs/fs_fs.c

(representation_string,

create_rep_state_body,

build_rep_list): ditto

* subversion/libsvn_ra_serf/locks.c

(handle_lock): ditto

* subversion/libsvn_ra_serf/property.c

(create_propfind_body): same here,

* subversion/libsvn_ra_serf/update.c

(cancel_fetch,

handle_fetch,

end_report,

finish_report): here,

* subversion/libsvn_ra_serf/util.c

(svn_ra_serf__handle_xml_parser): here,

* subversion/libsvn_ra_svn/client.c

(optbool_to_tristate): here,

* subversion/libsvn_repos/authz.c

(authz_parse_section): and here.

* subversion/libsvn_repos/fs-wrap.c

(svn_repos__validate_prop): here as well

* subversion/libsvn_subr/cmdline.c

(svn_cmdline_create_auth_baton): and here

* subversion/libsvn_subr/deprecated.c

(print_command_info): here

* subversion/libsvn_subr/opt.c

(print_command_info2): more of the same

* subversion/libsvn_subr/subst.c

(translate_chunk): ditto

* subversion/libsvn_subr/win32_crashrpt.c

(write_var_values,

svn__unhandled_exception_filter): ditto

* subversion/svn/svn.c

(sub_main): ditto

* subversion/svnsync/svnsync.c

(filter_props): and more of the

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

(test_readonly): same thing

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

(test21): ditto

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

(test_svn_subst_translate_string2_null_encode): here

* subversion/tests/libsvn_wc/db-test.c

(test_getting_info,

test_working_info): and here

* tools/client-side/svn-bench/svn-bench.c

(sub_main): and finally here

  1. … 21 more files in changeset.
Make "svn --version"'s warning about enabled plaintext passwords depend on

configuration file settings, not just compile-time options.

* subversion/libsvn_subr/opt.c (svn_opt__print_version_info): Remove the code

that emitted the warning about enabled plaintext password storage.

* subversion/svn/help-cmd.c (svn_cl__help): Depending on configuration

settings and compile-time options, prepend the warning to the version

footer when calling svn_opt_print_help4.

  1. … 1 more file in changeset.
* subversion/libsvn_subr/opt.c: Do not inculde unused unistd.h.

Found by: rhuijben

Don't colourize the plaintext-store warning,

and don't ignore too many blank lines in the svn --version tests.

* subversion/libsvn_subr/opt.c (svn_opt__print_version_info):

Remove colour escapes. Add fixme comment about the meaning

of the configuration flag.

* subversion/tests/cmdline/getopt_tests.py (process_lines):

Instead of ignoring all blank lines, skip just the one

after the plaintext-password storage warning.

  1. … 1 more file in changeset.
* subversion/libsvn_subr/opt.c

(svn_opt__print_version_info): Following up on r1422811, fix the test for

SVN_DISABLE_PLAINTEXT_PASSWORD_STORAGE that I accidentally reversed.

* subversion/libsvn_subr/opt.c

(svn_opt__print_version_info): Don't produce warnings for storing password

as plain text when we store them as encrypted text.

Print a warning in "svn --version" if plaintext password storage is enabled.

* subversion/libsvn_subr/opt.c: Inlcude unistd.h on *nix.

(svn_opt__print_version_info): If plaintext password storage is

enabled, print a warning about that after the copyright notice.

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

(is_plaintext_password_storage_disabled): Instead of looking for

and scanning svn_private_config.h, look for the warning emitted

by "svn --version".

  1. … 1 more file in changeset.
Make the extended version info an opaque type.

* subversion/include/svn_version.h (svn_version_extended_t): Remove definition,

leaving only a forward-declared typedef.

(svn_version_ext_linked_lib_t): Renamed from svn_version_linked_lib_t.

(svn_version_ext_loaded_lib_t): Renamed from svn_version_loaded_lib_t.

(svn_version_extended): Update docstring.

(svn_version_ext_build_date, svn_version_ext_build_time,

svn_version_ext_build_host, svn_version_ext_copyright,

svn_version_ext_runtime_host, svn_version_ext_runtime_osname,

svn_version_ext_linked_libs, svn_version_ext_loaded_libs): New; accessor

functions for svn_version_extended_t.

* subversion/libsvn_subr/version.c (svn_version_extended_t): Define here.

Remove the version_number and version_string fields, they're redundant.

(svn_version_extended) remove initialization for version_number

and version_string.

(svn_version_ext_build_date, svn_version_ext_build_time,

svn_version_ext_build_host, svn_version_ext_copyright,

svn_version_ext_runtime_host, svn_version_ext_runtime_osname,

svn_version_ext_linked_libs, svn_version_ext_loaded_libs): Implement.

* subversion/libsvn_subr/opt.c (svn_opt__print_version_info): Use the new

svn_version_ext_* accessors to retreive extended version information.

Use SVN_VER_NUMBER and SVN_VERSION since these fields are no longer

part of the extended version info.

* subversion/libsvn_subr/sysinfo.c: Propagate renames of

svn_version_ext_linked_lib_t and svn_version_ext_loaded_lib_t.

  1. … 3 more files in changeset.
Make the extended version info retrieval a public API.

* subversion/include/svn_version.h: Include apr_tables.h.

(svn_version_extended_t): Move here, rename from svn_opt__version_info_t.

(svn_version_linked_lib_t): Move here, rename from svn_sysinfo__linked_lib_t.

(svn_version_loaded_lib_t): Move here, rename from svn_sysinfo__loaded_lib_t.

(svn_version_extended): Move here, rename from svn_opt__get_version_info.

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

(svn_version_extended): Move here, renamed and updated from

svn_opt__get_version_info.

* subversion/libsvn_subr/sysinfo.h

(svn_sysinfo__linked_lib_t, svn_sysinfo__loaded_lib_t): Moved and

renamed to subversion/include/svn_version.h.

(svn_sysinfo__linked_libs, svn_sysinfo__loaded_libs): Update docstring.

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

(svn_sysinfo__linked_libs, svn_sysinfo__loaded_libs):

Update, using new type names.

* subversion/libsvn_subr/opt.h:

Include svn_version.h. Do not include apr_tables.h.

(svn_opt__version_info_t, svn_opt__get_version_info):

Moved and renamed to subversion/include/svn_version.h

(svn_opt__print_version_info): Update type name in prototype.

* subversion/libsvn_subr/opt.c: Do not include sysinfo.h.

(svn_opt__get_version_info): Moved and renamed to

subversion/libsvn_subr/version.c.

(svn_opt__print_version_info, svn_opt_print_help):

Update, use public svn_version_extended API.

* subversion/libsvn_subr/deprecated.c: Include svn_version.h.

(svn_opt_print_help): Update, use public svn_version_extended API.

* subversion/tests/cmdline/getopt_tests.py

(switch_res_line, switched_del_lines_res, switched_rep_lines_res):

New filters for extended version information.

(process_lines): Use the new filters.

(getopt__version__verbose): New test for "svn --version --verbose".

* subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stdout,

subversion/tests/cmdline/getopt_tests_data/svn--version--verbose_stderr: New.

  1. … 9 more files in changeset.
* subversion/libsvn_subr/opt.c (svn_opt__get_version_info):

Reformat the copyright message. The wording didn't change.

Make the expensive bits of version retreival optional.

* subversion/libsvn_subr/opt.h (svn_opt__get_version_info):

Change prototype: add verbose flag.

* subversion/libsvn_subr/opt.h (svn_opt__get_version_info):

Gather runtime system info only when verbose is set.

(svn_opt_print_help4): Update.

* subversion/libsvn_subr/deprecated.c (svn_opt_print_help): Update.

  1. … 2 more files in changeset.
Followup to r1379689: gather version and system information in a structure

instead of a huge string, and make combining it to stdout a separate step.

* subversion/libsvn_subr/sysinfo.h: Inclulde apr_tables.h.

(svn_sysinfo__linked_lib_t): New struct type.

(svn_sysinfo__linked_libs): Return an APR array of svn_sysinfo__linked_lib_t

instead of a preconstructed string.

(svn_sysinfo__loaded_lib_t): New struct type.

(svn_sysinfo__loaded_libs): Return an APR array of svn_sysinfo__loaded_lib_t

instead of a preconstructed string.

* subversion/libsvn_subr/sysinfo.c (svn_sysinfo__linked_libs): Update.

(svn_sysinfo__loaded_libs): Update.

(win32_shared_libs): Update, make return value an APR array.

(release_name_from_uname) Define only unless SVN_HAVE_MACOS_PLIST

to avoid compiler warnings about unused static function on Mac OS X.

* subversion/libsvn_subr/opt.h: Include apr_tables.h.

(svn_opt__version_info_t): New struct. Contains all the information that

was formerly returned in a string by svn_opt__get_version_info.

(svn_opt__get_version_info): Change signature; returns a svn_opt__version_info_t.

(svn_opt__print_version_info): Reinstate, but using the outpot from

svn_opt__get_version_info.

* subversion/libsvn_subr/opt.c (svn_opt__get_version_info): Reimplement.

(svn_opt__print_version_info): Reinstate.

(svn_opt_print_help4): Use svn_opt__print_version_info again.

* subversion/libsvn_subr/deprecated.c

(svn_opt_print_help): Use svn_opt__print_version_info again.

  1. … 4 more files in changeset.
First step towards making client version information usable by other than

the svn command-line client.

* subversion/libsvn_subr/opt.h (svn_opt__get_version_info): Renamed from

svn_opt__print_version_info and prototype changed to return a string.

Updated docstring.

* subversion/libsvn_subr/opt.c (svn_opt__get_version_info): Renamed from

svn_opt__print_version_info; constructs a string with the version info

instead of printing directly to the console.

(svn_opt_print_help4): Update to use svn_opt__get_version_info.

* subversion/libsvn_subr/deprecated.c (svn_opt_print_help): Update to use

svn_opt__get_version_info.

  1. … 2 more files in changeset.
With "svn --version --verbose", print compile-time and run-time versions

of APR, APR-Util and SQLite.

* subversion/include/private/svn_sqlite.h

(svn_sqlite__compiled_version, svn_sqlite__runtime_version): Declare.

* subversion/libsvn_subr/sqlite.c

(svn_sqlite__compiled_version, svn_sqlite__runtime_version): Implement.

Expose SQLITE_VERSION and sqlite3_libversion() to the rest of libsvn_subr.

* subversion/libsvn_subr/sysinfo.h (svn_sysinfo__linked_libs): Declare.

* subversion/libsvn_subr/sysinfo.c (svn_sysinfo__linked_libs): Implement.

* subversion/libsvn_subr/opt.c (svn_opt__print_version_info): Use the

result of svn_sysinfo__linked_libs to print info about dependencies.

  1. … 4 more files in changeset.
Display list of loaded DLLs with "svn --version --verbose" on Windows.

* subversion/libsvn_subr/opt.c (svn_opt__print_version_info):

Update output for loaded module list.

* subversion/libsvn_subr/sysinfo.c [WIN32]: Import psapi.h

Import apr_file_info.h.

(win32_shared_libs, enum_loaded_modules, FNENUMPROCESSMODULES): New.

(svn_sysinfo__loaded_libs) [WIN32]: Call win32_shared_libs.

  1. … 2 more files in changeset.
Expand "svn --version" output with information about the running system

when --verbose is also given on the command line. Currently available:

- Minimal running system info on systems with uname().

- System info and commercial release name on Windows.

* build.conf (libsvn_subr): Require kernel32.lib on Windows.

* configure.ac: Check for uname() in sys/utsname.h.

* subversion/include/svn_opt.h (svn_opt_print_help4): New, with verbose option.

(svn_opt_print_help3): Deprecate.

* subversion/libsvn_subr/sysinfo.c, subversion/libsvn_subr/sysinfo.h: New.

* subversion/libsvn_subr/opt.h (svn_opt__print_version_info): Add "verbose".

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

(svn_opt__print_version_info): In verbose mode, print svn_sysinfo__*.

(svn_opt_print_help4): Implement.

(svn_opt_print_help3): Remove.

* subversion/libsvn_subr/deprecated.c

(svn_opt_print_help3, svn_opt_print_help3): Reimplenment in terms of

svn_opt_print_help4.

(svn_opt_print_help): Update call to svn_opt__print_version_info.

* subversion/svn/main.c: Add --verbose option to "svn --version".

* subversion/svnlook/main.c: Add --verbose option to "svn --version".

Use svn_opt_print_help4 instead of svn_opt_print_help3.

* subversion/svn/help-cmd.c, subversion/svnadmin/main.c,

subversion/svndumpfilter/main.c, subversion/svnmucc/svnmucc.c,

subversion/svnrdump/svnrdump.c, subversion/svnserve/main.c,

subversion/svnsync/main.c, subversion/svnversion/main.c,

tools/dev/svnraisetreeconflict/main.c,

tools/server-side/svn-rep-sharing-stats.c:

Use svn_opt_print_help4 instead of svn_opt_print_help3.

  1. … 19 more files in changeset.