* tools/dev/unix-build/Makefile.svn: Fix running javahl tests on non-trunk.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1384062 13f79535-47bb-0310-9956-ffa450edef68
* subversion/svn/main.c
  (svn_cl__cmd_table): Fix a recent typo in the 'svn help merge' text.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1384091 13f79535-47bb-0310-9956-ffa450edef68
On the inheritable-props branch: Fix linking problem.

Found by: julianf

* subversion/libsvn_ra_svn/client.c
  (parse_iproplist): Instead of svn_ra_get_repos_root2, call its ra_svn
   implmentation ra_svn_get_repos_root to avoid a circular dependency.  See
   http://svn.haxx.se/dev/archive-2012-09/0186.shtml


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/inheritable-props@1384392 13f79535-47bb-0310-9956-ffa450edef68
On the 'inheritable-props' branch:

* subversion/libsvn_wc/wc_db.c
  (get_children_with_cached_iprops): Make this function static.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/inheritable-props@1384402 13f79535-47bb-0310-9956-ffa450edef68
* subversion/libsvn_wc/wc_db.c
  (revert_list_read): Work around the fact that one compile-time-
    chosen branch of logic wants a 'const' array of marker paths while
    the other needs it non-const.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1384404 13f79535-47bb-0310-9956-ffa450edef68
Sync the 'inheritable-props' branch with the latest trunk changes.
(Merged /subversion/trunk:r1383998-1384404.)

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/inheritable-props@1384413 13f79535-47bb-0310-9956-ffa450edef68
On the 'inheritable-props' branch:

* subversion/include/private/svn_skel.h,
* subversion/libsvn_subr/skel.c
  (svn_skel__unparse_iproplist): Const-ify the input array.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/inheritable-props@1384418 13f79535-47bb-0310-9956-ffa450edef68
* tools/fsfs
  Set svn:ignore property.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1384419 13f79535-47bb-0310-9956-ffa450edef68
Shorten the svn help text for the '-x' command-line option. At sixteen lines
it was taking up a huge chunk of screen space in the help output of each
command using it (blame, diff, log, merge). Now it's nine lines which is
still long but better.

* subversion/svn/main.c
  (svn_cl__options): Condense the '-x' help text.
* subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
  Update this expected output accordingly.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1384785 13f79535-47bb-0310-9956-ffa450edef68
On the 'inheritable-props' branch:  Revert all changes made to the FS
layer on this branch, which minimizes the overall code impact of the
branch with arguably no meaningful penalty.

* subversion/include/svn_fs.h
  (svn_fs_node_proplist2): Remove.
  (svn_fs_node_proplist): Un-deprecate.

* subversion/libsvn_fs/fs-loader.h
  (root_vtable_t): Revert changes made on this branch to node_proplist
    vtable function.

* subversion/libsvn_fs/fs-loader.c
  (svn_fs_node_proplist2): Remove.
  (svn_fs_node_proplist): Track changes to the provider's
    node_proplist function.

* subversion/libsvn_fs_base/tree.c
  (base_node_proplist): Remove inherited properties support.

* subversion/libsvn_fs_fs/tree.c
  (fs_node_proplist): Remove inherited properties support.
 
* subversion/libsvn_ra_local/ra_plugin.c
  (get_node_props): Now (conditionally) call svn_fs_node_proplist()
    instead of svn_fs_node_proplist2().  Also, call
    svn_repos_fs_get_inherited_props() to cover the inherited
    properties bit of the work.

* subversion/libsvn_repos/fs-wrap.c
  (svn_repos_fs_get_inherited_props): Handle the parent-path walk
    here, since there's no longer any FS-layer code to do it for us.

* subversion/svnserve/serve.c
  (get_props): Now (conditionally) call svn_fs_node_proplist()
    instead of svn_fs_node_proplist2().  Also, call
    svn_repos_fs_get_inherited_props() to cover the inherited
    properties bit of the work.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/inheritable-props@1384826 13f79535-47bb-0310-9956-ffa450edef68
On the 'inheritable-props' branch:  Tweak a new API which wraps FS
functionality to be more ... FS-ish.

* subversion/include/svn_repos.h,
* subversion/libsvn_repos/fs-wrap.c
  (svn_repos_fs_get_inherited_props): Now accept a 'root' instead of a
    'repos' and 'revision'.  This is the FS way.

* subversion/libsvn_ra_local/ra_plugin.c
  (get_node_props): Update call to svn_repos_fs_get_inherited_props().

