Checkout Tools
  • last updated 5 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Following the availability of apr_hash_this_key() etc. in APR v1.5, use

these in Subversion code instead of svn__apr_hash_index_key() etc. Provide

substitutes only when APR is too old to provide them.

* subversion/include/svn_types.h,

subversion/libsvn_subr/iter.c

(svn__apr_hash_index_key,

svn__apr_hash_index_klen,

svn__apr_hash_index_val):

Rename to apr_hash_this_key, apr_hash_this_key_len, apr_hash_this_val.

Declare and define them only if APR is older than 1.5.

Everywhere else: track the renames.

  1. … 102 more files in changeset.
Reverting experimental move-related APIs.

For details see http://svn.haxx.se/dev/archive-2014-05/0155.shtml

This effectively reverts revisions 1595600,1572044,1547039,1535341,

1535330,1535080,1535029,1534280,1532200,1527217,1527088,1526057,

1526014,1526013,1525484,1525467,1525464,1525463,1525462,1525460,

1525459,1525453,1525448,1525442,1525432,1525429 and 1525419.

Remove respective entries from CHANGES.

  1. … 43 more files in changeset.
Fix problem exposed by r1577079.

* subversion/libsvn_ra/compat.c

(svn_ra__locations_from_log): Make a copy of constant apr_array_header_t

argument before sorting it.

Add svn_sort__array() -- simple wrapper around qsort() to sort APR array

and use where applicable.

* subversion/include/private/svn_sorts_private.h

(svn_sort__array): New declaration.

* subversion/libsvn_subr/sorts.c

(svn_sort__array): New.

* subversion/libsvn_client/add.c

(): Include svn_sorts_private.h.

(mkdir_urls): Use svn_sort__array().

* subversion/libsvn_client/commit.c

(): Include svn_sorts_private.h.

(determine_lock_targets): Use svn_sort__array().

* subversion/libsvn_client/commit_util.c

(): Remove stdlib.h and include svn_sorts_private.h.

(svn_client__condense_commit_items): Use svn_sort__array().

* subversion/libsvn_client/ra.c

(): Include svn_sorts_private.h.

(svn_client__repos_location_segments): Use svn_sort__array().

* subversion/libsvn_client/resolved.c

(): Remove stdlib.h and include svn_sorts_private.h.

(svn_client__resolve_conflicts): Use svn_sort__array().

* subversion/libsvn_delta/path_driver.c

(): Include svn_sorts_private.h.

(svn_delta_path_driver2): Use svn_sort__array().

* subversion/libsvn_diff/parse-diff.c

(): Include svn_sorts_private.h.

(svn_diff_parse_next_patch): Use svn_sort__array().

* subversion/libsvn_fs_fs/cached_data.c

(read_dir_entries): Use svn_sort__array().

* subversion/libsvn_fs_fs/transaction.c

(verify_locks): Use svn_sort__array().

* subversion/libsvn_ra/compat.c

(svn_ra__locations_from_log): Use svn_sort__array().

* subversion/libsvn_repos/log.c

(): Include svn_sorts_private.h.

(turn_unique_copies_into_moves, combine_mergeinfo_path_lists,

handle_merged_revisions): Use svn_sort__array().

* subversion/libsvn_repos/replay.c

(): Include svn_sorts_private.h.

(svn_repos__replay_ev2): Use svn_sort__array().

* subversion/libsvn_repos/rev_hunt.c

(): Include svn_sorts_private.h.

(find_merged_revisions): Use svn_sort__array().

* subversion/libsvn_subr/mergeinfo.c

(combine_with_lastrange, parse_revision_line, svn_mergeinfo_sort): Use

svn_sort__array().

* subversion/libsvn_wc/revert.c

(): Include svn_sorts_private.h.

(revert_restore_handle_copied_dirs): Use svn_sort__array().

* subversion/svndumpfilter/svndumpfilter.c

(): Include svn_sorts_private.h.

(do_filter): Use svn_sort__array().

  1. … 17 more files in changeset.
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.
Get rid of the ever increasing number of private apis in svn_sorts.h by adding

