Checkout Tools
  • last updated 1 hour ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Introduce a null-pointer constant that we can use as a termination sentinel

in variable argument lists. This avoids the ugliness of writing

"(char *) NULL" all over the place.

* subversion/include/svn_types.h (SVN_VA_NULL): New symbol.

* subversion/include/svn_dirent_uri.h (svn_dirent_join_many),

subversion/include/svn_path.h (svn_path_join_many),

subversion/include/svn_xml.h (svn_xml_make_open_tag):

Update docstrings, mentioning SVN_VA_NULL as the argument list terminator.

[Lots of implementation files]: Replace typecast-NULL with SVN_VA_NULL in

function calls with variable argument lists.

  1. … 89 more files in changeset.
Merge svn_kind_t into svn_node_kind_t, leaving only one public enumeration

that describes node kinds.

* subversion/include/svn_types.h (svn_kind_t): Removed.

All uses of svn_kind_t were replaced with svn_node_kind_t.

(svn_node_kind_t): New enumeration constant, svn_node_symlink.

Replaces all previous uses of svn_kind_symlink.

(svn__node_kind_from_kind): Removed. All call sites updated.

(svn__kind_from_node_kind): Removed. All call sites updated.

* subversion/libsvn_wc/tree_conflicts.c (node_kind_map):

Added comment about incompatible representation of svn_node_unknown.

* subversion/libsvn_wc/node.c (convert_db_kind_to_node_kind):

May be redundant, and comment is out of date. Added a note about that.

There are also a zillion changes in dependent files, and they all result

from the following renames:

svn_kind_t to svn_node_kind_t

svn_kind_none to svn_node_none

svn_kind_file to svn_node_file

svn_kind_dir to svn_node_dir

svn_kind_unknown to svn_node_unknown

svn_kind_symlink to svn_node_symlink

  1. … 65 more files in changeset.
Rename svn_wc__strictly_is_wc_root() to svn_wc__is_wcroot() for consistency

with the name of the DB-layer equivalent function svn_wc__db_is_wcroot().

* subversion/include/private/svn_wc_private.h,

subversion/libsvn_wc/update_editor.c

(svn_wc__strictly_is_wc_root): Rename to svn_wc__is_wcroot. Update doc

string and rename the output parameter for consistency.

* subversion/libsvn_client/add.c

(svn_client_add5): Track the rename.

* subversion/libsvn_client/patch.c

(check_dir_empty): Track the rename.

* subversion/libsvn_client/revert.c

(svn_client_revert2): Track the rename.

* subversion/libsvn_client/switch.c

(switch_internal): Track the rename.

* subversion/libsvn_wc/relocate.c

(svn_wc_relocate4): Track the rename.

* subversion/libsvn_wc/wc_db.h,

subversion/libsvn_wc/wc_db.c

(svn_wc__db_is_wcroot): Refer to svn_wc_is_wc_root() for documentation.

Rename the output parameter for consistency.

  1. … 8 more files in changeset.
Followup to r1181800 by removing the svn_wc__db_kind_t type and replacing it

with the now-public svn_kind_t. This just affects the internals of libsvn_wc,

not any of the public, or quasi-public APIs.

* subversion/tests/libsvn_wc/:

s/svn_wc__db_kind_/svn_kind_/

  1. … 31 more files in changeset.
Followup to r1140505. Fix indentation.

* [everywhere]: Fix indentation fallout from the

svn_error_return() -> svn_error_trace() rename.

Patch by: Noorul Islam K M <noorul{_AT_}collab.net>

  1. … 37 more files in changeset.
Rename the 'svn_error_return' macro to 'svn_error_trace'.

See email thread "[RFC] Rename 'svn_error_return' to 'svn_error_trace'?" on

2011-06-23, <http://svn.haxx.se/dev/archive-2011-06/0708.shtml>.

* subversion/include/svn_error.h

(svn_error_return): Rename to svn_error_trace.

(SVN_ERR, svn_error_purge_tracing): Track the rename.

* [everywhere]: Track the rename.

  1. … 120 more files in changeset.
Remove the unused pool argument from svn_relpath_is_canonical(). I can't

think of a reason why we are ever going to use that later with our

current definition of what is and isn't a valid relpath.

No functional changes.

* subversion/include/svn_dirent_uri.h

(svn_relpath_is_canonical): Remove argument.

