- r995450: 2010-09-09 14:51:28 [rhuijben] Bert Huijben
-
/subversion/tests/cmdline/update_tests.py [diff, log, file]
* subversion/tests/cmdline/update_tests.py
(update_with_file_lock_and_keywords_property_set):
Following up on r995441, wait a second instead of hoping that lock
or propset wait for us.
Suggested by: philip
- r995441: 2010-09-09 14:19:43 [rhuijben] Bert Huijben
-
/subversion/tests/cmdline/update_tests.py [diff, log, file]
* subversion/tests/cmdline/update_tests.py
(update_with_file_lock_and_keywords_property_set):
Enable sleeping for timestamp changes to detect the mtime
change even if the update takes less then a second.
- r993327: 2010-09-07 12:25:46 [rhuijben] Bert Huijben
-
/subversion/tests/cmdline/revert_tests.py [diff, log, file]
* subversion/tests/cmdline/revert_tests.py
(status_of_missing_dir_after_revert_replaced_with_history_dir):
Expect that G/pi, G/rho and G/tau are also reverted, as their
information is not lost in single-DB. Then restore the expected
result to be like it was in 1.6. (Revert leaves unversioned files,
not additions). Finally expect that nodes under a missing file
are still visible in single-db.
This resolves some older concerns and fixes the test.
(test_list): Remove wimp marking from
status_of_missing_dir_after_revert_replaced_with_history_dir.
- r993314: 2010-09-07 10:38:42 [rhuijben] Bert Huijben
-
/subversion/libsvn_diff/parse-diff.c [diff, log, file]
* subversion/libsvn_diff/parse-diff.c
(parse_offset): Pass a apr_uint64_t * instead of a unsigned * to
svn_cstring_strtoui64(). This fixes several patch tests on 32 bit systems.
- r993308: 2010-09-07 10:00:40 [rhuijben] Bert Huijben
-
/subversion/libsvn_subr/io.c [diff, log, file]
Fix another open file handle leak in one function and properly close
files and return all errors in another function.
* subversion/libsvn_subr/io.c
(svn_io_read_version_file): Close file if svn_io_file_read() fails.
(contents_identical_p): Properly close both files on all error conditions.
Return all errors instead of just clearing a few.
- r993272: 2010-09-07 08:16:35 [rhuijben] Bert Huijben
-
/subversion/libsvn_subr/io.c [diff, log, file]
Resolve two highly-unlikely open file handle leaks.
* subversion/libsvn_subr/io.c
(svn_io_file_create,
svn_io_write_unique): Close file handle on writing errors.
- r993258: 2010-09-07 07:32:34 [rhuijben] Bert Huijben
-
/subversion/mod_dav_svn/reports/log.c [diff, log, file]
* subversion/mod_dav_svn/reports/log.c
(dav_svn__log_report): Partially revert r993246 to fix compilation.
The malformed_element_error() function is not defined nor a public
api.
- r993253: 2010-09-07 07:28:10 [rhuijben] Bert Huijben
-
/subversion/libsvn_subr/win32_xlate.c [diff, log, file]
* subversion/libsvn_subr/win32_xlate.c
(get_page_id_from_name): Revert r993183 for this function as it is
impossible to return a svn_error_t* message via a apr status code.
This fixes compilation of this file on Windows.
- r993039: 2010-09-06 14:24:52 [rhuijben] Bert Huijben
-
/subversion/libsvn_wc/relocate.c [diff, log, file]
/subversion/libsvn_wc/wc_db.c [diff, log, file]
/subversion/libsvn_wc/wc_db.h [diff, log, file]
/subversion/tests/libsvn_wc/db-test.c [diff, log, file]
Remove multi-db support from wc_db.c. No functional changes.
This leaves a few #ifdef SINGLE_DB statements that need further research.
* subversion/libsvn_wc/relocate.c
(svn_wc_relocate4): Remove single_db argument from call.
* subversion/libsvn_wc/wc_db.c
(kind_map): Remove subdir.
(*): Evaluate SINGLE_DB and SVN_WC__SINGLE_DB
(svn_wc__db_global_relocate): Remove single_db argument.
* subversion/libsvn_wc/wc_db.h
(svn_wc__db_global_relocate): Remove single_db argument.
* subversion/tests/libsvn_wc/db-test.c
(test_global_relocate): Update caller.
- r993031: 2010-09-06 13:52:07 [rhuijben] Bert Huijben
-
/subversion/libsvn_wc/wc_db.h [diff, log, file]
Cleanup some wc_db definitions for single-db, better debug and
intellisense information for Visual Studio and easier identification
in commit emails.
* subversion/libsvn_wc/wc_db.h
(svn_wc__db_openmode_t): Give the enum a name.
(svn_wc__db_kind_t): Name the enum and remove subdir type.
(svn_wc__db_status_t): Name enum and remove obstructed values.
(svn_wc__db_lock_t): Give the struct a name.
- r993028: 2010-09-06 13:47:23 [rhuijben] Bert Huijben
-
Click to show all 14 changes...
Remove the remaining checks for obstruction statee in libsvn_wc. These
statee are no longer returned from the wc_db api since we switched to
single-db. This is a a final cleanup step before removing some parts
of the multi-db support.
No functional change.
* subversion/libsvn_wc/adm_crawler.c
(report_revisions_and_depths): Disable check for obstructed.
* subversion/libsvn_wc/adm_files.c
(svn_wc__get_pristine_contents): Disable check for obstructed and
remove base-deleted check (value is wc_db internal).
(svn_wc__internal_ensure_adm): Disable check for obstructed.
* subversion/libsvn_wc/adm_ops.c
(process_committed_leaf,
svn_wc__process_committed_internal,
svn_wc_add4): Disable obstructed status checks.
* subversion/libsvn_wc/copy.c
(svn_wc_copy3): Disable obstructed check.
* subversion/libsvn_wc/crop.c
(svn_wc_exclude,
svn_wc_crop_tree2): Disable obstructed checks.
* subversion/libsvn_wc/diff.c
(file_diff): Remove obstructed check (file couldn't be obstructed)
* subversion/libsvn_wc/entries.c
(get_base_info_for_deleted,
read_one_entry): Disable obstructed checks.
* subversion/libsvn_wc/lock.c
(adm_available): Disable obstructed checks.
* subversion/libsvn_wc/node.c
(svn_wc__node_get_repos_info,
svn_wc__internal_node_get_url,
svn_wc__node_get_repos_relpath,
svn_wc__internal_get_copyfrom_info,
svn_wc__node_is_status_deleted,
svn_wc__node_is_added,
svn_wc__internal_is_replaced,
svn_wc__node_get_commit_base_rev,
svn_wc__internal_node_get_schedule): Disable checks for obstructed statee.
* subversion/libsvn_wc/props.c
(svn_wc__get_pristine_props): Disable check for obstructed.
* subversion/libsvn_wc/revision_status.c
(analyze_status): Disable check for obstructed status.
* subversion/libsvn_wc/status.c
(internal_status): Disable obstructed test.
* subversion/libsvn_wc/update_editor.c
(node_get_relpath_ignore_errors,
create_tree_conflict,
check_tree_conflict,
add_directory): Disable obstructed checks.
* subversion/libsvn_wc/workqueue.c
(remove_base_node,
log_do_committed): Disable obstructed checks.
- r993021: 2010-09-06 13:20:29 [rhuijben] Bert Huijben
-
/subversion/libsvn_wc/wc_db.c [diff, log, file]
* subversion/libsvn_wc/wc_db.c
(svn_wc__db_temp_op_delete):
(svn_wc__db_global_relocate): Don't check for obstruction statee in
single-db mode.
- r992566: 2010-09-04 09:20:03 [rhuijben] Bert Huijben
-
/notes/wc-ng/conflict-storage [diff, log, file]
* notes/wc-ng/conflict-storage
(intro): Note that we have to store the names of the conflict markers
somewhere to keep compatibility with preserved-conflict-file-exts and
obstructing filenames.
- r992391: 2010-09-03 17:36:50 [rhuijben] Bert Huijben
-
/subversion/libsvn_wc/wc.h [diff, log, file]
/subversion/libsvn_wc/wc_db.h [diff, log, file]
Move the svn_wc__internal_get_copyfrom_info() prototype to the right
header file for this kind of functions.
* subversion/libsvn_wc/wc.h
(svn_wc__internal_get_copyfrom_info): Move prototype here...
* subversion/libsvn_wc/wc_db.h
(svn_wc__internal_get_copyfrom_info): ... from here.
- r992390: 2010-09-03 17:34:52 [rhuijben] Bert Huijben
-
/subversion/include/private/svn_sqlite.h [diff, log, file]
/subversion/libsvn_subr/sqlite.c [diff, log, file]
/subversion/libsvn_wc/wc_db.c [diff, log, file]
/subversion/libsvn_wc/wc_db.h [diff, log, file]
Add a few helper functions to allow experimenting with SQLite operations
inside SAVEPOINTs. This allows taking out a shared read lock for longer than
the duration of a single SQLite statement, which gives a huge performance
boost in some hacky tests. (Especially with SQLite 3.7 and on Windows, where
some of the WAL code slows down SQLite more than it used to do in 3.6)
* subversion/include/private/svn_sqlite.h
(svn_sqlite__with_lock): New function.
* subversion/libsvn_subr/sqlite.c
(svn_sqlite__with_lock): New function.
* subversion/libsvn_wc/wc_db.c
(with_sqlite_lock_baton): New struct.
(call_sqlite_lock_cb): New function.
(svn_wc__db_with_sqlite_lock): New function.
* subversion/libsvn_wc/wc_db.h
(svn_wc__db_with_sqlite_lock): New function.
- r991972: 2010-09-02 15:14:48 [rhuijben] Bert Huijben
-
/subversion/tests/cmdline/svntest/sandbox.py [diff, log, file]
* subversion/tests/cmdline/svntest/sandbox.py
(_set_name): Use shutil.move() instead of os.rename() to allow replacing
files on Windows.
- r991958: 2010-09-02 14:50:30 [rhuijben] Bert Huijben
-
/subversion/mod_dav_svn/util.c [diff, log, file]
Following up on r991239, fix a missing variable initialization error which
made it impossible to start httpd on Windows when compiling in debug mode.
(In debug/maintainer mode the compiler adds some assertion code, which
crashed httpd)
* subversion/mod_dav_svn/util.c
(request_body_to_string): Make sure content_length is always initialized.
- r991941: 2010-09-02 14:05:58 [rhuijben] Bert Huijben
-
/subversion/libsvn_wc/wc_db.c [diff, log, file]
Don't create ACTUAL_NODE records to only insert NULL values in three
wc_db calls.
* subversion/libsvn_wc/wc_db.c
(set_props_txn): Don't create actual row to set changed properties to
NULL.
(svn_wc__db_temp_op_set_text_conflict_marker_files,
svn_wc__db_temp_op_set_property_conflict_marker_file):
Don't create ACTUAL row to clear conflict data.
- r991732: 2010-09-01 22:12:19 [rhuijben] Bert Huijben
-
/subversion/libsvn_wc/status.c [diff, log, file]
* subversion/libsvn_wc/status.c
(assemble_status): Following up on r991723, make sure has_props is
always initialized.
- r991723: 2010-09-01 21:58:57 [rhuijben] Bert Huijben
-
/subversion/libsvn_wc/status.c [diff, log, file]
* subversion/libsvn_wc/status.c
(assemble_status): Simplify the has properties check to avoid some
expensive checks. We don't have to check actual properties as these
must have the same value or we would have seen property changes.
- r991717: 2010-09-01 21:52:45 [rhuijben] Bert Huijben
-
/subversion/libsvn_wc/props.c [diff, log, file]
* subversion/libsvn_wc/props.c
(load_actual_props): Remove function that only wrapped
svn_wc__db_read_props.
(svn_wc__get_actual_props,
svn_wc__internal_propset,
svn_wc__internal_propdiff): Update callers.
- r991716: 2010-09-01 21:50:57 [rhuijben] Bert Huijben
-
/subversion/libsvn_wc/props.c [diff, log, file]
* subversion/libsvn_wc/props.c
(load_pristine_props): Remove function that only wraps
svn_wc__db_read_pristine_props.
(immediate_install_props,
svn_wc__get_pristine_props,
svn_wc__internal_propdiff): Update callers.
- r991679: 2010-09-01 20:12:00 [rhuijben] Bert Huijben
-
/subversion/tests/cmdline/update_tests.py [diff, log, file]
Add regression test on the update receives file with property conflict issue
experienced by cmpilato when he converted to single-db.
* subversion/tests/cmdline/update_tests.py
(add_moved_file_has_props2): Add new test, based upon
add_moved_file_has_props, but extended with an extra property
change after the move.
(test_list): Add add_moved_file_has_props2 as XFail test.
Found by: cmpilato
- r991662: 2010-09-01 19:18:33 [rhuijben] Bert Huijben
-
/subversion/tests/cmdline/svntest/wc.py [diff, log, file]
* subversion/tests/cmdline/svntest/wc.py
(text_base_path): Verify if wc.db exists, to make sure we don't create
a new per directory wc.db. This fixes a few upgrade tests on Windows.
- r991642: 2010-09-01 18:34:26 [rhuijben] Bert Huijben
-
/subversion/libsvn_wc/wc_db.c [diff, log, file]
Fix some compatibility with the old entries world that was broken by using
the SINGLE_DB define in wc_db.c. After this patch the generic flush_entries
code is extended to automatically flush the parent stub entry (if that
exists) if a directory is modified.
* subversion/libsvn_wc/wc_db.c
(flush_entries): Return svn_error_t and by looking at the local_abspath
check if the parent nodes entries must also be flushed. We need a db
and scratch pool to do this work and the pdh can't be seen as read only.
(svn_wc__db_base_add_directory,
svn_wc__db_base_add_file,
svn_wc__db_base_add_symlink,
svn_wc__db_base_add_absent_node,
svn_wc__db_temp_base_add_subdir,
svn_wc__db_op_copy_dir,
svn_wc__db_op_copy_file,
svn_wc__db_op_copy_symlink,
svn_wc__db_op_add_directory,
svn_wc__db_op_add_file,
svn_wc__db_op_add_symlink): Update callers.
(svn_wc__db_op_set_changelist): Update caller. No need to flush stubs.
(svn_wc__db_op_set_tree_conflict,
svn_wc__db_temp_op_remove_entry,
svn_wc__db_temp_op_remove_working): Update callers.
(update_depth_values): Update caller. Add some arguments to pass to
flush_entries().
(svn_wc__db_temp_op_set_dir_depth,
db_working_update_presence
db_working_actual_remove,
db_working_insert,
svn_wc__db_temp_set_keep_local,
svn_wc__db_temp_op_set_base_incomplete,
svn_wc__db_temp_op_start_directory_update,
make_copy_txn,
svn_wc__db_temp_set_parent_stub_to_normal,
svn_wc__db_temp_op_set_rev_and_repos_relpath,
svn_wc__db_temp_op_set_new_dir_to_incomplete): Update callers.