subversion

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

Changeset 1360909 is being indexed.

On the inheritable-props branch: Sync with ^/subversion/trunk through

r1360860.

    • ?
    /branches/inheritable-props/subversion/libsvn_wc/props.h
  1. … 107 more files in changeset.
On the inheritable-props branch: Simplify the iprop schema changes by

moving the iprop cache from its own dedicated table into the nodes table.

* subversion/include/private/svn_skel.h

(svn_skel__parse_iprops,

svn_skel__unparse_iproplist): New.

* subversion/include/private/svn_sqlite.h

(svn_sqlite__bind_iprops,

svn_sqlite__column_iprops): New.

* subversion/include/private/svn_wc_private.h

(svn_wc__cache_iprops): Doc string tweak.

(svn_wc__delete_iprops): Remove.

* subversion/libsvn_client/iprops.c

(svn_client__update_inheritable_props): Remove call to

svn_wc__delete_iprops.

* subversion/libsvn_subr/skel.c

(svn_props.h

svn_pools.h): New includes.

(is_valid_iproplist_skel,

svn_skel__parse_iprops,

svn_skel__unparse_iproplist): New.

* subversion/libsvn_subr/sqlite.c

(svn_sqlite__bind_iprops,

svn_sqlite__column_iprops): New.

* subversion/libsvn_wc/props.c

(svn_wc__cache_iprops): Update call to svn_wc__db_cache_iprops.

(svn_wc__delete_iprops): Remove.

* subversion/libsvn_wc/wc-metadata.sql

(STMT_CREATE_NODES): Add INHERITED_PROPS blob.

(STMT_CREATE_INHERITABLE_PROPS): Remove.

* subversion/libsvn_wc/wc-queries.sql

(STMT_SELECT_IPROPS,

STMT_INSERT_IPROP,

STMT_SELECT_INODES,

STMT_SELECT_INODES_RECURSIVE): Adjust to target nodes table rather than

the defunct INHERITED_PROPS table.

(STMT_DELETE_IPROPS_RECURSIVE,

STMT_DELETE_IPROPS): Remove.

* subversion/libsvn_wc/wc_db.c

(create_db): Don't execute defunct STMT_CREATE_INHERITABLE_PROPS.

(db_base_remove): Remove STMT_DELETE_IPROPS statement.

(remove_node_txn): Remove STMT_DELETE_IPROPS_RECURSIVE statement.

(svn_wc__db_read_cached_iprops): Update to reflect changes to

STMT_SELECT_IPROPS.

(svn_wc__db_cache_iprops): Update to reflect changes to

STMT_INSERT_IPROP.

* subversion/libsvn_wc/wc_db.h

(svn_wc__db_cache_iprops): Tweak to take an array of

svn_prop_inherited_item_t structures rather than a repos path/prop hash

pair.

(svn_wc__db_remove_cached_iprops): Remove.

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

(TESTING_DATA): Insert null values into the new inherited_props column.

* subversion/tests/libsvn_wc/entries-compat.c

(TESTING_DATA,

M_TESTING_DATA): Insert null values into the new inherited_props column.

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

(schema_statements): Remove STMT_CREATE_INHERITABLE_PROPS.

* subversion/tests/cmdline/commit_tests.py

(commit_moved_dir_with_nested_mod_in_subdir): New (XFAIL) test for

issue #4203 - Commit of moved dir with modified file in dir/subdir

doesn't bump LastChangedRev of subdir in originating WC.

Make davautocheck.sh properly set the library load path on Mac OS X.

* subversion/tests/cmdline/davautocheck.sh: Use DYLD_LIBRARY_PATH instead

of LD_LIBRARY_PATH on Darwin.

* subversion/svn/log-cmd.c

(display_diff): remove unnecessary gettext invocation

Prevent path-handling related deprecation warnings. Since they happen

in code of functons that are deprecated themselves, we need a workaround

here: move the actual code to a static *_internal function and let

the public deprecated API as well as its users call that internal

(non-deprecated) function.

* subversion/libsvn_subr/deprecated.c

(svn_path_is_canonical): move from here to the next file

* subversion/libsvn_subr/path.c

(svn_path_is_canonical_internal,

svn_path_is_canonical): make the function body available internally

without deprecation warning

(svn_path_join_internal,

svn_path_join): do a similar split; call svn_path_is_canonical_internal

to prevent deprecation warnings

(svn_path_join_many,

svn_path_dirname,

svn_path_basename,

svn_path_decompose): call *_internal functions

Fix a number of deprecation warnings by switching to the latest API.

* subversion/libsvn_fs/fs-loader.c

(svn_fs_hotcopy_berkeley): use svn_fs_hotcopy2 instead of svn_fs_hotcopy

* subversion/libsvn_repos/dump.c

(store_delta): use svn_txdelta_to_svndiff3 instead of

svn_txdelta_to_svndiff2

* subversion/libsvn_repos/fs-wrap.c

(svn_repos_fs_get_mergeinfo): use svn_fs_get_mergeinfo2 instead of