a new private/svn_sorts_private.h file with the private parts and updating the

needed #include-s.

*AND*

Improve error reporting during xml parsing in ra_serf a bit.

For 1.9 the number of private apis in this public header more than doubled,

doubling the original filesize, while our policy is to never add private

functions in public headers.

* build.conf

(libsvn_subr): Add export.

* subversion/include/private/svn_sorts_private.h

New file, copied from ../svn_sorts.h.

* subversion/include/svn_sorts.h

Remove everything possible in our private namespace. Keeping some

references.

* subversion/libsvn_client/diff_local.c

* subversion/libsvn_client/import.c

* subversion/libsvn_client/info.c

* subversion/libsvn_client/list.c

* subversion/libsvn_client/merge.c

* subversion/libsvn_client/mergeinfo.c

* subversion/libsvn_client/status.c

* subversion/libsvn_delta/compat.c

* subversion/libsvn_fs_fs/cached_data.c

* subversion/libsvn_fs_fs/index.c

* subversion/libsvn_fs_fs/low_level.c

* subversion/libsvn_fs_fs/pack.c

* subversion/libsvn_fs_fs/temp_serializer.c

* subversion/libsvn_fs_fs/transaction.c

* subversion/libsvn_fs_x/index.c

* subversion/libsvn_fs_x/low_level.c

* subversion/libsvn_fs_x/pack.c

* subversion/libsvn_fs_x/transaction.c

* subversion/libsvn_ra/compat.c

* subversion/libsvn_ra_serf/inherited_props.c

* subversion/libsvn_ra_serf/lock.c

* subversion/libsvn_repos/dump.c

* subversion/libsvn_repos/fs-wrap.c

* subversion/libsvn_subr/cmdline.c

* subversion/libsvn_subr/hash.c

* subversion/libsvn_subr/mergeinfo.c

* subversion/libsvn_subr/sorts.c

* subversion/libsvn_wc/adm_ops.c

* subversion/libsvn_wc/diff_editor.c

* subversion/libsvn_wc/status.c

* subversion/libsvn_wc/wc_db.c

* subversion/libsvn_wc/wc_db_update_move.c

* subversion/mod_dav_svn/repos.c

* subversion/svn/log-cmd.c

* subversion/svn/propget-cmd.c

* subversion/svnadmin/svnadmin.c

* subversion/svnlook/svnlook.c

* subversion/tests/libsvn_subr/priority-queue-test.c

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

Fix includes.

* subversion/libsvn_ra_serf/util.c

(expat_response_handler): Combine XML errors with our custom parser errors

instead of only reporting one or the other.

  1. … 42 more files in changeset.
svn_sort__* private API normalization. In functions with no return

argument, make the container the first parameter. Update all callers.

* subversion/include/svn_sorts.h

(svn_sort__bsearch_lower_bound,

svn_sort__array_insert): Move the ARRAY parameter to the front.

* subversion/libsvn_subr/sorts.c

(svn_sort__bsearch_lower_bound,

svn_sort__array_insert): Update implementation signatures.

* subversion/libsvn_client/merge.c

(slice_remaining_ranges,

insert_child_to_merge,

normalize_merge_sources_internal): Update API callers.

* subversion/libsvn_fs_fs/index.c

(get_p2l_entry_from_cached_page,

svn_fs_fs__p2l_entry_lookup): Same.

* subversion/libsvn_fs_fs/pack.c

(find_first_reference): Same.

* subversion/libsvn_fs_fs/transaction.c

(verify_moves): Same.

* subversion/libsvn_fs_x/index.c

(get_p2l_entry_from_cached_page,

p2l_entry_lookup): Same.

* subversion/libsvn_fs_x/transaction.c

(verify_moves): Same.

* subversion/libsvn_ra/compat.c

(svn_ra__get_inherited_props_walk): Same.

* subversion/libsvn_ra_serf/inherited_props.c

(get_iprops_via_more_requests): Same.

* subversion/libsvn_repos/fs-wrap.c

(svn_repos_fs_get_inherited_props): Same.

* subversion/libsvn_subr/mergeinfo.c

