subversion

Checkout Tools
  • last updated 1 hour ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates

Changeset 1170838 is being indexed.

* subversion/include/svn_editor.h

(svn_editor_set_props): Update docstring in answer to a question, and remove

said question.

Add a prop fetching callback to the Ev2 shim code. This allows the shim to

retrieve existing props in order to set the new ones.

* subversion/libsvn_ra_svn/editorp.c,

subversion/libsvn_ra_neon/commit.c,

subversion/svnsync/main.c,

subversion/svnrdump/dump_editor.c,

subversion/tests/libsvn_delta/editor-test.c,

subversion/libsvn_wc/diff_editor.c,

subversion/libsvn_wc/update_editor.c,

subversion/libsvn_wc/status.c,

subversion/libsvn_client/repos_diff.c,

subversion/libsvn_client/mergeinfo.c,

subversion/libsvn_client/export.c,

subversion/libsvn_client/commit.c,

subversion/libsvn_ra_serf/commit.c,

subversion/libsvn_repos/commit.c,

subversion/libsvn_repos/dump.c:

Update callers.

* subversion/include/svn_delta.h

(svn_delta_fetch_props_cb_func_t): New.

(svn_delta_from_editor, svn_editor__insert_shims): Add callback and baton.

* subversion/libsvn_delta/compat.c

(ev2_edit_baton): Add callback and baton member.

(action): Add the remove_prop action.

(ev2_change_dir_prop, ev2_change_file_prop): Differentiate between a changed

or added prop and a removed one (since we can't store removed props in

a hash).

(ev2_close_edit): Handle removed props properly, and fetch the existing

props to ensure we don't nuke existing properties.

(svn_delta_from_editor): Take and store the prop fetch callback.

(svn_editor__insert_shims): Take and use the prop fetch callback.

Update news sections of the website to reflect 1.7.0-rc3.

* publish/news.html

(news-20110914): New.

* publish/index.html

(news-20110914): New.

(news-20110724): Remove.

* publish/download/download.html:

Update the website with 1.7.0-rc3.

Remove the 1.7.x-r1163557 branch, reintegrated in r1170669.

Reintegrate the 1.7.x-r1163557 branch:

* r1163557

Relax wcng consistency checks for file externals.

Justification:

Debug build claims wcng DB is inconsistent when it is OK.

Branch:

1.7.x-r1163557

Votes:

+1: philip, rhuijben, neels

* STATUS: Vote thrice, approves of r1163557.

Changed a +0 to a +1. I thought I'd have more file-in-unversioned-externals

fixes ready in a short time to go along, but still not there. So let's get

this one out of STATUS, even if it just fixes a small maintainer-mode bug.

On the fs-py branch:

Bring libsvn_fs_py up-to-date with libsvn_fs_fs.

On the fs-py branch:

Bring up-to-date with trunk.

    • ?
    /branches/fs-py/subversion/libsvn_client/diff_summarize.c
    • ?
    /branches/fs-py/subversion/libsvn_client/ra.c
    • ?
    /branches/fs-py/subversion/libsvn_wc/copy.c
  1. … 86 more files in changeset.
* STATUS: Indent.

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

(editor_from_delta_editor_test): Qualify a variable.

On the fs-successor-ids branch, update BRANCH-README.
On the fs-successor-ids branch, update BRANCH-README.

* BRANCH-README: Update status and round up a todo list.

In the Ev2 shim, handle the delete action.

* subversion/libsvn_delta/compat.c

(ev2_delete_entry): Add an action to the queue.

(ev2_close_edit): Handle the action.

A few more property handling improvements in the Ev2 shims.

* subversion/libsvn_delta/compat.c

(ev2_dir_baton): Add path member.

(ev2_add_directory, ev2_open_directory): Initialize path baton member.

(ev2_change_dir_prop): Add an action to the action list.

(ev2_change_file_prop): Don't try to dup a NULL value.

(ev2_close_edit): Make sure we don't delete existing props.

* subversion/include/svn_editor.h

(svn_editor_set_props): Add a couple of notes.

On the fs-successor-ids branch, add an idea from Stefan.
Add an iterpool to a loop.

* subversion/libsvn_client/diff.c

(display_prop_diffs): Use an iterpool for the internal display loop.

When posting candidate tarballs, take advantage of apache's FancyIndex option

to display the warning.

