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

Changeset 873749 is being indexed.

* subversion/bindings/ctypes-python/

(get_apr_config): Include svn_auth_kwallet-1 and svn_auth_gnome_keyring-1

in list of libraries to load.

Fix the docstring of svn_fs_deltify_revision().

* subversion/include/svn_fs.h

(svn_fs_deltify_revision): Update docstring.

For tree conflicts, make the detailed "svn info" messages say "switch"

instead of "update" when the operation is a switch, rather than saying

"update" for both.

* subversion/svn/tree-conflicts.c

(tree_conflict_phrases): Add "switch" phrase fields.

(new_tree_conflict_phrases): Add "switch" phrases.

(select_their_phrase): Support "switch" phrases.

On the 'fs-rep-sharing' branch:

* subversion/libsvn_fs_base/notes/structure

Update to reflect that we now use SHA1 checksums (instead of MD5) for

the keys of the `checksum-reps' table.

Update SWIG interfaces to properly handle platform-specific auth providers.

* subversion/bindings/swig/core.i: Updated so that the generated core.c included

svn_private_config.h and used a macro to handle the wrapping of the

platform-specific auth functions in svn_auth.h

* subversion/bindings/swig/python/tests/

(test_conditional_auth_provider_support): New test.

* subversion/bindings/swig/include/svn_global.swg

(PLATFORM_SPECIFIC_WRAPPER): New SWIG macro which makes handling

platform-specific functions easier.

* subversion/bindings/swig/svn_client.i: Use a macro to handle the wrapping of

the Windows-specific auth function in svn_client.h.

* subversion/include/svn_client.h

(svn_client_get_windows_simple_provider): Expose to SWIG.

* subversion/include/svn_auth.h










svn_auth_get_kwallet_ssl_client_cert_pw_provider): Expose to SWIG.

On the fs-rep-sharing branch, merge outstanding changes (r33663-33669)

from trunk.

  1. … 12 more files in changeset.
* subversion/libsvn_fs_base/fs.c

(base_hotcopy): Hotcopy the new 'miscellaneous' table, too.

Rename the 'metadata' BDB database to 'miscellaneous' (to preserve the

nanofeature of having all those tables end with 's').

* subversion/libsvn_fs_base/tree.h,

* subversion/libsvn_fs_base/tree.c

Rename a gang of functions and structures, for which all

callers/consumers were updated:

struct metadata_set_args -> struct miscellaneous_set_args

txn_body_metadata_set() -> txn_body_miscellaneous_set

svn_fs_base__metadata_set() -> svn_fs_base__miscellaneous_set

struct metadata_get_args -> struct miscellaneous_get_args

txn_body_metadata_get() -> txn_body_miscellaneous_get

svn_fs_base__metadata_get() -> svn_fs_base__miscellaneous_get

* subversion/libsvn_fs_base/bdb/metadata-table.h,

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

Renamed to...

* subversion/libsvn_fs_base/bdb/miscellaneous-table.h,

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

...this. Also, rename the functions *within* the files (all callers

updated, too):

svn_fs_bdb__open_metadata_table -> svn_fs_bdb__open_miscellaneous_table

svn_fs_bdb__metadata_set -> svn_fs_bdb__miscellaneous_set

svn_fs_bdb__metadata_get -> svn_fs_bdb__miscellaneous_get

* subversion/libsvn_fs_base/notes/structure

Fix the BNF for the 'checksum-reps' table, and add such for the

'miscellaneous' table.

* subversion/libsvn_fs_base/fs.c

(cleanup_fs): Track renames of functions and #defines, and

expect/demand the new database file name.

* subversion/libsvn_fs_base/fs.h



(base_fs_data_t): Rename 'metadata' variable to 'miscellaneous'.

* subversion/libsvn_fs_base/err.h,

* subversion/libsvn_fs_base/err.c

(svn_fs_base__err_no_such_miscellany): Was

svn_fs_base__err_no_such_metadata, and now returns an error

message that refers to the new table name.

* subversion/include/svn_error_codes.h


On the fsfs-pack branch:

Further flesh out the packing abilities of FSFS.

* subversion/libsvn_fs_fs/fs_fs.c

(pack_shard): New stub.

(svn_fs_fs__pack): Figure out which shards are complete, and attempt to

pack them.

On the fsfs-pack branch:

Merge r33652 from the fs-rep-sharing branch (and hope that it works when we

merge back to trunk!)

This picks up the proper upgrade code which we'll need for upgrading

repositories on this branch as well.

    • ?
  1. /branches/fsfs-pack/subversion/libsvn_subr
    • ?
On the fs-rep-sharing branch:

Fix a bit of SQL.

Suggested by: gstein

* subversion/libsvn_fs_fs/rep-cache.c

(upgrade_sql): Give reuse_count column the integer type.

(svn_fs_fs__get_rep_reference, svn_fs_fs__set_rep_reference,

svn_fs_fs__inc_rep_reuse): Use number parameters.

On the fs-rep-sharing branch:

Fix a compiler warning, introduced by the r33501 merge from trunk.

Found, Suggested, Reviewed, and Autographed by: cmpilato

* subversion/libsvn_fs_base/util/fs_skels.c

(svn_fs_base__parse_representation_skel): Cast a function argument to make

the compiler happy.

On the fs-rep-sharing branch:

Bring up-to-date with trunk. This specifically pulls r33661, which contains

fixes for SQLite.

  1. … 11 more files in changeset.
Fix several segfaults in the ctypes python bindings by fixing pool usage

bugs and other typos.

[ In subversion/bindings/ctypes-python/csvn ]


(RemoteRepos._log_func_wrapper): Typo fix for tmp_file parameter.

(RemoteRepos.svnimport): Return commit info in its own pool so that

it doesn't get deleted before the function exits.


(WC.commit): Ditto.

(WC.copy, WC.move, WC.delete): Pass commit info object into

function instead of NULL pointer, per API spec.

(WC._notify_func_wrapper, WC._status_wrapper, WC._info_wrapper,

WC._list_wrapper): Copy arguments into dedicated pool

to ensure it doesn't get deleted.


(Hash.__init__, Hash.__setitem__) Typo fix so items are actually

copied into local pool, as they should be.

Followup to r33540 by fixing our SQLite initialization order.

* subversion/libsvn_subr/sqlite.c

(init_sqlite): Per the sqlite docs, call sqlite3_initialize() after


* notes/http-protocol-v2.txt: evolve this a bit more.
Fix issue #3236, "plaintext-passwords assumes pools live across RA sessions".

Revert API requirements introduced on the

dont-save-plaintext-passwords-by-default branch in r30800.

* subversion/libsvn_subr/ssl_client_cert_pw_providers.c

(svn_auth__ssl_client_cert_pw_file_save_creds_helper): Instead of

expecting a scratch pool that survives across RA sessions, allocate

memory for the user's answer in the same pool as the hash table which

holds the answers.

* subversion/libsvn_subr/simple_providers.c

(svn_auth__simple_save_creds_helper): As above.

* subversion/libsvn_subr/auth.c

(svn_auth_save_credentials): Restore pre-r30800 behaviour: Pass a

short-lived scratch pool, instead of a long-lived pool, to the

save_credentials callback.

* subversion/include/svn_auth.h

(svn_auth_provider_t): Remove pool lifetime requirement for

save_credentials callback.



svn_auth_save_credentials): Remove pool lifetime requirement.

Suggested by: gstein

(That is, he suggested how to fix this issue properly, thanks!)

Update definitions of BASE/WORKING/ACTUAL trees after discussion, and

add a note about EOL-style and keyword-expanded format.

* notes/wc-ng-design


On the fs-rep-sharing branch:

Include the FSFS rep cache as part of hotcopy.

* subversion/libsvn_fs_fs/fs_fs.c

(svn_fs_fs__hotcopy): Copy the rep cache.

* subversion/libsvn_fs_fs/rep-cache.c

(REP_CACHE_DB_NAME): Remove from here...

* subversion/libsvn_fs_fs/rep-cache.h

(REP_CACHE_DB_NAME): ...and place here (for hotcopy).

Remove the use of a deprecated API by "unrolling" the code into the

recursive call sequence.

* subversion/libsvn_wc/adm_ops.c:

(process_committed_internal): replace svn_wc_process_committed4() call

with a recursion to self, along with appropriate log handling.

On the fs-rep-sharing branch:

* subversion/libsvn_fs_fs/rep-cache.h:

Remove obsolete comment.

On the fs-rep-sharing branch:

Bring up-to-date with trunk.

  1. … 102 more files in changeset.
On the fs-rep-sharing branch:

Fix blame tests 10 and 11 for FSFS. We accomplish this by introducing a reuse

count as part of the representation key, and incrementing it when we reuse a

node. This ensures that svn_fs_contents_changed() maintains it's original

pre-sharing semantics.

* subversion/libsvn_fs_fs/fs_fs.c

(read_rep_offsets): Parse the reuse count.

(representation_string): Write the reuse count.

(svn_fs_fs__noderev_same_rep_key): Compare reuse counts.

(rep_write_contents_close): If we've found a similar representation,

increment the reuse count.

* subversion/libsvn_fs_fs/fs.h

(representation_t): Add reuse_count parameter.

* subversion/libsvn_fs_fs/rep-cache.c

(upgrade_sql): Add the reuse_count column.

(svn_fs_fs__set_rep_reference): Set the reuse_count column to 0 initially.

(svn_fs_fs__inc_rep_reuse): New.

* subversion/libsvn_fs_fs/rep-cache.h

(svn_fs_fs__inc_rep_reuse): New.

On the fs-rep-sharing branch:

Bump the FSFS format number, because we're fixin' to make some incompatible


* subversion/libsvn_fs_fs/fs_fs.c

(upgrade_body): Preserve the sharded nature of the filesystem while upgrading.

* subversion/libsvn_fs_fs/fs.h



Fix up the new window-test.

* subversion/tests/libsvn_delta/window-test.c:

(stream_window_test): replicate the first 109 bytes only 999 times, not

1000 (to avoid a stack smash). add an svn_checksum_match() test to

actually fail in case of a problem. add an SVN_ERR just in case a

cosmic ray causes svn_checksum() to fail.

On the fs-pack branch:

Bump the FSFS format number to support packing.

* subversion/libsvn_fs_fs/fs_fs.c

(svn_fs_fs__pack): Check the format number to ensure the FS is new enough to

use packing.

* subversion/libsvn_fs_fs/fs.h



On the fs-pack branch:

If we aren't using FSFS sharding, just quit with a no op.

* subversion/libsvn_fs_fs/fs_fs.c,


(svn_fs_fs__pack): New.

* subversion/libsvn_fs_fs/fs.c

(fs_pack): Remove.

(library_vtable): Replace fs_pack() with svn_fs_fs__pack().

On the fs-pack branch:

* subversion/svnadmin/main.c

(cmd_table): Fix copy-pasto.

Tweak a tree conflict UI string.

* subversion/svn/info-cmd.c

(print_info): Change the heading "Tree conflicts:" from plural to singular

as it can now be followed by only one conflict.

Add the supporting function calls to support 'svnadmin pack'.

* subversion/libsvn_fs/fs-loader.h

(fs_library_vtable_t.pack): New.

* subversion/libsvn_fs/fs-loader.c

(svn_fs_pack): New.

* subversion/libsvn_fs_base/fs.c

(base_bdb_pack): New.

(library_vtable): Add pack pointer.

* subversion/svnadmin/main.c

(subcommand_pack): New.

(cmd_table): Add 'pack' subcommand.

* subversion/include/svn_fs.h

(svn_fs_pack): New.

* subversion/include/svn_repos.h

(svn_repos_fs_pack): New.

* subversion/libsvn_repos/fs-wrap.c

(svn_repos_fs_pack): New.

* subversion/libsvn_fs_fs/fs.c

(fs_pack): New.

(library_vtable): Add fs_pack.

    • ?