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

Changeset 1049057 is being indexed.


Run *.sh scripts using $(SHELL) rather than relying on the #!/bin/sh

interpreter line. This lets autoconf find a reasonable POSIX shell

for us, thus avoiding some shell incompatibilities on systems like


Simplify a conditional by removing a redundant error destruction.

* subversion/tests/cmdline/

(status_unversioned_dir): Update expectation for abspath.

* subversion/libsvn_client/status.c

(svn_client_status5): Remove redundant error destruction, creation.

* subversion/libsvn_client/status.c

(svn_client_status5): Whitespace fixes.

On the ignore-mergeinfo branch:

Bring up-to-date with trunk.

This introduces a link-time failure, since a symbol's scope was reduced on

trunk in r1045303. This will be fixed in a subsequent commit.

Make a function file-private, rather than Subversion-wide private.

* subversion/include/private/svn_wc_private.h

(svn_wc__is_sendable_status): Remove.

* subversion/libsvn_wc/status.c

(svn_wc__is_sendable_status): Rename to...

(is_sendable_status): ...this.

(handle_statii, close_directory): Update references.

On the ignore-mergeinfo branch:

Remove a piece of duplicate code which slipped in during a merge.

(This fixes diff test 58.)

* subversion/libsvn_client/diff.c

(display_prop_diffs): Remove duplicate code.

When recording file size and timestamp remove a query and simply

update the highest NODES layer.

* subversion/libsvn_wc/wc-queries.sql



(STMT_UPDATE_NODE_FILEINFO): ...this, don't require op_depth>0.

* src/subversion/libsvn_wc/wc_db.c

(record_fileinfo): Don't query trees, use STMT_UPDATE_NODE_FILEINFO.

Remove obsolete pre-SVN_WC__OP_DEPTH conditional code.

* subversion/libsvn_wc/wc.h

(): Don't define SVN_WC__OP_DEPTH.

* subversion/libsvn_wc/entries.c

(write_entry): Remove conditional code.

* subversion/libsvn_wc/wc_db.c

(elide_copyfrom, get_copyfrom, svn_wc__db_temp_elide_copyfrom): Remove.

(db_op_copy, op_depth_for_copy, svn_wc__db_op_add_directory,

svn_wc__db_op_add_file, svn_wc__db_op_add_symlink,

db_working_update_presence, db_working_actual_remove,

db_working_insert, temp_op_delete_txn, scan_addition,

scan_deletion, make_copy_txn,

svn_wc__db_temp_op_make_copy): Remove conditional code.

* subversion/libsvn_wc/workqueue.c

(run_file_install): Remove conditional code.

* subversion/libsvn_wc/upgrade.c

(bump_to_23, svn_wc__upgrade_sdb): Remove redundant conditional.

* subversion/libsvn_wc/wc-metadata.sql

(NODES): Remove comment.

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

(TESTING_DATA): Remove conditional entries.

(test_scan_deletion): Remove conditional code.

WCNG-to-WCNG upgrades for formats 16-to-17 and 17-to-18 have been

broken since the introduction of NODES in format 20. We don't need

this code for the 1.7 release so remove upgrade support for all WCNG

formats below 19.

* subversion/libsvn_wc/upgrade.c

(bump_to_13, migrate_locks, bump_to_14, bump_to_15,

bump_to_16, struct bump_to_18_baton, bump_to_18, bump_to_17): Remove.

(svn_wc__upgrade_sdb): Error on formats below 19.

* subversion/libsvn_wc/wc-metadata.sql



Actually, delta trails / paths should start with the lowest revisions.

* notes/fsfs-improvements.txt: Improve notes

On the diff-optimizations-bytes branch, sync from trunk.
  1. … 100 more files in changeset.
Get some ideas for FSFS format improvements written down.

* notes/fsfs-improvements.txt: new file

On the ignore-mergeinfo branch:

Bring up-to-date with trunk.

There are still a couple of test failures on the branch which need


  1. /branches/ignore-mergeinfo/notes/api-errata/1.7
  2. … 503 more files in changeset.
On the ignore-mergeinfo branch:

Bring up-to-date with trunk@1000000.

  1. … 273 more files in changeset.
Mark svnrdump test 35 as XFail on bdb.

I've every confidence that it works, but the dumpfile output isn't matching

exactly, so the test is failing.

* subversion/tests/cmdline/

(test_list): Mark descend_into_replace_dump() as XFail on bdb.

* subversion/tests/cmdline/svntest/

(is_fs_type_bdb): New.

Minor optimization of the are-the-targets-all-the-same check.

* subversion/libsvn_client/util.c

(svn_client__assert_homogeneous_target_type): Make the error-state

determination as early as possible, avoiding unnecessary checks.

Make svn_client__assert_homogeneous_target_type() semi-private, and

use it inside the command-line client (rather than duplicating the code).

* subversion/include/private/svn_client_private.h

(svn_client__assert_homogeneous_target_type): Move here from client.h

* subversion/libsvn_client/client.h

(svn_client__assert_homogeneous_target_type): Move to svn_client_private.h.

* subversion/svn/util.c

(svn_cl__assert_homogeneous_target_type): Now, this is just a

wrapper around svn_client__assert_homogeneous_target_type() which

fixes up the returned error type.

* subversion/libsvn_client/add.c,