* tools/dist/release.py

(post_candidates): Put the warning text and the tarballs in the same

directory.

(move_to_dist): Remove unused variable.

(main): Update commandline options.

* tools/dist/templates/rc-candidates.ezt,

tools/dist/templates/stable-candidates.ezt,

tools/dist/templates/nightly-candidates.ezt:

Update text.

* tools/dist/templates/htaccess.ezt:

New.

    • ?
    /trunk/tools/dist/templates/htaccess.ezt
* tools/dist/release.py

(roll_tarballs): Early error if the deploy directory already exists.

* subversion/tests/cmdline/merge_tests.py

(merge_dir_replace,

merge_from_renamed_branch_fails_while_avoiding_repeat_merge,

no_self_referential_or_nonexistent_inherited_mergeinfo):

Add some issue numbers to the @Issue decorators.

Code simplification. Use svn_ra_reparent() instead of

svn_client__ensure_ra_session_url() where the added value of the latter is

not wanted.

* subversion/libsvn_client/copy.c

(repos_to_repos_copy): As above.

* subversion/libsvn_client/merge.c

(ensure_ra_session_url): As above.

* subversion/libsvn_client/update.c

(svn_client__dirent_fetcher): As above.

Code simplification. Make svn_client__repos_locations() easier to use in

the fairly common case where only one location is required, by accepting

null for the second revision number. The corresponding outputs were already

allowed to be null. Simplify several callers by passing null for these

inputs and outputs.

* subversion/libsvn_client/client.h

(svn_client__repos_locations): Allow the 'end' revision parameter to be

null.

* subversion/libsvn_client/copy.c

(repos_to_repos_copy, repos_to_wc_copy): Eliminate some variables by

passing NULL for unused 'end revision' inputs and outputs to

svn_client__repos_locations().

* subversion/libsvn_client/diff.c

(diff_repos_wc): Same.

* subversion/libsvn_client/info.c

(same_resource_in_head): Same.

* subversion/libsvn_client/merge.c

(filter_self_referential_mergeinfo, calculate_remaining_ranges,

normalize_merge_sources, calculate_left_hand_side): Same.

* subversion/libsvn_client/ra.c

(svn_client__ra_session_from_path): Same.

(svn_client__repos_locations): Allow NULL to mean an unspecified revision.

Use svn_uri_skip_ancestor() wherever svn_uri__is_child() was being used with

an extra string comparison to achieve the same effect.

* subversion/libsvn_client/commit_util.c

(svn_client__condense_commit_items): Same.

* subversion/libsvn_client/copy.c

(repos_to_repos_copy): Same.

* subversion/libsvn_ra_neon/session.c

(svn_ra_neon__get_path_relative_to_root): Same.

* subversion/libsvn_ra/ra_loader.c

(svn_ra_get_path_relative_to_root): Same.

* subversion/libsvn_ra_svn/client.c

(path_relative_to_root): Same.

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

(subtract_anchor): Same.

On the fs-successor-ids branch, fix another off-by-one.

* subversion/libsvn_fs_fs/fs_fs.c

(read_successors_from_candidates): Chop off the \n.

On the fs-successor-ids branch, fix an off-by-one.

* subversion/libsvn_fs_fs/fs_fs.c

(read_successors_from_candidates):

Fix an off-by-one in the line parsing.

On the fs-successor-ids branch, implement svn_fs_history_next() for FSFS.

This is largely a machine translation of the BDB implementation :-(.

* subversion/libsvn_fs_fs/tree.c

(struct history_next_args, report_successor, txn_body_history_next):

New, based on their analogues in libsvn_fs_base.

(fs_history_next):

Implement, mirroring base_history_next().

On the fs-successor-ids branch:

* subversion/libsvn_fs_fs/fs_fs.c

(read_successor_candidate_revisions): Add a docstring.

On the fs-successor-id branch, glue the helpers doing all the work.

Patch by: stsp

danielsh

* subversion/libsvn_fs_fs/fs_fs.h,

subversion/libsvn_fs_fs/fs_fs.c

(svn_fs_fs__get_node_successors):

New FSFS-private API, to be used by fs_history_next().

On the fs-successor-ids branch, constify parameters.

* subversion/libsvn_fs_fs/fs_fs.c

(read_successor_candidate_revisions, read_successors_from_candidates):

Make ID and REVISIONS const.