svn_fs_get_mergeinfo

* subversion/libsvn_repos/repos.c

(svn_repos_has_capability): ditto

* subversion/mod_dav_svn/liveprops.c

(insert_prop_internal): fix long to int conversion warning

Doc-string only change.

* subversion/include/svn_path.h

(svn_path_join): there is no svn_uri_join to refer to

On the 'master-passphrase' branch: Further genericize the generic auth

storage interfaces to use credential hashes rather than specific

credential structures as their currency. This may revert in the

future, but for now it's necessary -- we currently store stuff in the

~/.subversion/auth/ area that isn't carried in the credential

structures (e.g., the "ascii_cert" bits).

* subversion/libsvn_subr/auth_store.h

(svn_auth__store_cb_get_cred_hash_t, svn_auth__store_cb_set_cred_hash_t):

Were svn_auth__store_cb_fetch_t and svn_auth__store_cb_store_t,

respectively. Now use hashes instead of void * pointers for their

primary currency.

(svn_auth__store_set_get_cred_hash, svn_auth__store_set_set_cred_hash):

Were svn_auth__store_set_fetch and svn_auth__store_set_store,

respectively.

(svn_auth__store_get_cred_hash, svn_auth__store_set_cred_hash): Were

svn_auth__store_fetch_creds and svn_auth__store_store_creds,

respectively. Now use hashes instead of void * pointers for their

primary currency.

(svn_auth__store_set_username_creds, svn_auth__store_set_simple_creds):

Add 'stored' return parameter.

* subversion/libsvn_subr/auth_store.c

(struct svn_auth__store_t): Update callback types/names per changes in

auth_store.h.

(svn_auth__store_set_get_cred_hash, svn_auth__store_set_set_cred_hash,

svn_auth__store_get_cred_hash, svn_auth__store_set_cred_hash):

Rework per the changes in the APIs.

(svn_auth__store_get_username_creds, svn_auth__store_set_username_creds,

svn_auth__store_get_simple_creds, svn_auth__store_set_simple_creds):

Implement these functions as utility wrappers.

* subversion/libsvn_subr/pathetic_auth_store.c

(svn_auth__pathetic_store_get): Update calls to modified APIs.

(pathetic_store_get_cred_hash, pathetic_store_set_cred_hash): Track

API changes.

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

(test_auth_store_get_set): Use svn_auth__store_set_username_creds()

instead of svn_auth__store_store_creds().

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

(test_follow_moved_to): Extend with a further case.

* subversion/libsvn_wc/wc_db.c

(struct revert_list_read_baton): Use pointer to const.

[Reverted in 1364665.]

Low-risk mass change:

All users of BDB_WRAP / svn_fs_bdb__wrap_db now use gettext macros

consistently ( from now on, use N_ ). Also, defer actual invocation

of gettext until we need the result (i.e. an actual error occurred).

* subversion/libsvn_fs_base/bdb/bdb-err.c

(svn_fs_bdb__wrap_db): take and untranslated message and translate it

when constructing an error message from it

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

(svn_fs_bdb__changes_add,

svn_fs_bdb__changes_delete,

svn_fs_bdb__changes_fetch,

svn_fs_bdb__changes_fetch_raw): update users

* subversion/libsvn_fs_base/bdb/checksum-reps-table.c

(svn_fs_bdb__set_checksum_rep,

svn_fs_bdb__delete_checksum_rep,

svn_fs_bdb__reserve_rep_reuse_id): update users

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

(put_copy,

svn_fs_bdb__reserve_copy_id,

svn_fs_bdb__delete_copy,

svn_fs_bdb__get_copy): update users

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

(svn_fs_bdb__lock_add,

svn_fs_bdb__lock_delete,

svn_fs_bdb__lock_get,

svn_fs_bdb__locks_get): update users

* subversion/libsvn_fs_base/bdb/lock-tokens-table.c

(svn_fs_bdb__lock_token_add,

svn_fs_bdb__lock_token_delete,

svn_fs_bdb__lock_token_get): update users

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

(svn_fs_bdb__miscellaneous_set,

svn_fs_bdb__miscellaneous_get): update users

* subversion/libsvn_fs_base/bdb/node-origins-table.c

(svn_fs_bdb__set_node_origin,

svn_fs_bdb__delete_node_origin): update users

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

(svn_fs_bdb__new_node_id,

svn_fs_bdb__delete_nodes_entry,

svn_fs_bdb__get_node_revision,

svn_fs_bdb__put_node_revision): update users

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

(svn_fs_bdb__read_rep,

svn_fs_bdb__write_rep,

svn_fs_bdb__write_new_rep,

svn_fs_bdb__delete_rep): update users

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

(svn_fs_bdb__get_rev,

svn_fs_bdb__put_rev,

svn_fs_bdb__youngest_rev): update users

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

(locate_key,

svn_fs_bdb__string_read,

get_key_and_bump,

svn_fs_bdb__string_append,

svn_fs_bdb__string_clear,

svn_fs_bdb__string_size,

svn_fs_bdb__string_delete,

svn_fs_bdb__string_copy): update users

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