(adjust_remaining_ranges,

svn_rangelist_merge2): Same.

* subversion/libsvn_wc/wc_db.c

(db_read_inherited_props): Same.

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

(find_representation,

parse_representation): And finally the same here.

  1. … 13 more files in changeset.
[Reverted in r1597989]

Use the bumped RA layer API log function throughout ra/compat.c.

So far, we don't do anything special for moves but simply count them

as creating log segments etc. as any add-with-history would do.

* subversion/libsvn_ra/compat.c

(svn_ra__locations_from_log,

svn_ra__location_segments_from_log,

svn_ra__file_revs_from_log,

svn_ra__get_deleted_rev_from_log): use fastest option to traverse history

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/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/commit.c

* subversion/libsvn_delta/compat.c

* subversion/libsvn_delta/editor.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/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/fs_fs.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/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/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/mod_dav_svn/activity.c

* subversion/mod_dav_svn/lock.c

* subversion/mod_dav_svn/merge.c

* subversion/mod_dav_svn/reports/update.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/help-cmd.c

* subversion/svn/propedit-cmd.c

* subversion/svn/propget-cmd.c

* subversion/svn/status-cmd.c

* subversion/svn/status.c

* subversion/svn/svn.c

* subversion/svn/util.c

* subversion/svnadmin/svnadmin.c

* subversion/svndumpfilter/svndumpfilter.c

* subversion/svnlook/svnlook.c

* subversion/svnmucc/svnmucc.c

* subversion/svnrdump/dump_editor.c

* subversion/svnrdump/load_editor.c

* subversion/svnrdump/svnrdump.c

* subversion/svnrdump/util.c

* subversion/svnserve/serve.c

* subversion/svnsync/svnsync.c

* subversion/svnsync/sync.c

  1. … 70 more files in changeset.
Follow-up to r1424708: API simplification: Make

svn_ra_get_inherited_props() always return svn_prop_inherited_item_t

items with the path_or_url member set to repos relpaths. Let the caller

convert to URLs if required.

Suggested by: julianfoad

* subversion/include/private/svn_wc_private.h

(svn_wc__get_iprops): Document the type of

svn_prop_inherited_item_t->path_or_url's returned.

* subversion/include/svn_client.h

(svn_proplist_receiver2_t,

svn_client_propget5): Document the type of

svn_prop_inherited_item_t->path_or_url's returned.

* subversion/include/svn_ra.h

(svn_ra_get_inherited_props): Return to pre-r1424708 behavior, i.e. always

return repos relpath path_or_url member.

* subversion/libsvn_client/client.h

(svn_client__iprop_relpaths_to_urls): New.

(svn_client__get_inheritable_props): Return to pre-r1424708 behavior,

i.e. always return repos relpath path_or_url member.

* subversion/libsvn_client/externals.c

(switch_file_external): Update call to svn_ra_get_inherited_props().

* subversion/libsvn_client/iprops.c

(svn_props.h,

svn_path.h): New includes.

(svn_client__iprop_relpaths_to_urls): New.

(svn_client__get_inheritable_props): Remove use_relpath_keys argument.

(svn_client__get_inheritable_props): Update call to

svn_ra_get_inherited_props().

* subversion/libsvn_client/prop_commands.c

(remote_propget,

remote_proplist): Convert inherited props returned by

svn_ra_get_inherited_props() with new

svn_client__iprop_relpaths_to_urls() helper.

(svn_client_propget5,

get_local_props): Convert inherited props returned by

svn_wc__get_iprops() with new

svn_client__iprop_relpaths_to_urls() helper.

* subversion/libsvn_client/switch.c

(switch_internal): Update call to svn_ra_get_inherited_props().

* subversion/libsvn_client/update.c

(update_internal): Update call to svn_client__get_inheritable_props().

* subversion/libsvn_ra/compat.c

(svn_ra__get_inherited_props_walk): Return

svn_prop_inherited_item_t->path_or_url's as repos relpaths, not URLs.

* subversion/libsvn_ra/ra_loader.c

(svn_ra_get_inherited_props): Remove use_relpath_keys argument.

* subversion/libsvn_ra/ra_loader.h