* subversion/svnserve/serve.c
  (get_props): Same here.

* subversion/mod_dav_svn/reports/inherited-props.c
  (dav_svn__get_inherited_props_report): And here.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/inheritable-props@1384829 13f79535-47bb-0310-9956-ffa450edef68
On the 'inheritable-props' branch: Move an RA compatability fallback
function into the source file where other RA compatability fallback
functions live.  No real logic changes here.

* subversion/libsvn_ra/ra_loader.h
  (svn_ra__get_inherited_props_walk): New function prototype.

* subversion/libsvn_ra/compat.c
  (svn_ra__get_inherited_props_walk): Move (and renamed) here...

* subversion/libsvn_ra/ra_loader.c
  (get_inherited_props): ...from here.
  (svn_ra_get_file2, svn_ra_get_dir3): Track renamed function.
  (svn_ra_get_inherited_props): Track renamed function, and rework
    logic to avoid an early return.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/inheritable-props@1384873 13f79535-47bb-0310-9956-ffa450edef68
* subversion/libsvn_ra_serf/util.c
  (expat_response_handler): Avoid parsing errorful responses as XML,
    as suggested by the '###' comment this change alleviates.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1384889 13f79535-47bb-0310-9956-ffa450edef68
Sync the 'inheritable-props' branch up with recent trunk changes.
(Merged /subversion/trunk:r1384405-1384889.)

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/inheritable-props@1384890 13f79535-47bb-0310-9956-ffa450edef68
On the 'inheritable-props' branch: Fix the fallback logic for
svn_ra_get_inherited_props() to also ignore SVN_ERR_RA_DAV_FORBIDDEN
errors.  (Why, again, do we have to have two different error code to
mean, "No, you can't see that"?)

This fixes 'auth_tests.py 16' and 'iprop_authz_tests.py 1' when run
against a trunk (non-iprop-capable) server.

* subversion/libsvn_ra/compat.c
  (svn_ra__get_inherited_props_walk): Also ignore SVN_ERR_RA_DAV_FORBIDDEN.


git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/inheritable-props@1384899 13f79535-47bb-0310-9956-ffa450edef68
* subversion/libsvn_ra_serf/util.c
  (expat_response_handler): Fix muscle memory oops in code comment.

Reported by: stsp


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1384906 13f79535-47bb-0310-9956-ffa450edef68
FSFS reorg tool: complete implementation. Increase performance
significantly by adding caches for combined windows as well as for
directory contents.

Add implementation for the packing process: The initial reorganization
can only make educated guesses about the size of each fragment
to write. A pack step now (almost) eliminates the safety buffers
where they seem unnecessary. But afterwards we have to re-check
and may need to expand in a few places.

That process operates on one pack file at a time. To maximize
operational locality, we directly write the pack file after the
packing process finished.

Moreover, tune hash usage in a few places to maximize speed.

* tools/fsfs/reorg.c
  (dir_cache_entry_t, dir_cache_t,
   window_cache_entry_t, window_cache_t): new caching data structs
  (fs_fs_t): add caches to our root data structure
  (create_dir_cache, get_dir_cache_index, get_cached_dir_pool,
   get_cached_dir, set_cached_dir): implement directory cache
  (create_window_cache, get_window_cache_index,
   get_cached_window, set_cached_window): implement window cache
  (read_revisions): initialize new caches
  (parse_revnode_pos, get_combined_window,  read_dir): use caches

  (update_noderevs, get_content_length, move_fragment, pack_revisions,
   pack_and_write_revisions): implement 
  (write_revisions): write files directly after reorg'ing the respective pack

  (fs_open): support format 6 repos as well
  (direntry_t, create_content_cache, parse_dir, reorder_revisions,
   get_updated_dir): minimize hash overhead
  (main, print_progress, read_pack_file): nicer console output

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1385395 13f79535-47bb-0310-9956-ffa450edef68
* subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
  (password_set_gnome_keyring, password_set_gnome_keyring): Don't bother
   figuring out the name of the default keyring and then not using it for
   anything.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1386593 13f79535-47bb-0310-9956-ffa450edef68
* subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
  (get_default_keyring_name): The (currently single) caller of this function
   forgot to free the result string allocated with strdup(). Make use of the
   the existing (but previously unused!) pool argument to fix this.
   Rename POOL to RESULT_POOL and allocate the result in it.


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

* subversion/libsvn_auth_gnome_keyring/gnome_keyring.c
  (): Include apr_strings.h for apr_pstrdup() declaration.


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