Checkout Tools
  • last updated 1 hour ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Add doc strings to several locking-related functions and structures

in fs_base, fs_fs and fs_x.

  1. … 5 more files in changeset.
Convert the new multi-path lock and unlock functions to a callback API,

rename from _lock2 and _unlock2 to _lock_many and _unlock_many.

* subversion/include/svn_fs.h

(svn_fs_lock_result_t): Remove.

(svn_fs_lock_callback_t):

(svn_fs_lock2): Rename to...

(svn_fs_lock_many): ...this, change to callback API.

(svn_fs_unlock2): Rename to...

(svn_fs_unlock_many): ...this, change to callback API.

* subversion/include/svn_repos.h

(svn_repos_fs_lock2): Rename to...

(svn_repos_fs_lock_many): ...this, change to callback API.

(svn_repos_fs_unlock2): Rename to...

(svn_repos_fs_unlock_many): ...this, change to callback API.

* subversion/libsvn_fs/fs-loader.h

(struct fs_vtable_t): Change lock and unlock to callback API.

* subversion/libsvn_fs/fs-loader.c

(struct lock_many_baton_t, lock_many_cb): New.

(svn_fs_lock2): Rename to...

(svn_fs_lock_many): ...this, change to callback API.

(struct lock_baton_t, lock_cb): New.

(svn_fs_lock): Adapt to callback API.

(svn_fs_unlock2): Rename to...

(svn_fs_unlock_many): ...this, change to callback API.

(svn_fs_unlock): Adapt to callback API.

* subversion/libsvn_fs_fs/lock.h

* subversion/libsvn_fs_fs/lock.c

(svn_fs_fs__lock, svn_fs_fs__unlock): Change to callback API.

* subversion/libsvn_fs_base/lock.h

* subversion/libsvn_fs_base/lock.c

(svn_fs_base__lock, svn_fs_base__unlock): Change to callback API.

* subversion/libsvn_fs_x/lock.h

* subversion/libsvn_fs_x/lock.c

(svn_fs_x__lock, svn_fs_x__unlock): Change to callback API.

* subversion/libsvn_ra_local/ra_plugin.c

(deltify_etc): Adapt to callback API.

(struct lock_baton_t, lock_cb): New.

(svn_ra_local__lock, svn_ra_local__unlock): Adapt to callback API.

* subversion/libsvn_repos/fs-wrap.c

(struct lock_many_baton_t, lock_many_cb): New.

(svn_repos_fs_lock2): Rename to...

(svn_repos_fs_lock_many): ...this, change to callback API.

(struct lock_baton_t, lock_cb): New.

(svn_repos_fs_lock): Adapt to callback API.

(svn_repos_fs_unlock2): Rename to...

(svn_repos_fs_unlock_many): ...this, change to callback API.

(svn_repos_fs_unlock): Adapt to callback API.

* subversion/mod_dav_svn/version.c

(unlock_many_cb): New.

(release_locks): Adapt to callback API.

* subversion/svnserve/serve.c

(write_lock): Make parameter const.

(lock_cb): New.

(unlock_paths): Adapt to callback API.

(struct lock_result_t, struct lock_many_baton_t, lock_many_cb): New.

(clear_lock_result_hash): New.

(lock_many, unlock_many): Adapt to callback API.

* subversion/tests/libsvn_fs/locks-test.c

(struct lock_result_t): New.

(expect_lock, expect_error, expect_unlock, expect_unlock_error): Change

to struct lock_result_t.

(struct lock_many_baton_t, lock_many_cb): New.

(lock_multiple_paths): Adapt to callback API.

* subversion/tests/libsvn_ra/ra-test.c

(struct lock_result_t): New.

(lock_cb, expect_lock, expect_error, expect_unlock, expect_unlock_error,

lock_test): Change to struct lock_result_t.

  1. … 15 more files in changeset.
Merge the fsfs-lock-many branch to trunk. This introduce multiple

path lock and unlock at the FS level and connects it up over ra_local