* subversion/libsvn_subr/deprecated.c

* subversion/libsvn_subr/dirent_uri.c

* subversion/libsvn_subr/mergeinfo.c

* subversion/libsvn_wc/old-and-busted.c

* subversion/libsvn_wc/relocate.c

* subversion/libsvn_wc/util.c

* subversion/libsvn_wc/wc_db.c

* subversion/mod_dav_svn/util.c

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

(*): Update callers.

  1. … 9 more files in changeset.
Add three more arguments to our function with the most arguments. Do this to

allow handling more operations with a single read transaction and to allow

fixing code that should know about multiple WORKING layers.

This patch adds the following three new (optional) boolean output arguments:

had_props - Does it have pristine properties

op_root - Is it a layer defining operation

have_more_work - Does it have multiple working layers

Because I had to update all callers anyway, I moved a few arguments to a more

sensible location. (See the wc_db.h change for more information on that).

This patch just updates the callers to get the same information as before.

No functional changes in any of the callers.

* subversion/libsvn_wc/adm_crawler.c

(svn_wc_restore,

report_revisions_and_depths,

find_base_rev,

svn_wc_crawl_revisions5,

read_and_checksum_pristine_text): Update callers.

* subversion/libsvn_wc/adm_files.c

(svn_wc__text_base_path_to_read,

svn_wc__get_pristine_contents,

svn_wc__internal_ensure_adm): Update callers.

* subversion/libsvn_wc/adm_ops.c

(process_committed_leaf,

svn_wc__process_committed_internal,

svn_wc_delete4,

check_can_add_to_parent,

check_can_add_node,

revert_restore,

new_revert_partial,

svn_wc__internal_remove_from_revision_control,

svn_wc__internal_changelist_match): Update callers.

* subversion/libsvn_wc/ambient_depth_filter_editor.c

(ambient_read_info): Update caller.

* subversion/libsvn_wc/cleanup.c

(repair_timestamps): Update caller.

* subversion/libsvn_wc/conflicts.c

(recursive_resolve_conflict): Update caller.

* subversion/libsvn_wc/copy.c

(copy_pristine_text_if_necessary,

svn_wc_copy3): Update callers.

* subversion/libsvn_wc/crop.c

(crop_children,

svn_wc_exclude,

svn_wc_crop_tree2): Update callers.

* subversion/libsvn_wc/diff.c

