Follow-up to r1604933.

* subversion/libsvn_fs_fs/fs_fs.c
  (read_global_config): Make block-read actually opt-in, i.e. default
                        to "off" if nobody specified the option.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1606656 13f79535-47bb-0310-9956-ffa450edef68
Slightly reduce I/O overhead in FSFS f7 when not run in block-read mode.
This gives it the same file access granularity as in older formats.

* subversion/libsvn_fs_fs/fs_fs.c
  (write_config): Update user doc in configuration template.
  (read_global_config): Cap block size to 4k.  Smaller values will still
                        be accepted.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1606658 13f79535-47bb-0310-9956-ffa450edef68
(Basically) eliminate the remaining CPU processing overhead of FSFS
format 7 over format 6 in non-block-read mode.

We simply don't prefetch index data in non-block-read mode anymore.
Since we will only ever read index data when we had to open the file
anyway to read some of its content, reading non-cached index parts
is relatively cheap (seek and read operations only).

* subversion/libsvn_fs_fs/index.c
  (l2p_index_lookup,
   p2l_index_lookup): Make index content prefetch contingent upon
                      block-read being enabled.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1606662 13f79535-47bb-0310-9956-ffa450edef68
Tweak the help text for 'svn log': add command-specific descriptions of the
'-q' and '-v' options, and move '-c' immediately after '-r' like it is in other
commands.

* subversion/svn/svn.c
  (svn_cl__cmd_table): Tweak as above.

* subversion/tests/cmdline/getopt_tests_data/svn_help_log_switch_stdout
  Update accordingly.

git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1606670 13f79535-47bb-0310-9956-ffa450edef68
Cleanup a bit of svn notification code and remove an unneeded blank line from
the svn commit output that was caused by the side effects of this code.

Update test results for this changes and include a few cases of the related
r1606182 change.

* subversion/svn/notify.c
  (notify_body): Write the newline here...

* subversion/svn/util.c
  (svn_cl__print_commit_info): ...Instead of waiting for this code.

* subversion/tests/cmdline/blame_tests.py
  (blame_output_after_merge): Update expected result.

* subversion/tests/cmdline/copy_tests.py
  (url_copy_parent_into_child): Update expected result.

* subversion/tests/cmdline/merge_tests.py
  (simple_property_merges,
   merge_old_and_new_revs_from_renamed_file,
   merge_with_auto_rev_range_detection,
   merge_source_normalization_and_subtree_merges,
   merge_added_subtree,
   dont_merge_revs_into_subtree_that_predate_it,
   set_up_renamed_subtree,
   no_self_referential_filtering_on_added_path,
   merge_range_prior_to_rename_source_existence,
   set_up_natural_history_gap): Update expected results.

* subversion/tests/cmdline/merge_tree_conflict_tests.py
  (merge_replace_setup): Update expected results.

* subversion/tests/cmdline/switch_tests.py
  (delete_subdir): Update expected results.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1606674 13f79535-47bb-0310-9956-ffa450edef68
On remove-log-addressing branch: Merge changes from trunk.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/remove-log-addressing@1606681 13f79535-47bb-0310-9956-ffa450edef68