and ra_svn, and also uses it post-commit to release locks. A summary

of the branch changes:

* subversion/include/svn_fs.h

(svn_fs_lock_target_t, svn_fs_lock_result_t,

svn_fs_lock2, svn_fs_unlock2): new.

* subversion/include/svn_repos.h

(svn_repos_fs_lock2, svn_repos_fs_unlock2): new.

* subversion/include/svn_error.h

(SVN_ERR_IS_LOCK_ERROR, SVN_ERR_IS_UNLOCK_ERROR): Add pre- hook errors.

* subversion/libsvn_fs/fs-loader.c

(svn_fs_lock2, svn_fs_unlock2): New.

* subversion/libsvn_fs/fs-loader.h

(fs_vtable_t): Change lock and unlock parameters.

* subversion/libsvn_fs_fs/lock.c

* subversion/libsvn_fs_x/lock.c

(svn_fs_fs__lock, svn_fs_fs__unlock): New multiple path implementation.

* subversion/libsvn_fs_base/lock.c

(svn_fs_base__lock, svn_fs_base__unlock): Iterate over paths.

* subversion/libsvn_fs_fs/lock.h

(svn_fs_fs__lock, svn_fs_fs__unlock): Change parameters.

* subversion/libsvn_fs_x/lock.h

(svn_fs_x__lock, svn_fs_x__unlock): Change parameters.

* subversion/libsvn_fs_base/lock.h

(svn_fs_base__lock, svn_fs_base__unlock): Change parameters.

* subversion/libsvn_repos/fs-wrap.c

(svn_repos_fs_lock2, svn_repos_fs_unlock2): New.

* subversion/libsvn_repos/repos.c

(SVN_REPOS__HOOK_POST_LOCK, SVN_REPOS__HOOK_POST_UNLOCK): Tweak hook

template text.

* subversion/libsvn_ra_local/ra_plugin.c

(deltify_etc, svn_ra_local__lock, svn_ra_local__unlock): Use new API.

* subversion/mod_dav_svn/version.c

(release_locks): Use new API.

* subversion/svnserve/serve.c

(unlock_paths, lock_many, unlock_many): Use new API.

* subversion/libsvn_subr/log.c

* subversion/libsvn_fs_fs/lock.h

(svn_fs_fs__lock, svn_fs_fs__unlock,

svn_log__lock_one_path, svn_log__unlock_one_path): Change parameter.

* subversion/libsvn_client/locking_commands.c

(store_locks_callback): Tweak error handling.

* subversion/tests/libsvn_fs/locks-test.c

(lock_multiple_paths): New test.

* subversion/tests/libsvn_ra/ra-test.c

(lock_test): New test.

* subversion/tests/cmdline/authz_tests.py

(authz_locking): Tweak expectations.

* subversion/tests/cmdline/lock_tests.py

(block_unlock_if_pre_unlock_hook_fails, lock_hook_messages): Tweak

expectations.

(failing_post_hooks): New.

  1. … 26 more files in changeset.
Finish issue #3661: RA get-locks inefficiencies.

Add depth support to the process of querying repository locks in the

repository and RA layers for the sake of performance. Prior to this

change, 'svn ls -v SOME_PATH' (non-recursive) asked the repository for

the locks on all paths in and under SOME_PATH (fully recursive),

resulting in potentially far more information being transmitted across

the network than is necessary.

* subversion/include/svn_fs.h

(svn_fs_get_locks2): New.

(svn_fs_get_locks): Deprecate this.

* subversion/libsvn_fs/fs-loader.h

(fs_vtable_t): Add 'depth' to get_locks() vtable function.

* subversion/libsvn_fs/fs-loader.c

(svn_fs_get_locks2): New.

(svn_fs_get_locks): Make this just a wrapper around svn_fs_get_locks2().

* subversion/libsvn_fs_base/lock.h

(svn_fs_base__get_locks): Add 'depth' parameter.

* subversion/libsvn_fs_base/lock.c