(get_nearest_pristine_text_as_file,

file_diff,

report_wc_file_as_added,

report_wc_directory_as_added,

delete_entry,

apply_textdelta,

close_file,

* subversion/libsvn_wc/entries.c

(get_base_info_for_deleted,

read_one_entry,

svn_wc_walk_entries3,

* subversion/libsvn_wc/lock.c

(svn_wc__internal_check_wc,

adm_available,

child_is_disjoint): Update callers.

* subversion/libsvn_wc/node.c

(svn_wc__node_get_repos_info,

svn_wc_read_kind,

svn_wc__node_get_depth,

svn_wc__node_get_changed_info,

svn_wc__node_get_changelist,

svn_wc__node_get_base_checksum,

svn_wc__node_get_translated_size,

svn_wc__node_get_repos_relpath,

svn_wc__internal_get_copyfrom_info,

svn_wc__internal_walk_children,

svn_wc__node_is_status_deleted,

svn_wc__node_is_status_absent,

svn_wc__node_is_status_not_present,

svn_wc__node_is_status_excluded,

svn_wc__node_is_added,

svn_wc__node_get_base_rev,

svn_wc__node_get_working_rev_info,

svn_wc__node_get_commit_base_rev,

svn_wc__internal_node_get_schedule,

svn_wc__node_get_info_bits,

svn_wc__get_mergeinfo_walk_info,

svn_wc__node_depth_is_exclude,

svn_wc__node_get_origin,

svn_wc__node_get_commit_status): Update callers.

* subversion/libsvn_wc/props.c

(svn_wc__get_pristine_props,

svn_wc__internal_propset,

svn_wc__props_modified): Update callers.

* subversion/libsvn_wc/questions.c

(compare_and_verify,

svn_wc__internal_file_modified_p,

svn_wc__internal_conflicted_p,

svn_wc__expand_keywords): Update caller.

* subversion/libsvn_wc/relocate.c

(svn_wc_relocate4): Update callers.

* subversion/libsvn_wc/status.c

(read_info,

internal_status): Update callers. Avoid C++ keyword mutable.

* subversion/libsvn_wc/translate.c

(svn_wc__expand_keywords): Update callers.

* subversion/libsvn_wc/update_editor.c

(already_in_a_tree_conflict,

delete_entry,

add_directory,

open_directory,

add_file,

open_file,

make_editor,

svn_wc__check_wc_root,

svn_wc_add_repos_file4):

* subversion/libsvn_wc/wc_db.c

(read_info): Update argument list of prototype.

(cross_db_copy,

get_info_for_copy,

temp_op_delete_txn): Update callers.

(read_info): Update argument list and calculate new values.

(svn_wc__db_read_info): Update argument list and update caller.

(read_url_txn,

svn_wc__db_global_relocate,

svn_wc__db_node_hidden,

has_switched_subtrees): Update callers.

* subversion/libsvn_wc/wc_db.h

(svn_wc__db_read_info): Update, extend and cleanup documentation. Update argument

list.

* subversion/libsvn_wc/workqueue.c

(remove_base_node,

log_do_committed,

run_file_install): Update callers.

* subversion/tests/libsvn_wc/db-test.c

(test_working_info,

test_global_relocate): Update callers.

  1. … 21 more files in changeset.
Fix pool usage bugs and inconsistencies involving result_pool and

scratch_pool being swapped.

* subversion/include/private/svn_wc_private.h,

subversion/libsvn_wc/node.c

(svn_wc__node_get_working_rev_info): Put result_pool before scratch_pool.

This causes the only caller, subversion/svn/status-cmd.c:print_status(),

to get the results in result_pool rather than scratch_pool.

* subversion/include/svn_wc.h,

subversion/libsvn_wc/update_editor.c

(svn_wc_get_wc_root): Put the results into result_pool rather than

scratch_pool. Put result_pool before scratch_pool. The callers need no

adjustment as the only caller passes the same pool for both parameters.

* subversion/libsvn_client/client.h,

subversion/libsvn_client/externals.c

(svn_client__crawl_for_externals): Put result_pool before scratch_pool.

The callers need no adjustment as they all pass the same pool for both

parameters.

* subversion/libsvn_client/patch.c

(read_line): Same.

* subversion/libsvn_wc/relocate.c

(url_remove_final_relpath): Same.

* subversion/libsvn_client/locking_commands.c

(condense_targets): Put result_pool before scratch_pool.

(organize_lock_targets): Adjust calls accordingly.

* subversion/libsvn_ra_neon/ra_neon.h

(svn_ra_neon__request_get_location): Remove this unused prototype.

  1. … 9 more files in changeset.
* subversion/libsvn_wc/relocate.c

(svn_wc_relocate4): Use proper variable types to avoid bitness warnings on

OS X.

Get rid of a few "missing sentinel" warnings from calls to apr_pstrcat()

by explicitly casting NULL to the expected pointer type.

* subversion/libsvn_subr/dirent_uri.c

(svn_fspath__canonicalize,

svn_fspath__get_longest_ancestor): Cast to (char *).

* subversion/libsvn_wc/relocate.c

(svn_wc_relocate4): Same.

* tools/client-side/svnmucc/svnmucc.c

(main): Same.

  1. … 2 more files in changeset.
Fix some more URI-encoding bugs in the relocation code.

* subversion/libsvn_wc/relocate.c

(url_remove_final_relpath): Was uri_remove_components(). Add

docstring. Add 'scratch_pool' parameter. Rename 'uri' and

'component' parameters to 'url' and 'relpath', respectively.

Tweak assertions to be a bit more forward-looking. Finally,

URI-encode the relpath before searching through 'uri' for it.

(svn_wc_relocate4): Update call to (what is now)

url_remove_final_relpath().

* subversion/libsvn_wc/relocate.c

(svn_wc_relocate4): Tweak some error message strings to better

distinguish them from each other.

* subversion/tests/cmdline/switch_tests.py

(relocate_beyond_repos_root): Update expected error string.

  1. … 1 more file in changeset.
* subversion/libsvn_wc/relocate.c

(svn_wc_relocate4): Use svn_path_url_add_component2() instead of

svn_uri_join(), which I mistakenly thought did URI-encoding of the

joined components.

Just padding my stats.

(Actually, doing my regular trailing whitespace removal, similar to r875968.)

* 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. … 166 more files in changeset.
Restore a piece of lost functionality from 'svn switch --relocate',

namely the ability to specify a mere URL prefix as the FROM and TO

bits rather than having to provide full URLs. It turns out that being

able to do 'svn switch --relocate http https TARGET' is really handy

(and possible in previous Subversion versions). This work is also

required to restore compatibility with previous versions of the

relevant APIs.

* subversion/tests/cmdline/switch_tests.py

(relocate_beyond_repos_root): Update expected failure strings.

* subversion/include/svn_wc.h

(svn_wc_relocate4): Update docstring to not add unnecessary new

requirements over the previous version thereof.

* subversion/libsvn_wc/relocate.c

(svn_wc_relocate4): Rework the input validation to avoid adding

unnecessary restrictions.

  1. … 2 more files in changeset.
Disallow relocation of working copy subtrees and relocation at depths

other than infinity. This change breaks some compatibility with

previous APIs at both the svn_client and svn_wc levels -- I'll just be

honest about that. But from what I've seen, while the APIs used to

"work" (that is, do what they claimed), the result was a working copy

that didn't. Also, the command-line client disallowed some of this

stuff already, and just errored out on some parts that it didn't

disallow. In all, relocation was a mess. So I'm extremely

comfortable with calling this a bugfix.

* subversion/include/svn_wc.h

(svn_wc_relocate4): Note that local_abspath is the root directory of

a working copy.

(svn_wc_relocate3): Note that 'recurse' is replaced by 'depth' now.

* subversion/include/svn_client.h

(svn_client_relocate2): New.

(svn_client_relocate): Deprecated with noted limitations to backward

compatibility.

* subversion/libsvn_wc/relocate.c

(svn_wc_relocate4): Check local_abspath to see if it's a strict

working copy root; if not, disallow the relocation. Try to tell

the caller where to find the working copy root.

* subversion/libsvn_wc/deprecated.c

(svn_wc_relocate3): Disallow recurse=FALSE with an error. Update

call to svn_wc_relocate4().

* subversion/libsvn_client/relocate.c

(svn_client_relocate2): Rev svn_client_relocate(), this time without

a 'recurse' parameter.

(svn_client_relocate): Moved to deprecate.c.

* subversion/libsvn_client/deprecated.c

(svn_client_relocate): Moved here from relocate.c and made into a

simple wrapper around svn_client_relocate2().

* subversion/libsvn_client/externals.c

(switch_dir_external): Now use svn_client_relocate2().

* subversion/svn/main.c

(main): Since we disallow --relocate with --depth, it makes sense to

also disallow --relocate with --non-recursive, so do so.

* subversion/svn/switch-cmd.c

(rewrite_urls): Lose 'recurse' parameter, and now use

svn_client_relocate2().

(svn_cl__switch): Update call to rewrite_urls().

* subversion/tests/cmdline/switch_tests.py

(relocate_beyond_repos_root): Rewrite a bit to still test the

intended things without triggering the new error situation.

(single_file_relocate): Tweak expected error message.

  1. … 9 more files in changeset.
Remove multi-db support from wc_db.c. No functional changes.

This leaves a few #ifdef SINGLE_DB statements that need further research.

* subversion/libsvn_wc/relocate.c

(svn_wc_relocate4): Remove single_db argument from call.

* subversion/libsvn_wc/wc_db.c

(kind_map): Remove subdir.

(*): Evaluate SINGLE_DB and SVN_WC__SINGLE_DB

(svn_wc__db_global_relocate): Remove single_db argument.

* subversion/libsvn_wc/wc_db.h

(svn_wc__db_global_relocate): Remove single_db argument.

* subversion/tests/libsvn_wc/db-test.c

(test_global_relocate): Update caller.

  1. … 3 more files in changeset.
Following up the last batch of commits, remove header includes

and entry modification flags that are no longer used.

* subversion/libsvn_wc/adm_crawler.c

* subversion/libsvn_wc/copy.c

* subversion/libsvn_wc/crop.c

* subversion/libsvn_wc/diff.c

Remove some unused includes of entry.h, lock.h and prop.h

* subversion/libsvn_wc/entries.c

(fold_entry): Remove unused foldings.

(svn_wc__entry_modify_stub): Remove flag.

* subversion/libsvn_wc/entries.h

(SVN_WC__ENTRY_MODIFY_REVISION, SVN_WC__ENTRY_MODIFY_URL,

SVN_WC__ENTRY_MODIFY_DELETED): Remove unused flags.

* subversion/libsvn_wc/lock.c

* subversion/libsvn_wc/log.c

* subversion/libsvn_wc/merge.c

* subversion/libsvn_wc/node.c

* subversion/libsvn_wc/props.c

* subversion/libsvn_wc/relocate.c

* subversion/libsvn_wc/status.c

* subversion/libsvn_wc/tree_conflicts.c

* subversion/libsvn_wc/update_editor.c

* subversion/libsvn_wc/workqueue.c

Remove some unused includes of entry.h, lock.h and prop.h

  1. … 15 more files in changeset.
Restore an old behavior.

* subversion/libsvn_wc/relocate.c

(svn_wc_relocate4): Pass the uuid to the validator function for all

working copy path that needs validation.

Add empty doc strings to the 141 static functions in libsvn_wc that didn't

have one. Why? To make me feel worse. But really, to give a tiny extra

visual cue that might encourage any passing programmer to write something in

it. This distinguishes them from non-static functions, which don't have a

doc string at their definition because it's at their declaration. Did I

make an exception for functions whose purpose is "so obvious that they don't

need one"? No.

* subversion/libsvn_wc/adm_crawler.c,

subversion/libsvn_wc/adm_files.c,

subversion/libsvn_wc/adm_ops.c,

subversion/libsvn_wc/ambient_depth_filter_editor.c,

subversion/libsvn_wc/conflicts.c,

subversion/libsvn_wc/deprecated.c,

subversion/libsvn_wc/entries.c,

subversion/libsvn_wc/lock.c,

subversion/libsvn_wc/log.c,

subversion/libsvn_wc/old-and-busted.c,

subversion/libsvn_wc/props.c,

subversion/libsvn_wc/relocate.c,

subversion/libsvn_wc/status.c,

subversion/libsvn_wc/translate.c,

subversion/libsvn_wc/tree_conflicts.c,

subversion/libsvn_wc/update_editor.c,

subversion/libsvn_wc/upgrade.c,

subversion/libsvn_wc/wc_db.c,

subversion/libsvn_wc/workqueue.c

Add empty doc strings.

  1. … 18 more files 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.
When performing a relocation, don't forget to purge the wcprops (dav

cache) data for affected items.

(This problem is currently causing switch_tests.py 19 to fail over

ra_neon/HTTPv1, ra_neon/HTTPv2, and ra_serf/HTTPv1.)

* subversion/libsvn_wc/wc-queries.sql

(STMT_CLEAR_BASE_RECURSIVE_DAV_CACHE): New SQL template.

* subversion/libsvn_wc/wc_db.h

(svn_wc__db_global_relocate): Update docstring to note the purge of

DAV cache items.

* subversion/libsvn_wc/wc_db.c

(relocate_txn): Also reset DAV cache items recursively when we have

with base nodes.

* subversion/libsvn_wc/relocate.c

(svn_wc_relocate4): Leave a FIXME comment here.

  1. … 3 more files in changeset.
Revise the conflict handling api on the WC-DB level to work completely

with conflict descriptions.

Every node in the filesystem (versioned or not) can have zero or more

conflicts associated to them. A tree conflict, a text conflict, and any

number of property conflicts.

This updates the svn_wc__db_read_info() to just return a boolean indicating

whether the specified node has one or more conflicts. Further details can

be obtained via svn_wc__db_read_conflicts().

* *

(*): Update callers of svn_wc__db_read_info() and making conflict

descriptors constant.

* subversion/include/private/svn_wc_private.h

(svn_wc__get_tree_conflict): Return constant descriptor.

* subversion/libsvn_wc/adm_crawler.c

* subversion/libsvn_wc/adm_ops.c

(resolve_conflict_on_node): Use new apis for retrieving conflict data.

* subversion/libsvn_wc/crop.c

* subversion/libsvn_wc/entries.c

(read_entries_new): Use new apis for retrieving conflict data.

* subversion/libsvn_wc/lock.c

* subversion/libsvn_wc/node.c

* subversion/libsvn_wc/props.c

(get_existing_prop_reject_file): Retrieve a property reject file via the new

api.

* subversion/libsvn_wc/questions.c

(svn_wc__internal_conflicted_p): Function rewritten to take advantage of new api.

* subversion/libsvn_wc/relocate.c

* subversion/libsvn_wc/status.c

* subversion/libsvn_wc/translate.c

* subversion/libsvn_wc/tree_conflicts.c

* subversion/libsvn_wc/update_editor.c

* subversion/libsvn_wc/wc_db.c

(svn_wc__db_op_read_tree_conflict): Make conflict description constant.

(svn_wc__db_read_info): Update argument list. Use

svn_wc__db_op_read_tree_conflict to retrieve tree conflicted status.

* subversion/libsvn_wc/wc_db.h

(svn_wc__db_op_read_tree_conflict): Make conflict description constant.

(svn_wc__db_read_info): Update argument list.

* subversion/libsvn_wc/workqueue.c

(run_revert): Retrieve conflicts the new way.

* subversion/tests/libsvn_wc/db-test.c

  1. … 18 more files in changeset.
Remove the tree_conflict_data parameter from svn_wc__db_read_info().

This parameter was only used in one place: the backward compat entries reading

code. This, combined with the fact that we are moving away from using the

skel-ized representation of tree conflicts, means we should remove the

parameter from read_info(), and just hack together the serialized data in

the backward compat code.

* subversion/libsvn_wc/crop.c,

subversion/libsvn_wc/props.c,

subversion/libsvn_wc/adm_ops.c,

subversion/libsvn_wc/update_editor.c,

subversion/libsvn_wc/lock.c,

subversion/libsvn_wc/questions.c,

subversion/libsvn_wc/translate.c,

subversion/libsvn_wc/relocate.c,

subversion/libsvn_wc/entries.c,

subversion/libsvn_wc/wc_db.c,

subversion/libsvn_wc/adm_crawler.c,

subversion/libsvn_wc/node.c,

subversion/libsvn_wc/workqueue.c,

subversion/tests/libsvn_wc/db-test.c:

Update callers to remove the extra NULL parameter to svn_wc__db_read_info().

* subversion/libsvn_wc/entries.c

(read_entries_new): If we get a directory, check for tree conflicts and

build the appropriate skel serialization if we find some.

* subversion/libsvn_wc/wc_db.c

(svn_wc__db_read_info): Remove the tree_conflict_data param, and don't

bother fetch it or writing to it.

* subversion/libsvn_wc/wc_db.h

(svn_wc__db_read_info): Remove the tree_conflit_data param and update docs.

  1. … 14 more files in changeset.
Add a tree_conflict_data out parameter to svn_wc__db_read_info().

Ideally, this parameter would be a svn_wc_conflict_description2_t which

describes the tree conflict on local_abspath. However, the way that tree

conflicts are stored and what current consumers of this API expect don't match

that ideal. I've left a note to update this when tree conflict information

is moved.

* subversion/tests/libsvn_wc/db-test.c

(test_working_info, test_global_relocate),

* subversion/libsvn_wc/relocate.c

(svn_wc_relocate4),

* subversion/libsvn_wc/crop.c

(crop_children),

* subversion/libsvn_wc/props.c

(get_existing_prop_reject_file, svn_wc__load_props,

svn_wc__internal_propset),

* subversion/libsvn_wc/adm_ops.c

(tweak_entries),

* subversion/libsvn_wc/update_editor.c

(svn_wc__strictly_is_wc_root),

* subversion/libsvn_wc/questions.c

(svn_wc_conflicted_p3),

* subversion/libsvn_wc/adm_crawler.c

(restore_file, svn_wc_transmit_text_deltas2),

* subversion/libsvn_wc/translate.c

(svn_wc__get_keywords, svn_wc__maybe_set_read_only):

Update callers.

* subversion/libsvn_wc/entries.c

(statement_keys, statements): Remove an unneeded statement.

(fetch_actual_nodes): Remove.

(read_entries_new): Don't fetch the actual nodes, since we can just get the

information we need from read_info() now.

(svn_wc_walk_entries3): Update caller.

* subversion/libsvn_wc/wc_db.c

(statements): Get the tree_conflict_data from ACTUAL_NODE.

(svn_wc__db_read_info): Add tree_conflict_data param, and fetch it.

(svn_wc__db_global_relocate, svn_wc__db_check_node): Update callers.

* subversion/libsvn_wc/wc_db.h

(svn_wc__db_read_info): Add tree_conflict_data output parameter, along with

a comment about what the future of this parameter should be.

  1. … 11 more files in changeset.
Extend svn_wc__db_read_info() to return textual conflict filenames.

* subversion/tests/libsvn_wc/db-test.c

(test_working_info): Retreive the conflict information and verify it.

(test_global_relocate): Update call to read_info().

* subversion/libsvn_wc/relocate.c

(svn_wc_relocate4),

* subversion/libsvn_wc/props.c

(get_existing_prop_reject_file, svn_wc__load_props,

svn_wc__internal_propset),

* subversion/libsvn_wc/crop.c

(crop_children),

* subversion/libsvn_wc/adm_ops.c

(tweak_entries),

* subversion/libsvn_wc/adm_crawler.c

(restore_file, svn_wc_transmit_text_deltas2),

* subversion/libsvn_wc/translate.c

(svn_wc__get_keywords, svn_wc__maybe_set_read_only):

Add NULL values for conflict params.

* subversion/libsvn_wc/wc-metadata.sql

(ACTUAL_NODE): Move a comment to it applies to more columns.

* subversion/libsvn_wc/entries.c

(read_entries_new): Fetch the conflict values directly from read_info().

(svn_wc_walk_entries3): Update caller.

* subversion/libsvn_wc/wc_db.c

(statements): Select the conflict information from the ACTUAL table.

(svn_wc__db_read_info): Add the extra arguments, and populate them.

(svn_wc__db_global_relocate, svn_wc__db_check_node): Update caller.

* subversion/libsvn_wc/wc_db.h

(svn_wc__db_read_info): Update signature and docs.

  1. … 10 more files in changeset.
Relicense Subversion under the Apache License, Version 2.0.

* NOTICE: New.

* LICENSE: New.

* COPYING,

subversion/LICENSE: Remove.

* subversion/libsvn_subr/opt.c

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

copyrighted by the SVN Corp, and that it contains contributions from

many people, as referenced in NOTICE.

* subversion/bindings/swig/python/LICENSE_FOR_PYTHON_BINDINGS:

Relicense the SVN parts under Apache 2.0.

* everywhere:

Change copyright notices in file headers to reflect the Apache 2.0 license.

  1. … 882 more files in changeset.
Include the property reject file name as part of the information returned from

svn_wc__db_read_info(). Adjust callers accordingly.

* subversion/tests/libsvn_wc/db-test.c

(test_working_info, test_global_relocate),

* subversion/libsvn_wc/relocate.c

(svn_wc_relocate4),

* subversion/libsvn_wc/crop.c

(crop_children),

* subversion/libsvn_wc/adm_ops.c

(tweak_entries),

* subversion/libsvn_wc/adm_crawler.c

(restore_file, svn_wc_transmit_text_deltas2),

* subversion/libsvn_wc/translate.c

(svn_wc__get_keywords, svn_wc__maybe_set_read_only):

Update callers.

* subversion/libsvn_wc/entries.c

(read_entries_new): Read the property rejection filename through the

read_info() interface, instead of directly from the actual node.

(svn_wc_walk_entries3): Update caller.

* subversion/libsvn_wc/wc_db.c

(statements): Select the property reject file from the ACTUAL table.

(svn_wc__db_read_info): Add an argument for the property reject file,

and populate it.

(svn_wc__db_global_relocate, svn_wc__db_check_node): Update callers.

* subversion/libsvn_wc/wc_db.h

(svn_wc__db_read_info): Add parameter, update docs.

  1. … 8 more files in changeset.
Resurrect the 'resurse' parameter to svn_wc_relocate4(). I kind of hate

to do this, but I think it's better than recreating the recurse emulation

logic at every API level up the stack.

* subversion/include/svn_wc.h

(svn_wc_relocate4): Add recurse param, and document it.

* subversion/libsvn_wc/relocate.c

(svn_wc_relocate4): Copy the non-recursive functionality out of

svn_wc_relocate3().

* subversion/libsvn_wc/deprecated.c

(svn_wc_relocate3): Remove the non-recursive functionality, and destroy

the compat wc context.

  1. … 2 more files in changeset.