subversion

Checkout Tools
  • last updated 6 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates

Changeset 1852526 is being indexed.

Make the editor path driver callback a little easier to use.

Add 'editor' and 'edit_baton' parameters to the path driver callback. All

but trivial callback implementations need these, and they otherwise had to

be passed through the callback baton, which was straightforward but more

trouble than it need be.

* subversion/include/svn_delta.h

(svn_delta_path_driver_cb_func2_t,

svn_delta_path_driver3): New.

* subversion/libsvn_delta/path_driver.c

(svn_delta_path_driver3): Rename from 'svn_delta_path_driver2'.

(svn_delta_path_driver_state_t,

svn_delta_path_driver_start): Change the callback function type.

(svn_delta_path_driver_step): Pass the extra parameters.

* subversion/libsvn_delta/deprecated.c

(path_driver_2_to_3_baton_t,

path_driver_2_to_3_func,

svn_delta_path_driver2): New.

* subversion/libsvn_client/shelf.c

(path_driver_cb_func): Take 'editor' and 'edit_baton' as direct parameters.

(path_driver_cb_baton_t,

svn_client__shelf_replay): Remove them from the path driver baton.

* subversion/include/svn_delta.h (svn_delta_path_driver_cb_func_t): Improve docs.
* STATUS: Nominate r1852436.

* STATUS: Nominate r1852436.

* STATUS: Nominate r1852436.

Make 'svn update' not record a tree conflict when deleting an unmodified

directory which happens to contain unversioned items. Instead, just leave

the unversioned items behind on disk when deleting the unmodified directory,

which matches the behaviour of Subversion 1.8.

Prompted by a question on users@:

https://svn.haxx.se/users/archive-2019-01/0060.shtml

* subversion/libsvn_wc/update_editor.c

(check_tree_conflict): Ignore unversioned items during check for local mods.

This prevents a tree conflict from being recorded.

* subversion/tests/cmdline/switch_tests.py

(tolerate_local_mods): Don't expect an unversioned item to cause a tree

conflict. Add the item to version control instead to meet this test's

expectations.

* subversion/tests/cmdline/update_tests.py

(update_keeps_unversioned_items_in_deleted_dir, test_list): New test

which ensures that update will leave unversioned items on disk when

deleting an unmodified directory.

* CHANGES: Retroactively add date of 1.11.1, 1.10.4, and 1.9.10 releases.

Make the new shelf-replay-to-delta-editor API public (experimental).

* subversion/include/svn_client.h,

subversion/libsvn_client/shelf.c

(svn_client__shelf_apply): Rename from 'shelf_replay' and make public.

* subversion/libsvn_client/shelf.c (shelf_name_from_filename): Use consistent data types.
* subversion/libsvn_client/shelf.c (path_driver_cb_func): Fix the build, following r1852382.
* subversion/libsvn_client/shelf.c

(path_driver_cb_func): Always initialize the 'dir baton' output parameter,

as other implementations of this callback type do, even though driver

may not require it.

Fix a regression in the svn_delta_path_driver2().

Introduced in r1851738.

* subversion/libsvn_delta/path_driver.c

(svn_delta_path_driver_step): Restore predictable behaviour for callbacks

that don't set the 'dir baton' output parameter.

Fix 'unshelve' of property mods.

Found by: stsp

* subversion/libsvn_client/shelf.c

(path_driver_cb_func): Open the correct directory before trying to apply

its property mods. Fix other doc strings too.

In the WC-mods-editor: fix properties handling; simplify.

Handle property changes correctly. Previously, property deletions were

ignored.

Simplify by applying incoming changes as they arrive. Previously we were

batching up some changes such as property changes and creating new files and

dirs, which could be more efficient but is harder to get right, as evidenced

by the above bug fix.

Simplify by not managing subpools for the directory and file batons. The

edit driver should do that.

* subversion/libsvn_client/wc_editor.c

(mkdir,

mkfile): New.

(dir_baton_t,

dir_open_or_add,

edit_open,

dir_open,

file_baton_t,

file_open_or_add,

file_open): Don't track the 'created' state and properties here.

(dir_add,

file_add): Always create the versioned node here.

(dir_change_prop,

file_change_prop): Always apply property changes here.

(dir_close,

file_close): Never create nodes and apply property changes here.

(ensure_added_dir,

ensure_added_file): Delete.

* subversion/include/svn_delta.h (svn_delta_editor_t): Fix param name in docs.
Remove internal pool management from the WC editor.

The path driver, which wraps this editor, already provides a result pool

hierarchy. This can be used by the WC editor instead of having it manage

another such hierarchy internally.

Review by: julianfoad

* subversion/libsvn_client/wc_editor.c

(edit_baton_t, svn_client__wc_editor_internal): Remove local pool.

(dir_baton_t) Remove the local pool users counter.

(dir_open_or_add, edit_open, dir_open, dir_add, dir_change_prop,

file_open_or_add, file_add): Allocate results in result_pool provided

by the caller, i.e. the path driver.

(file_close, maybe_done): Remove maybe_done() helper which is now unused.

* STATUS: Vote +1 on r1850651.
* STATUS: Vote +1 on r1850651.
* STATUS: Vote +1 on r1850651.
Tweaks in the WC mods editor, issue SVN-4786.

* subversion/libsvn_client/wc_editor.c

(dir_open_or_add): Support opening the root dir. Move higher up.

(edit_open): Use dir_open_or_add.

(dir_open, dir_add): Adjust callers.

(dir_change_prop, file_change_prop): Shorten slightly.

(ensure_added_dir): Rename from 'ensure_added', and update callers.

* CHANGES: Catch-up merge from trunk.
* CHANGES: Catch-up merge from trunk.
* 1.9.x/STATUS, 1.10.x/STATUS, 1.11.x/STATUS: Nominate r1852013.

* CHANGES: Mention CVE-2018-11803 fixed in 1.10.4, 1.11.1.
Fix issue #4804: avoid test failures just because some SQLite compile-time

feature was enabled that changes its query plan descriptions.

* subversion/tests/libsvn_wc/wc-queries-test.c

(test_query_expectations): Mostly ignore the sqlite_master table.

Found by: Thomas Deutschmann

* STATUS: Vote for issue #4802.
* STATUS: Vote for issue #4802.
* CHANGES: Not storing passwords on disk by default is a user-visible

change, so move this item to a more appropriate section.

* CHANGES: Mention that 'move vs. move' merge conflicts can now be resolved.

* STATUS: Nominate r1851920.