(svn_ra__get_inherited_props_walk): Update doc string.

* subversion/libsvn_ra_local/ra_plugin.c

(get_node_props): Don't convert svn_prop_inherited_item_t->path_or_url's

to URLs, leave as repos relpaths.

* subversion/libsvn_wc/wc_db.c

(db_read_inherited_props): Don't convert

svn_prop_inherited_item_t->path_or_url's to URLs, leave as repos relpaths.

* subversion/libsvn_wc/wc_db.h

(svn_wc__db_read_inherited_props): Update doc string.

  1. … 14 more files in changeset.
Use an existing API instead of in-line code for copying a properties hash.

* subversion/libsvn_ra/compat.c

(fr_log_message_receiver): As above.

* subversion/libsvn_ra_serf/commit.c

(svn_ra_serf__get_commit_editor): As above.

  1. … 1 more file in changeset.
Fix a memory use bug identified by valgrind.

* subversion/libsvn_ra/compat.c

(svn_ra__get_inherited_props_walk): Avoid the iteration pool for

an object used across iterations.

Fix a number of deprecated function calls. They all require only simple

parameter adaptations.

* subversion/libsvn_ra/compat.c

(svn_ra__get_inherited_props_walk): call svn_property_kind2

instead of svn_property_kind

* subversion/libsvn_subr/path.c

(svn_path_url_add_component2): call internal, non-deprecated function

* subversion/libsvn_wc/tree_conflicts.c

(read_node_version_info): call svn_wc_conflict_version_create2 instead

of svn_wc_conflict_version_create

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

(tree_conflict_create): ditto

* tools/dev/svnraisetreeconflict/main.c

(raise_tree_conflict): ditto

* subversion/svnrdump/svnrdump.c

(init_client_context): call svn_client_create_context2 instead of

svn_client_create_context

* subversion/tests/libsvn_wc/utils.c

(create_repos_and_wc): ditto

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

(sub_main): ditto

  1. … 7 more files in changeset.
Merge the inheritable-props branch back to trunk.

See http://svn.haxx.se/dev/archive-2012-09/0177.shtml

  1. … 68 more files in changeset.
When handing out node contents, the delta streams don't need

to calculate MD5 checksums as the result will not be used and the

check would be redundant even if it were made.

Thus, rev the svn_txdelta API to calculate the checksum only

upon specific request and update all callers to use the new API.

* subversion/include/svn_delta.h

(svn_txdelta2): declare new, extended API

(svn_txdelta): deprecate the old one

* subversion/libsvn_delta/text_delta.c

(txdelta_baton): extend docstring

(txdelta_md5_digest): handle the no-checksum-requested case

(svn_txdelta2): implement

(svn_txdelta): re-implement in terms of svn_txdelta2

* subversion/libsvn_fs_fs/fs_fs.c

(svn_fs_fs__get_file_delta_stream): eliminate duplicate MD5 calculation

* subversion/libsvn_ra/compat.c

(svn_ra__file_revs_from_log): switch to reved API, MD5 not used / required

* subversion/tests/libsvn_delta/random-test.c

(random_test): ditto

* subversion/tests/libsvn_delta/svndiff-test.c

(main): same here

* subversion/tests/libsvn_delta/vdelta-test.c

(do_one_diff, main): and here

* subversion/tests/libsvn_delta/window-test.c

(stream_window_test): switch to reved API, request MD5

  1. … 7 more files in changeset.
* subversion/libsvn_ra/compat.c

(prev_log_path): Another integer-width mismatch fix.

Simplify some sorted-hash iteration code.

* subversion/libsvn_client/list.c

(get_dir_contents): Read the item's value from the iterator instead of

looking it up in the hash table.

* subversion/libsvn_ra/compat.c

(prev_log_path): Same.

* subversion/svn/log-cmd.c

(log_entry_receiver): Same.

  1. … 2 more files in changeset.
The semi-annual trailing whitespace cleansing ritual.

* everywhere:

for extsn in c h cpp java py pl rb; do

sed -i -e 's/[ \t]*$//' `find . -name "*.$extsn" | xargs grep '[ \t]$' -l`

