* subversion/svn/svn.c
  (svn_cl__options): Override the --remove option description for 'svn auth'
   instead of tweaking the global description which belongs to 'svn cl'.

Suggested by: danielsh


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1572540 13f79535-47bb-0310-9956-ffa450edef68
* subversion/svn/auth-cmd.c: Disable pretty-printing on SSL certs on Windows,
   because it is broken with all currently released versions of serf.
   To make it easier to enable/disable this feature, add a new
   SVN_AUTH_PRETTY_PRINT_SSL_CERTS define switch instead of directly
   using SVN_HAVE_SERF for this purpose.

Found by: rhuijben


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1572548 13f79535-47bb-0310-9956-ffa450edef68
* subversion/include/svn_config.h
  (svn_config_walk_auth_data): Fix a small oversight from r1466183, which
   renamed the cleanup_func paramter to walk_func but didn't update the
   docstring accordingly.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1572572 13f79535-47bb-0310-9956-ffa450edef68
Make the auth cache hash keys part of the public API.

This allows API consumers to make better use of the data returned by
functions like svn_config_walk_auth_data(), eliminates duplicate
definitions of some of these keys, and makes it easier to add new
key definitions in the future.

There is no reason for these definitions to be private since we are
unlikely to remove existing hash keys used by the on-disk format.

* subversion/include/svn_config.h
  (SVN_CONFIG_AUTHN_USERNAME_KEY,
   SVN_CONFIG_AUTHN_PASSWORD_KEY,
   SVN_CONFIG_AUTHN_PASSPHRASE_KEY,
   SVN_CONFIG_AUTHN_PASSTYPE_KEY,
   SVN_CONFIG_AUTHN_ASCII_CERT_KEY,
   SVN_CONFIG_AUTHN_FAILURES_KEY): Declare and document. Equivalent to
    local AUTHN_* macro definitions in the various files below.

* subversion/libsvn_subr/simple_providers.c,
  subversion/libsvn_subr/ssl_client_cert_pw_providers.c,
  subversion/libsvn_subr/ssl_server_trust_providers.c,
  subversion/libsvn_subr/username_providers.c,
  subversion/svn/auth-cmd.c: Remove local definitions of hash keys and
   use the global definitions instead.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1572640 13f79535-47bb-0310-9956-ffa450edef68
Follow-up to r1572640: update documentation.

* subversion/include/svn_config.h
  (SVN_CONFIG_REALMSTRING_KEY,
   SVN_CONFIG_AUTHN_USERNAME_KEY,
   SVN_CONFIG_AUTHN_PASSWORD_KEY,
   SVN_CONFIG_AUTHN_PASSPHRASE_KEY,
   SVN_CONFIG_AUTHN_PASSTYPE_KEY,
   SVN_CONFIG_AUTHN_ASCII_CERT_KEY,
   SVN_CONFIG_AUTHN_FAILURES_KEY): Split docstrings for doxygen.  Minor
     docstring updates. Move into a new 'cached_authentication_data_attributes'
     doxygen subgroup.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1572649 13f79535-47bb-0310-9956-ffa450edef68
Fix a number of problems with our serf configure detection.

build/ac-macros/serf.m4
  (): Update the description
  (SVN_LIB_SERF): Providing a prefix should trigger an error if serf isn't
    found.  Set a serf_prefix variable when a prefix is passed.  Shift running
    the tests outside the AC_ARG_WITH macro, it never belonged there anyway.
    Try with pkg-config before falling back on the prefix method and only
    use the prefix method if someone provided a prefix.
  (SVN_SERF_PREFIX_CONFIG): Don't use withval and instead use the new
    serf_prefix environment variable we set above.
  (SVN_SERF_PKG_CONFIG): Make our pkg-config handling capable of supporting
    prefixes, only accept the pkg-config detected library if it's the library
    in the prefix provided.  Support prefixes that point at the dir containing
    the pc file.  Only -l arguments belong in SVN_SERF_LIBS, fixes pkg-config
    builds failing with libraries not in the default search path for the
    linker.



git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1572762 13f79535-47bb-0310-9956-ffa450edef68
Rename the centos dir to svn-x64-centos to match the name of the actual slave.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1572781 13f79535-47bb-0310-9956-ffa450edef68
Update the svn-x64-centos scripts to match what's on the slave.

* tools/buildbot/slaves/svn-x64-centos/list-svn-deps.sh: New

* tools/buildbot/slaves/svn-x64-centos/svnbuild.sh: Update from slave.

* tools/buildbot/slaves/svn-x64-centos/svncheck.sh: Update from slave.

* tools/buildbot/slaves/svn-x64-centos/svnclean.sh: Update from slave.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1572782 13f79535-47bb-0310-9956-ffa450edef68
Make the CentOS builbbot use different versions of APR, APR-Util, httpd and 
serf with versions newer than 1.9 (aka trunk at current).

