Correct docstrings. No functional change.

* subversion/libsvn_fs_fs/pack.c
  (pack_context_t,
   copy_item_to_temp): Update element name in docstring.

Found by: julianfoad


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1570679 13f79535-47bb-0310-9956-ffa450edef68
Factor out some common code and cleanup a compiler warning.

Similar to the changes I made in diff_file.c in r1570666 and r1570669.

* subversion/libsvn_diff/diff_memory.c
  (output_conflict_with_context_marker): New
  (output_conflict_with_context): Use output_conflict_with_context_marker()
    instead of nearly duplicated calls to svn_stream_printf() and
    output_marker_eol().


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1570680 13f79535-47bb-0310-9956-ffa450edef68
In FSX, remove the separate txn directory cache.

Because noderev IDs are now always (i.e. also between txns) globally
unique and different from all other item IDs such as representation IDs,
we can use it as a key with the existing directory cache. 

* subversion/libsvn_fs_x/fs.h
  (fs_x_data_t): Drop txn_dir_cache and the associated
                 concurrent_transactions member.

* subversion/libsvn_fs_x/fs_x.h
  (svn_fs_x__initialize_txn_caches,
   svn_fs_x__reset_txn_caches): No longer needed.

* subversion/libsvn_fs_x/caching.c
  (svn_fs_x__initialize_caches): We now use ID parts as key for the dir
                                 cache as they are the generalized form
                                 of the pair_cache_key_t.
  (struct txn_cleanup_baton_t,
   remove_txn_cache,
   init_txn_callbacks,
   svn_fs_x__initialize_txn_caches,
   svn_fs_x__reset_txn_caches): No longer needed.

* subversion/libsvn_fs_x/cached_data.c
  (locate_dir_cache): Return the key as struct. It is always an ID part now;
                      rep ID for committed dirs and noderev IDs while in txns.
  (svn_fs_x__rep_contents_dir,
   svn_fs_x__rep_contents_dir_entry): Update caller.

* subversion/libsvn_fs_x/transaction.c
  (purge_shared_txn_body): No need to handle txn_dir_cache anymore.
  (svn_fs_x__set_entry,
   svn_fs_x__delete_node_revision): Update the common dir cache now.

* subversion/libsvn_fs_x/tree.c
  (svn_fs_x__commit_txn,
   make_txn_root): Don't call txn_dir_cache functions anymore.


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