done

  1. … 144 more files in changeset.
Continue replacing deprecated svn_path_* function calls.

* subversion/libsvn_ra/compat.c

(prev_log_path): Replace uses of deprecated svn_path_* functions.

(get_fs_path): New helper function.

(svn_ra__locations_from_log, svn_ra__location_segments_from_log,

svn_ra__file_revs_from_log, svn_ra__get_deleted_rev_from_log): Now

use get_fs_path() to calculate the absolute filesystem paths of interest.

* subversion/libsvn_ra/compat.c

(svn_ra__file_revs_from_log): Remove unused variables.

Reintegrate the 'uris-as-urls' branch into trunk.

(Merged /subversion/branches/uris-as-urls:r1060426-1064427.)

This should wrap up issue #2028.

  1. … 73 more files in changeset.
Update some uses of svn_path_url_add_component() to it's non-deprecated brother:

svn_path_url_add_component2(). I've done some spot checking to see if these

uses conform to the more strict requirements of the newer API. Even though my

checking hasn't been comprehensive, I think this patch is correct.

* subversion/libsvn_ra/compat.c

(svn_ra__get_deleted_rev_from_log),

* subversion/libsvn_ra_neon/props.c

(svn_ra_neon__get_baseline_info, svn_ra_neon__do_check_path,

svn_ra_neon__do_stat),

* subversion/libsvn_ra_neon/mergeinfo.c

(svn_ra_neon__get_mergeinfo),

* subversion/libsvn_ra_neon/file_revs.c

(svn_ra_neon__get_file_revs),

* subversion/libsvn_ra_neon/log.c

(svn_ra_neon__get_log),

* subversion/libsvn_ra_neon/lock.c

(do_lock, do_unlock, svn_ra_neon__get_lock_internal),

* subversion/libsvn_ra_neon/fetch.c

(svn_ra_neon__get_file, svn_ra_neon__get_dir),

* subversion/libsvn_ra_neon/get_locations.c

(svn_ra_neon__get_locations):

As above.

  1. … 7 more files in changeset.
Fix error leaks.

* everywhere:

Add missing SVN_ERR() calls.

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

(make_node_baton): Return an svn_error_t *.

(new_node_record): Track return type change.

* subversion/svnadmin/main.c (main),

subversion/svndumpfilter/main.c (main),

subversion/svnlook/main.c (main),

subversion/svnrdump/svnrdump.c (main),

subversion/svnsync/main.c (main):

Use SVN_INT_ERR() around subcommand_help() or help_cmd().

  1. … 34 more files in changeset.
* subversion/libsvn_ra/compat.c

(svn_ra__file_revs_from_log): Following up on r966431, don't use

uninitialized variable in error message.

Found by: philip

Following up on r867727 (aka r27653), fix some issues noted in

http://svn.haxx.se/dev/archive-2010-07/0385.shtml

The reason I'm fixing this, is that AnkhSVN might use this function

from it's diff viewer when hitting these very old servers.

* subversion/libsvn_ra/compat.c

(svn_ra__file_revs_from_log): Avoid NULL reference on calling this

function on the repos root, by checking if the path is a file before

the other tests. And then provide the path to svn_ra_get_log2(), to get

the changes on the requested target instead of on the session root.

Remove some unused variables identified by gcc.

* subversion/libsvn_ra/compat.c

(svn_ra__file_revs_from_log): Variable ‘last_path’.

* subversion/libsvn_diff/diff3.c (svn_diff_diff3): Variable ‘original_length’.

* subversion/libsvn_subr/utf.c (convert_to_stringbuf): Variable ‘destbuf’.

* subversion/mod_dav_svn/reports/update.c

(dav_svn__update_report): Variable ‘log_depth’.

* subversion/mod_dav_svn/reports/mergeinfo.c

(dav_svn__get_mergeinfo_report): Variable ‘sent_anything’.

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

(test_stream_range): Variable ‘after’.

* subversion/tests/libsvn_subr/string-test.c (test10): Variable ‘len_2’.

* subversion/svn/tree-conflicts.c