* tools/dev/buildbot/slaves/svn-x64-centos/svnbuild.sh: Detect the minor of
    the code being built and choose dependencies accordingly.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1572816 13f79535-47bb-0310-9956-ffa450edef68
* subversion/tests/libsvn_repos/rev_hunt.c
  (send_path_revision): Tweak a comment about false-positive detection
    of changes, following r1572363.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1572893 13f79535-47bb-0310-9956-ffa450edef68
Provide config:miscellany:enable-magic-file to control the use of
libmagic.  There are environment variables that do this already but
they are not specific to Subversion and affect other applications.

* subversion/include/svn_config.h
  (SVN_CONFIG_OPTION_ENABLE_MAGIC_FILE): New.

* subversion/include/private/svn_magic.h
  (svn_magic__init): Add config parameter.

* subversion/libsvn_subr/config_file.c
  (svn_config_ensure): Document new setting.

* subversion/libsvn_subr/magic.c
  (svn_magic__init): Check for enable-magic-file=no.

* subversion/libsvn_client/add.c
  (add): Pass config to svn_magic__init.

* subversion/libsvn_client/import.c
  (import): Pass config to svn_magic__init.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1572916 13f79535-47bb-0310-9956-ffa450edef68
Followup to r1572916, fix error return handling.

* subversion/include/private/svn_magic.h
* subversion/libsvn_subr/magic.c
  (svn_magic__init): Change return type.

* subversion/libsvn_client/add.c
  (add): Handle svn_magic__init return.

* subversion/libsvn_client/import.c
  (import): Handle svn_magic__init return.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1572921 13f79535-47bb-0310-9956-ffa450edef68
* subversion/libsvn_repos/log.c
  (do_logs): Tweak code that looked like it could leave a structure field
    uninitialized, to make clear that it cannot.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1572989 13f79535-47bb-0310-9956-ffa450edef68
* subversion/libsvn_repos/log.c
  (do_logs): Unbreak code that I broke in r1572989.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1572993 13f79535-47bb-0310-9956-ffa450edef68
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)



git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1573006 13f79535-47bb-0310-9956-ffa450edef68
Don't rely on the presence of stdbool.h and inttypes.h headers for utf8proc.

* configure.ac: Check for stdbool.h and inttypes.h.
* subversion/libsvn_subr/utf8proc/utf8proc.h:
   Include stdbool.h and inttypes.h only if we know they're available.
   Otherwise, use typedefs based on APR's sized types.
* subversion/libsvn_subr/utf8proc.c:
   Move the include of utf8proc.c after svn_private_config.h, so that the
   presence symbols for stdbool.h and inttypes.h are available.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1573069 13f79535-47bb-0310-9956-ffa450edef68
Fix a regression in svn_fs_props_changed: it should always report
path@root to be equal to path@root - even for txn roots.

Only FSFS and FSX backends are affected as their property reps are
indistinguishable within a transaction.

* subversion/include/svn_fs.h
  (svn_fs_props_changed): Explain that old releases had a problem
                          with prop lists in FSFS txns.

* subversion/libsvn_fs_fs/fs_fs.c
  (svn_fs_fs__file_text_rep_equal,
   svn_fs_fs__prop_rep_equal): Representation is of the same node
                               always match.

* subversion/libsvn_fs_x/fs_x.c
  (svn_fs_x__prop_rep_equal): Same.

Found by: breser


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1573071 13f79535-47bb-0310-9956-ffa450edef68
* subversion/libsvn_subr/utf8proc/utf8proc.h: Don't redefine APR
    types, add missing constants.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1573084 13f79535-47bb-0310-9956-ffa450edef68
Make `svn --version -v` identify OS X 10.9 as Mavericks.

* subversion/libsvn_subr/sysinfo.c
  (release_name_from_version): Add case for minor 9.  Yay for manually
    maintained lists.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1573088 13f79535-47bb-0310-9956-ffa450edef68
Stop using a deprecated (as of OS X 10.9) function to get OS X version.

CFURLCreateDataAndPropertiesFromResource() is not listed as being deprecated.
It still works but this code goes to a lot of effor to use OS X's
CoreFoundation framework to read the plist when we have our own functions
for reading files.  I think it's much better for our maintenance purposes to
use our functions for as much as we can.

* subversion/libsvn_subr/sysinfo.c
  (write_to_cfmutabledata): svn_write_fn_t implementation that feeds data into
    a CFMutableDataRef (Core Foundation's version of streams).

  (system_version_plist): Use our stream interface to read the plist files
    and wire it up to a stream that feeds the data to a CFMutableDataRef
    so we can still let OS X's property list code do the parsing for us.
    Also fix a small comment typo.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1573096 13f79535-47bb-0310-9956-ffa450edef68