(struct locks_get_args): Add 'depth' member.

(svn_fs_base__allow_locked_operation, txn_body_get_locks): Update

call to svn_fs_bdb__locks_get().

(svn_fs_base__get_locks): Add 'depth' parameter, used to populate

new baton member.

* subversion/libsvn_fs_base/bdb/locks-table.h

(svn_fs_bdb__locks_get): Add 'depth' parameter.

* subversion/libsvn_fs_base/bdb/locks-table.c

(svn_fs_bdb__locks_get): Add 'depth' parameter, and use it to filter

the reported depths.

* subversion/libsvn_fs_fs/lock.h

(svn_fs_fs__get_locks): Add 'depth' paramater.

* subversion/libsvn_fs_fs/lock.c

(get_locks_filter_baton_t): New baton structure.

(get_locks_filter_func): New callback wrapper function.

(svn_fs_fs__get_locks): Add 'depth' paramater, and employ the

get_locks_filter_func and baton when calling walk_digest_files().

* subversion/include/svn_repos.h

(svn_repos_fs_get_locks2): New revision of svn_repos_fs_get_locks()

which adds support for a specified 'depth'.

(svn_repos_fs_get_locks): Deprecate this.

* subversion/libsvn_repos/fs-wrap.c

(svn_repos_fs_get_locks2): Was svn_repos_fs_get_locks(). Now calls

svn_fs_get_locks2().

(svn_repos_fs_get_locks): Make this just a wrapper around

svn_repos_fs_get_locks2(), now.

* subversion/mod_dav_svn/reports/get-locks.c

(dav_svn__get_locks_report): Look for new (optional) depth

parameter, and use it to drive what's now a call to

svn_repos_fs_get_locks2().

* build.conf

(svnserve): Add dependency on libsvn_ra.

* subversion/svnserve/serve.c

(get_locks): Look for optional depth in the get-locks request, and

use it in what is now a call to svn_repos_fs_get_locks2().

* subversion/include/svn_ra.h

(svn_ra_get_locks2): New flavor of svn_ra_get_lock(), this time with

depth support.

(svn_ra_get_lock): Deprecate.

* subversion/libsvn_ra/ra_loader.h

(svn_ra__vtable_t): Add 'depth' parameter to 'get_locks' function.

* subversion/libsvn_ra/ra_loader.c

(svn_ra_get_locks2): New.

(svn_ra_get_locks): Make this just a wrapper around

svn_ra_get_locks2().

* subversion/libsvn_ra_local/ra_plugin.c

(svn_ra_local__get_locks): Add 'depth' parameter, and now use

svn_repos_fs_get_locks2().

* subversion/libsvn_ra_neon/ra_neon.h

(svn_ra_neon__get_locks): Add 'depth' parameter.

* subversion/libsvn_ra_neon/get_locks.c

(get_locks_baton_t): Add 'path' and 'requested_depth' members.

(getlocks_end_element): Filter unwanted locks out of the hash.

(svn_ra_neon__get_locks): Add 'depth' parameter, embed it into the

get-locks request, and populate the new baton members.

* subversion/libsvn_ra_serf/ra_serf.h

(svn_ra_serf__get_locks): Add 'depth' parameter.

* subversion/libsvn_ra_serf/getlocks.c

(lock_context_t): Add 'path' and 'requested_depth' members.

(end_getlocks): Filter unwanted locks out of the hash.

(create_getlocks_body): Stuff depth value from baton into the

request body.

(svn_ra_serf__get_locks): Add 'depth' parameter,

* subversion/libsvn_ra_svn/client.c

(ra_svn_get_locks): Add 'depth' parameter, and pass it to the server

in case the server can make use of it. Also, filter out unwanted