(svn_fs_bdb__put_txn,

allocate_txn_id,

svn_fs_bdb__delete_txn,

svn_fs_bdb__get_txn,

svn_fs_bdb__get_txn_list): update users

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

(svn_fs_bdb__get_uuid,

svn_fs_bdb__set_uuid): update caller

On the ev2-export branch:

Bring up-to-date with trunk. Three tests fail.

    • ?
    /branches/ev2-export/contrib/server-side/fsfsverify.py
  1. … 193 more files in changeset.
Add test case for "symmetric" splitting of pack files.

* subversion/tests/libsvn_fs_fs/fs-pack-test.c

(large_log): former huge_log but with string size as parameter

(huge_log): implement in terms of large_log

(get_set_large_revprop_packed_fs): new test

(test_funcs): register new test

Follow-up to r1359753.

* subversion/libsvn_fs_fs/fs_fs.c

(write_packed_revprop): fix copy'n'pasto

Follow-up to r1359574.

* subversion/libsvn_fs_fs/fs_fs.c

(write_packed_revprop): remove ";" within statement, don't post-increment /

-decrement macro parameters

Found by: philip

On the 'master-passphrase' branch, remove some temporary code crutches.

* subversion/include/svn_auth.h

(SVN_AUTH_TEMP_USE_FAUX_PASSPHRASE, SVN_AUTH_TEMP_MASTER_PASSPHRASE):

Remove.

* subversion/libsvn_subr/masterpass.c

(svn_auth_master_passphrase_get): Remove logic branch associated

with SVN_AUTH_TEMP_USE_FAUX_PASSPHRASE #define.

* subversion/svn/changepassword-cmd.c

(svn_cl__changepassword): Remove logic branch associated with

SVN_AUTH_TEMP_USE_FAUX_PASSPHRASE #define.

On the 'master-passphrase' branch, begin exploring the idea of

cleanly abstracting away authn storage from the provider logic.

* subversion/libsvn_subr/auth_store.h

(svn_auth__store_cb_open_t, svn_auth__store_cb_close_t,

svn_auth__store_cb_delete_t, svn_auth__store_cb_fetch_t,

svn_auth__store_cb_store_t): New callback types.

(svn_auth__store_create, svn_auth__store_set_baton,

svn_auth__store_set_open, svn_auth__store_set_close,

svn_auth__store_set_delete, svn_auth__store_set_fetch,

svn_auth__store_set_store, svn_auth__store_fetch_creds,

svn_auth__store_store_creds): New functions.

(svn_auth__store_open, svn_auth__store_close, svn_auth__store_delete):

Recycle these functions names for new uses.

(svn_auth__pathetic_store_get, svn_auth__config_store_get): New functions.

* subversion/libsvn_subr/auth_store.c

New file with implementations of the generic functions defined in

auth_store.h.

* subversion/libsvn_subr/config_auth_store.c

New file implementing the current runtime-config-based auth store.

* subversion/libsvn_subr/pathetic_auth_store.c

Rework the contents of this file as an implementation of the generic

auth store framework.

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

(create_ephemeral_auth_store, test_auth_store_basic,

test_auth_store_get_set): Update to the new auth store interfaces.

In case of a property change causing the revprop pack file to overflow,

we should attempt an equal split of the pack file to mitigate fragmentation.

The previous code has been sub-optimal as it would always split before

and / or after the changed data - which could be close to one end of the pack.

* subversion/libsvn_fs_fs/fs_fs.c

(write_packed_revprop): rewrite pack file splitting strategy

* subversion/libsvn_fs_fs/fs_fs.c

(pack_body): use neat struct initializer instead of memset

Suggested by: danielsh

* subversion/libsvn_fs_fs/fs_fs.c

(get_and_increment_txn_key_body): Use baton pool for returned string.

* subversion/libsvn_fs_fs/fs_fs.c

(try_stringbuf_from_file): Following up on r1359142, just set *content to

NULL on any error.

* subversion/libsvn_fs_fs/fs_fs.c

(read_content): Following up on r1358375, don't make callers segfault when

we failed to read the file within the recovery limit, by at least returning

some error.

* subversion/libsvn_fs_fs/fs_fs.c

(try_stringbuf_from_file): Following up on r1358375, ensure that output

arguments are always set when we return SVN_NO_ERROR.

* site/publish/docs/release-notes/1.7.html

(per-repos-authz): s/Svn/svn/

* site/publish/docs/release-notes/1.7.html

(per-repos-authz): Add new block.

* subversion/libsvn_wc/wc_db.c

* subversion/libsvn_wc/wc_db.h

(svn_wc__db_op_copy_file): Rename parameter to avoid a compiler

warning about shadowing.

* subversion/tests/libsvn_fs_fs/fs-pack-test.c

(huge_log): Remove unused variable.

* subversion/libsvn_fs_fs/fs_fs.c

(recover_body): Add brackets to avoid compiler warning.