(svn_cl__get_human_readable_tree_conflict_description): Variable ‘victim_name’

* subversion/libsvn_fs_base/tree.c (open_path): Variable ‘id’.

* subversion/libsvn_fs_base/lock.c (txn_body_lock): Variable ‘fs_username’.

* subversion/svnadmin/main.c (subcommand_lslocks): Variable ‘fs’.

* subversion/libsvn_wc/props.c (svn_wc__merge_props): Variable ‘working_val’.

* subversion/libsvn_wc/copy.c

(copy_file_administratively): Variable ‘src_exists’.

* subversion/libsvn_wc/wc_db.c

(commit_node): Variables ‘work_presence’ and ‘base_presence’.

* subversion/libsvn_wc/workqueue.c

(log_do_committed): Variable ‘is_file’.

* subversion/libsvn_client/merge.c

(merge_dir_deleted): Variable ‘parent_path’.

(populate_remaining_ranges): Variable ‘equals’.

(drive_merge_report_editor): Variable ‘nearest_parent_is_target’.

(normalize_merge_sources): Variable ‘youngest_opt_rev’.

* subversion/libsvn_client/patch.c (check_dir_empty): Variable ‘revision’.

* subversion/libsvn_ra_serf/update.c (finish_report): Variable ‘props’.

* subversion/libsvn_ra_serf/commit.c

(apply_textdelta): Variables ‘wc_callback_baton’ and ‘wc_callbacks’.

* subversion/libsvn_delta/xdelta.c (compute_delta): Variable ‘hi’.

* subversion/libsvn_fs_fs/tree.c

(open_path): Variable ‘id’.

(merge_changes): Variable ‘source_id’.

(history_prev): Variable ‘node_id’.

  1. … 20 more files in changeset.
Add "const" to all "apr_array_header_t *" input parameters in public and

private APIs.