locks (returned by servers that *can't* make use of it).

* subversion/libsvn_client/list.c

(svn_client_list2): Now use svn_ra_get_locks2(), passing depth along.

  1. … 23 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.
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.
Channeling Erik Hülsmann, remove all trailing whitespace within our source

tree:

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

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

done

Inspired by: ehu

  1. … 449 more files in changeset.
Reformat the code to use a consistent no-space-before-param-list-paren style.

See here for the vote that decided this:

http://subversion.tigris.org/servlets/ReadMsg?list=dev&msgNo=111877

From: "Peter N. Lundblad" <peter@famlundblad.se>

To: "Peter N. Lundblad" <peter@famlundblad.se>

cc: dev@subversion.tigris.org

Subject: Results of: [VOTE] New space-before-parens style

Date: Wed, 8 Feb 2006 12:00:35 +0100 (CET)

Message-ID: <Pine.LNX.4.55.0602080918350.10805@localhost.localdomain>

I took the opportunity to make spacing among all parens in SVN_ERR

macro calls consistent. But I did not address consistency of casts,

nor whether a function name should always appear below its return type

in declarations and definitions, nor whether there should be a space

before/after the "*" when declaring pointer return types.

* www/hacking.html

(coding-style): Document that we are no-space-before-paren now.

* everywhere: Reformat.

  1. … 365 more files in changeset.
Fix major autoversioning interoperability bug.

Propagate the svn_lock_t 'xml_comment' boolean field into

svn_fs_lock() and svn_repos_fs_lock() APIs, rather than dropping it

into the ether. While we're at it, rename the boolean to something

more understandable.

This fixes a large autoversioning bug. Because the boolean was always

being written to disk as '0', mod_dav_svn was assuming (upon fetching

locks) that every lock-comment was created by a subversion client.

This caused it to return garbage values back to generic DAV clients.

Bug detected/fixed with cmpilato and fitz.

* subversion/include/svn_types.h

(svn_lock_t): rename 'xml_comment' to 'dav_comment' for clarity.

* subversion/include/svn_fs.h

(svn_fs_lock): take new 'is_dav_comment' boolean arg.

* subversion/include/svn_repos.h

(svn_repos_fs_lock): take new 'is_dav_comment' boolean arg.

* subversion/libsvn_fs/fs-loader.h

(fs_vtable_t): add boolean to vtable->lock().

* subversion/libsvn_repos/fs-wrap.c

(svn_repos_fs_lock): pass new boolean to svn_fs_lock().

* subversion/libsvn_fs/fs-loader.c

(svn_fs_lock): pass new boolean argument to vtable func.

* subversion/libsvn_fs_base/lock.h

(svn_fs_base__lock): take new boolean arg.

* subversion/libsvn_fs_base/lock.c

(struct lock_args, svn_fs_base__lock, txn_body_lock): take new

boolean arg and make use of it.

* subversion/libsvn_fs_base/util/fs_skels.c

(svn_fs_base__unparse_lock_skel, svn_fs_base__parse_lock_skel):

update other users of svn_lock_t to use boolean's new name.

* subversion/libsvn_fs_fs/lock.h

(svn_fs_fs__lock): take new boolean arg.

* subversion/libsvn_fs_fs/lock.c

(IS_DAV_COMMENT_KEY): renamed from IS_XML_COMMENT_KEY.

(write_digest_file, read_digest_file): update callers to use new key name.

(struct lock_baton, svn_fs_fs__lock, lock_body): take new boolean

arg and make use of it.

* subversion/libsvn_ra_local/ra_plugin.c

(svn_ra_local__lock): pass 0 as new argument to svn_repos_fs_lock().

* subversion/svnserve/serve.c

(lock): pass 0 as new argument to svn_repos_fs_lock().

* subversion/mod_dav_svn/lock.c

(svn_lock_to_dav_lock, dav_lock_to_svn_lock): update other users of

svn_lock_t to use boolean's new name.

(dav_svn_append_locks, dav_svn_refresh_locks): pass the boolean

argument into svn_repos_fs_lock().

* subversion/tests/libsvn_fs/locks-test.c

(lock_only, lookup_lock_by_path, attach_lock, get_locks, basic_lock,

lock_credentials, final_lock_check, lock_dir_propchange,

lock_name_reservation, directory_locks_kinda, lock_expiration,

lock_break_steal_refresh, lock_out_of_date):

pass 0 as new argument to svn_fs_lock().

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

(rmlocks): pass 0 as new argument to svn_fs_lock().

  1. … 15 more files in changeset.
Drop "timeout" from the public locking API, in favor of

"expiration_date", matching both our internal storage semantics and

the semantics of the only known users of expiring locks (DAV).

* subversion/include/svn_fs.h

(svn_fs_lock): Lose 'timeout'; add 'expiration_date' instead.

* subversion/include/svn_repos.h,

* subversion/libsvn_repos/fs-wrap.c

(svn_repos_fs_lock): Lose 'timeout'; add 'expiration_date' instead.

* subversion/libsvn_fs/fs-loader.c

(svn_fs_lock): Lose 'timeout'; add 'expiration_date' instead.

* subversion/libsvn_fs/fs-loader.h

(fs_vtable_t): Update 'lock' function match the public API calling

discipline.

* subversion/libsvn_fs_fs/lock.h

(svn_fs_fs__lock): Update to match public API calling discipline.

* subversion/libsvn_fs_fs/lock.c

(lock_baton): Lose 'timeout' member; add 'expiration_date' instead.

(lock_body): Set the expiration date without any arithmetricks.

(svn_fs_fs__lock): Update to match public API calling discipline.

* subversion/libsvn_fs_base/lock.h

(svn_fs_base__lock): Update to match public API calling discipline.

* subversion/libsvn_fs_base/lock.c

(struct lock_args): Lose 'timeout' member; add 'expiration_date' instead.

(txn_body_lock): Set the expiration date without any arithmetricks.

(svn_fs_base__lock): Update to match public API calling discipline.

* subversion/libsvn_ra_local/ra_plugin.c

(svn_ra_local__lock): Update comment in call to svn_repos_fs_lock().

* subversion/mod_dav_svn/lock.c

(dav_lock_to_svn_lock): Don't count on DAV_TIMEOUT_INFINITE == 0;

its abstracted away for a reason.

(dav_svn_refresh_locks): Handle the DAV_TIMEOUT_INFINITE case.

(dav_svn_append_locks): Just use the lock expiration date directly.

* subversion/tests/libsvn_fs/locks-test.c

(attach_lock, lock_expiration, lock_break_steal_refresh, lock_out_of_date):

Update calls to svn_fs_lock().

  1. … 11 more files in changeset.
Minor API and documentation cleanups -- no logic changes.

* subversion/include/svn_repos.h

(svn_repos_fs_get_locks): Docstring fixes.

(svn_repos_fs_lock): Make 'timeout' a regular 'int' instead of a

'long int'. Rename 'force' to 'steal_lock'.

(svn_repos_fs_unlock): Rename 'force' to 'break_lock'.

* subversion/libsvn_repos/fs-wrap.c

(svn_repos_lock): Make 'timeout' a regular 'int' instead of a 'long

int'. Rename 'force' to 'steal_lock'.

(svn_repos_unlock): Rename 'force' to 'break_lock'.

* subversion/include/svn_fs.h

(svn_repos_lock): Make 'timeout' a regular 'int' instead of a 'long

int'. Rename 'force' to 'steal_lock'.

(svn_repos_unlock): Rename 'force' to 'break_lock'.

* subversion/libsvn_fs/fs-loader.h

(fs_vtable_t): Update 'lock' and 'unlock' vtable items to match the

relevant public APIs.

* subversion/libsvn_fs/fs-loader.c

(svn_fs_lock, svn_fs_unlock): Track changes in the public API.

* subversion/libsvn_fs_fs/lock.h

(svn_fs_fs__lock): Make 'timeout' a regular 'int' instead of a 'long

int'. Rename 'force' to 'steal_lock'.

(svn_fs_fs__unlock): Rename 'force' to 'break_lock'.

* subversion/libsvn_fs_fs/lock.c

(svn_fs_fs__lock, svn_fs_fs__unlock): Track changes to the public API.

* subversion/libsvn_fs_base/lock.h

(svn_fs_base__lock): Make 'timeout' a regular 'int' instead of a

'long int'. Rename 'force' to 'steal_lock'.

(svn_fs_base__unlock): Rename 'force' to 'break_lock'.

* subversion/libsvn_fs_base/lock.c

(struct lock_args): Make 'timeout' a regular 'int' instead of a

'long int'. Rename 'force' to 'steal_lock'.

(struct unlock_args): Rename 'force' to 'break_lock'.

(txn_body_lock, txn_body_unlock): Track changes to the trail baton.

(svn_fs_base__lock, svn_fs_base__unlock): Track changes to the

public API and trail baton.

* subversion/notes/TODO-1.2-foad.txt

Remove completed TODO items.

  1. … 9 more files in changeset.
Merge the functionalities of svn_fs_attach_lock() and svn_fs_lock()

into a single function (svn_fs_lock).

* subversion/include/svn_fs.h

(svn_fs_lock): Add (optional) 'token' parameter, and move the

'force' parameter closer to the end.

(svn_fs_attach_lock): Remove.

* subversion/libsvn_fs/fs-loader.h

(fs_vtable_t): Lose 'attach_lock'. Tweak 'lock' param list to match

svn_fs_lock().

* subversion/libsvn_fs/fs-loader.c

(svn_fs_lock): Add 'token' parameter, and move the 'force' parameter

closer to the end. Update call to vtable functions.

(svn_fs_attach_lock): Remove.

* subversion/libsvn_fs_fs/fs.c

(fs_vtable): Lose reference to svn_fs_fs__attach_lock().

* subversion/libsvn_fs_fs/lock.h

(svn_fs_fs__lock): Add 'token' parameter, and move the 'force'

parameter closer to the end.

(svn_fs_fs__attach_lock): Remove.

* subversion/libsvn_fs_fs/lock.c

(generate_new_lock): Remove.

(svn_fs_fs__lock): Add 'token' parameter, and move the 'force'

parameter closer to the end. Eat up generate_new_lock's

functionality. Also, leave a big TODO here for verifying the

legitimacy of a non-NULL input token.

(svn_fs_fs__attach_lock): Remove.

* subversion/libsvn_fs_base/fs.c

(fs_vtable): Lose reference to svn_fs_base__attach_lock().

* subversion/libsvn_fs_base/lock.h

(svn_fs_base__lock): Add 'token' parameter, and move the 'force'

parameter closer to the end.

(svn_fs_base__attach_lock): Remove.

* subversion/libsvn_fs_base/lock.c

(generate_new_lock): Remove.

(struct lock_args): Add 'token' member.

(txn_body_lock): If present, use baton's token as the lock token.

(svn_fs_base__lock): Add 'token' parameter, and move the 'force'

parameter closer to the end. Populate new 'token' baton member.

(struct attach_lock_args, txn_body_attach_lock,

svn_fs_base__attach_lock): Remove.

* subversion/include/svn_repos.h

(svn_repos_fs_attach_lock): Remove.

(svn_repos_fs_lock): Add 'token' parameter, and move the 'force'

parameter closer to the end.

* subversion/libsvn_repos/fs-wrap.c

(svn_repos_fs_lock): Add 'token' parameter, and move the 'force'

parameter closer to the end.

(svn_repos_fs_attach_lock): Remove.

* subversion/libsvn_ra_local/ra_plugin.c

(svn_ra_local__lock): Update call to svn_repos_fs_lock().

* subversion/svnserve/serve.c

(lock): Update call to svn_repos_fs_lock().

* subversion/mod_dav_svn/lock.c

(dav_svn_append_locks, dav_svn_refresh_locks): Use

svn_repos_fs_lock() instead of svn_repos_fs_attach_lock(). Also,

fix a bug where a lock timeout was being used as an expiration date.

* subversion/tests/libsvn_fs/locks-test.c

(lock_only, lookup_lock_by_path, get_locks, basic_lock,

lock_credentials, final_lock_check, lock_dir_propchange,

lock_name_reservation, directory_locks_kinda, lock_expiration,

lock_break_steal_refresh, lock_out_of_date): Update calls to

svn_fs_lock(), and use it instead of svn_fs_attach_lock(). Also,

use TRUE/FALSE instead of 1/0 for the boolean 'force' flag.

(attach_lock): Use svn_fs_lock() instead of svn_fs_attach_lock().

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

(rmlocks): Update calls to svn_fs_lock().

  1. … 15 more files in changeset.
Rename svn_fs_generate_token() to svn_fs_generate_lock_token().

* subversion/include/svn_fs.h

(svn_fs_generate_lock_token): Was svn_fs_generate_token().

* subversion/libsvn_fs/fs-loader.c

(svn_fs_generate_lock_token): Was svn_fs_generate_token().

* subversion/libsvn_fs/fs-loader.h

(fs_vtable_t): Rename 'generate_token' to 'generate_lock_token'.

* subversion/libsvn_fs_fs/fs.c

(fs_vtable): Refer to svn_fs_fs__generate_lock_token() instead of

svn_fs_fs__generate_token().

* subversion/libsvn_fs_base/fs.c

(fs_vtable): Refer to svn_fs_base__generate_lock_token() instead of

svn_fs_base__generate_token().

* subversion/libsvn_fs_base/lock.h,

* subversion/libsvn_fs_base/lock.c

(generate_new_lock): Update call to svn_fs_base__generate_lock_token().

(svn_fs_base__generate_lock_token): Was svn_fs_base__generate_token().

* subversion/libsvn_fs_fs/lock.h,

* subversion/libsvn_fs_fs/lock.c

(generate_new_lock): Update call to svn_fs_fs__generate_lock_token().

(svn_fs_fs__generate_lock_token): Was svn_fs_fs__generate_token().

* subversion/mod_dav_svn/lock.c

(dav_svn_create_lock): Update calls to svn_fs_generate_lock_token().

  1. … 9 more files in changeset.
Switch order of the 'fs'/'repos' and 'lock' parameters of

svn_fs_attach_lock() and svn_repos_fs_attach_lock() to comply with

conventions.

* subversion/include/svn_fs.h,

* subversion/libsvn_fs/fs-loader.c

(svn_fs_attach_lock): Tweak order of params to make 'fs' first.

Callers changed.

* subversion/include/svn_repos.h,

* subversion/libsvn_repos/fs-wrap.c

(svn_repos_fs_attach_lock): Tweak order of params to make 'fs' first.

Callers changed.

* subversion/libsvn_fs/fs-loader.h

(fs_vtable_t): Tweak param order in 'attach_lock' vtable function.

* subversion/libsvn_fs_fs/lock.h,

* subversion/libsvn_fs_fs/lock.c

(svn_fs_fs__attach_lock): Tweak order of params to make 'fs' first.

Callers changed.

* subversion/libsvn_fs_base/lock.h,

* subversion/libsvn_fs_base/lock.c

(svn_fs_base__attach_lock): Tweak order of params to make 'fs' first.

Callers changed.

* subversion/mod_dav_svn/lock.c

(dav_svn_append_locks, dav_svn_refresh_locks): Update calls to

svn_repos_fs_attach_lock().

* subversion/tests/libsvn_fs/locks-test.c

(attach_lock, lock_break_steal_refresh, lock_out_of_date): Update

calls to svn_fs_attach_lock().

  1. … 10 more files in changeset.
Merge locking branch to trunk, by comparing trunkURL with branchURL.

This is not a test. This is an actual addition of a very large feature.

This merge passes 'make check' over all three RA implementations.

To see commit logs for this feature, examine /branches/locking, r11749:13570.

  1. … 183 more files in changeset.