* subversion/libsvn_client/delete.c,

* subversion/libsvn_client/locking_commands.c,

* subversion/libsvn_client/util.c

Now #include svn_client_private.h.

Fix error leaks.

* subversion/libsvn_fs_fs/lock.c

(make_digest, digest_path_from_path): Return svn_error_t *.

(digest_path_from_path, set_lock, delete_lock, get_lock,

svn_fs_fs__allow_locked_operation, svn_fs_fs__get_locks):

Track signature change.

Another error leak plug.


* subversion/libsvn_subr/cache-memcache.c

(build_key): Return svn_error_t *.

(memcache_get, memcache_set): Track signature change.

Fix error leaks.

* everywhere:

Add missing SVN_ERR() calls.

* subversion/libsvn_repos/load-fs-vtable.c

(make_node_baton): Return an svn_error_t *.

(new_node_record): Track return type change.

* subversion/svnadmin/main.c (main),

subversion/svndumpfilter/main.c (main),

subversion/svnlook/main.c (main),

subversion/svnrdump/svnrdump.c (main),

subversion/svnsync/main.c (main):

Use SVN_INT_ERR() around subcommand_help() or help_cmd().

  1. … 20 more files in changeset.
When upgrading to WCNG use the revert-base to update the checksum for

replaced files.

* subversion/libsvn_wc/wc-queries.sql


* subversion/libsvn_wc/entries.c

(write_entry): Don't put a WORKING checksum into the BASE node.

* subversion/libsvn_wc/upgrade.c

(migrate_text_bases): Add dir_relpath parameter, update NODES row

checksum for any revert-base files.

(bump_to_17): Pass NULL to migrate_text_bases.

(update_to_wcng): Pass dir_relpath to migrate_text_bases.

Make use of a new function for checking whether all targets are the same

type. A follow-up to r1044028.

* subversion/svn/diff-cmd.c

(svn_cl__diff): Make use of new function

svn_cl__assert_homogeneous_target_type(). Tweak existing logic which

checks to see whether working copy path is present in targets.

Patch by: Noorul Islam K M <noorul{_AT_}>

(tweaked by me)

Mark all op-depth WIMP tests as PASS.

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

(test_list): Mark all test PASS

* subversion/tests/cmdline/

(test_list): Mark copy_with_mod_from_unreadable_dir PASS.

* subversion/tests/cmdline/

(test_list): Mark tree_conflicts_on_switch_2_1 PASS.

* subversion/tests/cmdline/

(test_list): Mark merge_catches_nonexistent_target PASS.

* subversion/tests/cmdline/

(test_list): Mark tree_conflicts_on_update_2_1 PASS.

* subversion/tests/cmdline/

(test_list): Mark diff_in_renamed_folder PASS.

* subversion/libsvn_wc/wc.h

(SVN_WC__VERSION): Bump to 23, enabling multi-layer WORKING nodes.

Mark regression tests WIMP for op-depth.

* subversion/tests/cmdline/

(test_list): Mark tree_conflicts_on_switch_2_1 Wimp.

* subversion/tests/cmdline/

(test_list): Mark merge_catches_nonexistent_target Wimp.

* subversion/tests/cmdline/

(test_list): Mark tree_conflicts_on_update_2_1 Wimp.

* subversion/tests/cmdline/

(test_list): Mark diff_in_renamed_folder Wimp.

* subversion/include/svn_types.h

(SVN_DEPRECATED): Use indentation for nested #if. No functional change.

* subversion/libsvn_subr/opt.c

(svn_opt_push_implicit_dot_target): Avoid duplicating a static string.

Make svnlook detect and reject extra command-line arguments. Previously it

ignored them. In one case - svnlook lock - this changes the error message

for too few arguments from "Missing path argument" to "Missing repository

path argument" which makes it consistent with other subcommands.

Fix the tests: some of them were passing a spurious argument to svnlook.

* subversion/svnlook/main.c

(check_number_of_args): New function.

(subcommand_author, subcommand_changed, subcommand_date, subcommand_diff,

subcommand_dirschanged, subcommand_info, subcommand_log, subcommand_uuid,

subcommand_youngest): Call check_number_of_args() to check there are no

extra arguments.

(subcommand_cat, subcommand_filesize, subcommand_lock, subcommand_plist):

Call check_number_of_args() to replace a check for too few arguments.

(subcommand_history, subcommand_pget, subcommand_tree): Add a check for

too many arguments.

* subversion/tests/cmdline/

(diff_ignore_whitespace, diff_ignore_eolstyle, diff_binary): Don't pass a

path-in-repos argument to "svnlook diff", as it doesn't want one.

(test_txn_flag): Avoid passing a spurious empty argument to "svnlook". The

hook script template was splitting the list of options with "split(' ')"

which converts an empty string into a list containing one empty string.

Use "split()" instead, so that an empty string results in an empty list.

Improve the 1.6->wcng upgrade code for SVN_WC__OP_DEPTH. It doesn't

pass the regression tests because status reports the replaced items as

status 'A' instead of 'R', but the nodes appear to be correct.

* subversion/libsvn_wc/entries.c

(struct db_working_node_t): Remove keep_local.

(write_entry): Introduce below_working_node, don't set keep_local,

allocate correct size for returned parent_node.

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

(wc-pristines): Fix section title.