(Note that we are allowed to add "const" to a pointer parameter of a public

API, and have done so before, because that is a backward-compatible API

change and doesn't change the ABI at all.)

The public functions whose prototypes are changed are listed individually

below; the private functions are not.

* subversion/include/svn_auth.h

(svn_auth_open)

* subversion/include/svn_client.h

(svn_client_get_commit_log_t,

svn_client_copy5,

svn_client_copy4,

svn_client_move5,

svn_client_patch)

* subversion/include/svn_delta.h

(svn_delta_path_driver,

svn_file_rev_handler_t,

svn_file_rev_handler_old_t)

* subversion/include/svn_fs.h

(svn_fs_change_txn_props)

* subversion/include/svn_mergeinfo.h

(svn_rangelist_diff,

svn_rangelist_merge,

svn_rangelist_remove,

svn_rangelist_intersect,

svn_rangelist_inheritable2,

svn_rangelist_inheritable,

svn_rangelist_dup)

* subversion/include/svn_opt.h

(svn_opt_args_to_target_array3,

svn_opt_args_to_target_array2,

svn_opt_args_to_target_array,

svn_opt_eat_peg_revisions)

* subversion/include/svn_ra.h

(svn_ra_file_rev_handler_t,

svn_ra_get_locations,

svn_ra_plugin_t.get_locations)

* subversion/include/svn_ra_svn.h

(svn_ra_svn_command_handler,

svn_ra_svn_set_capabilities,

svn_ra_svn_parse_tuple,

svn_ra_svn_parse_proplist)

* subversion/include/svn_repos.h

(svn_repos_file_rev_handler_t,

svn_repos_trace_node_locations,

svn_repos_fs_get_mergeinfo,

svn_repos_fs_change_txn_props,

svn_repos_remember_client_capabilities)

* subversion/include/svn_sorts.h

(svn_sort__bsearch_lower_bound)

* subversion/include/svn_string.h

(svn_cstring_match_glob_list)

* subversion/include/svn_wc.h

(svn_wc_get_status_editor3,

svn_wc_get_update_editor4,

svn_wc_get_update_editor3,

svn_wc_get_switch_editor4,

svn_wc_get_switch_editor3,

svn_wc_match_ignore_list)

* subversion/include/private/svn_cmdline_private.h

* subversion/include/private/svn_opt_private.h

* subversion/libsvn_client/blame.c

* subversion/libsvn_client/client.h

* subversion/libsvn_client/commit.c

* subversion/libsvn_client/commit_util.c

* subversion/libsvn_client/copy.c

* subversion/libsvn_client/deprecated.c

* subversion/libsvn_client/merge.c

* subversion/libsvn_client/mergeinfo.c

* subversion/libsvn_client/mergeinfo.h

* subversion/libsvn_client/patch.c

* subversion/libsvn_client/ra.c

* subversion/libsvn_delta/compat.c

* subversion/libsvn_delta/path_driver.c

* subversion/libsvn_fs_base/reps-strings.c

* subversion/libsvn_fs_base/revs-txns.c

* subversion/libsvn_fs_base/revs-txns.h

* subversion/libsvn_fs_fs/fs_fs.c

* subversion/libsvn_fs_fs/fs_fs.h

* subversion/libsvn_fs/fs-loader.c

* subversion/libsvn_fs/fs-loader.h

* subversion/libsvn_ra/compat.c

* subversion/libsvn_ra/ra_loader.c

* subversion/libsvn_ra/ra_loader.h

* subversion/libsvn_ra/wrapper_template.h

* subversion/libsvn_ra_local/ra_plugin.c

* subversion/libsvn_ra_neon/get_locations.c

* subversion/libsvn_ra_neon/props.c

* subversion/libsvn_ra_neon/ra_neon.h

* subversion/libsvn_ra_serf/getlocations.c

* subversion/libsvn_ra_serf/ra_serf.h

* subversion/libsvn_ra_svn/client.c

* subversion/libsvn_ra_svn/cyrus_auth.c

* subversion/libsvn_ra_svn/editorp.c

* subversion/libsvn_ra_svn/internal_auth.c

* subversion/libsvn_ra_svn/marshal.c

* subversion/libsvn_ra_svn/ra_svn.h

* subversion/libsvn_repos/fs-wrap.c

* subversion/libsvn_repos/log.c

* subversion/libsvn_repos/repos.c

* subversion/libsvn_repos/repos.h

* subversion/libsvn_repos/rev_hunt.c

* subversion/libsvn_subr/auth.c

* subversion/libsvn_subr/cmdline.c

* subversion/libsvn_subr/deprecated.c

* subversion/libsvn_subr/mergeinfo.c

* subversion/libsvn_subr/opt.c

* subversion/libsvn_subr/sorts.c

* subversion/libsvn_subr/svn_string.c

* subversion/libsvn_wc/adm_ops.c

* subversion/libsvn_wc/deprecated.c

* subversion/libsvn_wc/diff.c

* subversion/libsvn_wc/status.c

* subversion/libsvn_wc/update_editor.c

* subversion/libsvn_wc/util.c

* subversion/mod_dav_svn/dav_svn.h

* subversion/mod_dav_svn/reports/file-revs.c

* subversion/mod_dav_svn/util.c

* subversion/svn/cl.h

* subversion/svn/props.c

* subversion/svn/switch-cmd.c

* subversion/svn/util.c

* subversion/svndumpfilter/main.c

* subversion/svnserve/serve.c

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

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

  1. … 78 more files in changeset.
Simplify a tiny bit of code, removing some type casts.

* subversion/libsvn_ra/compat.c

(log_path_del_receiver): Assign the 'baton' argument to a variable of the

appropriate type to avoid type casts at its points of use.

* subversion/libsvn_ra/ra_loader.c

(svn_ra_lock, svn_ra_unlock): Simpify by using svn_apr_hash_index_key()

instead of apr_hash_this() and type casts.

  1. … 1 more file in changeset.
Test out my new and fancy ASF commit priviledges by changing the copyright

wording in our license headers to reflect ownership by the ASF.

* NOTICE:

Change terminology to ASF, and update a link.

* subversion/libsvn_subr/opt.c

(svn_opt__print_version_info): Note that the product as a whole is

copyrighted by the ASF, and update the project website.

* everywhere:

Change license text to reflect ASF ownership.

  1. … 891 more files in changeset.