subversion

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

Changeset 1139088 is being indexed.

As a follow-up to r1138871, rename status_unauthz again (formerly

status_absent), this time to status_server_excluded.

See for related discussion this post and follow-ups:

From: C. Michael Pilato

To: dev@

Subject: Re: svn commit: r1138871 - in /subversion/trunk/subversion:

include/private/ libsvn_client/ libsvn_wc/ tests/libsvn_wc/

Message-ID: <4E0346D4.4040400@collab.net>

http://svn.haxx.se/dev/archive-2011-06/0727.shtml

Suggested by: julianfoad

(the new name 'server-excluded')

* subversion/include/private/svn_wc_private.h

(svn_wc__node_is_status_unauthz): Rename to...

(svn_wc__node_is_status_server_excluded): ... this, and rename the

'is_unauthz' output parameter to 'is_server_excluded'.

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

subversion/libsvn_wc/props.c,

subversion/libsvn_wc/adm_ops.c,

subversion/libsvn_wc/adm_crawler.c,

subversion/libsvn_wc/conflicts.c,

subversion/libsvn_wc/crop.c,

subversion/libsvn_wc/diff_editor.c

subversion/libsvn_wc/adm_files.c,

subversion/libsvn_wc/update_editor.c,

subversion/libsvn_wc/info.c,

subversion/libsvn_wc/copy.c,

subversion/libsvn_wc/ambient_depth_filter_editor.c,

subversion/libsvn_wc/status.c,

subversion/libsvn_wc/lock.c,

subversion/libsvn_wc/entries.c,

subversion/libsvn_wc/wc_db.c,

subversion/libsvn_wc/wc_db.h,

subversion/libsvn_wc/node.c,

subversion/libsvn_wc/cleanup.c,

subversion/libsvn_wc/workqueue.c,

subversion/libsvn_client/copy.c,

(test_getting_info, validate_node, test_inserting_nodes, test_pdh,

svn_wc__perform_props_merge, svn_wc__get_pristine_props, svn_wc_delete4,

check_can_add_to_parent, revert_restore, report_revisions_and_depths,

recursive_resolve_conflict, crop_children, svn_wc_exclude, svn_wc_crop_tree2,

walk_local_nodes_diff, report_wc_directory_as_added,

svn_wc__text_base_path_to_read, svn_wc__get_pristine_contents,

IS_NODE_PRESENT, check_tree_conflict, delete_entry, absent_node,

svn_wc__check_wc_root, build_info_for_entry, copy_versioned_dir,

svn_wc_copy3, make_file_baton, open_root, delete_entry, open_directory,

get_dir_status, internal_status, svn_wc__internal_check_wc, adm_available,

read_one_entry, write_entry, kind_map, insert_base_node,

add_absent_excluded_not_present_node, svn_wc__db_base_add_absent_node,

db_op_copy, db_op_copy_shadowed_layer, check_replace_txn,

bump_node_revision, bump_revisions_post_update, svn_wc__db_node_hidden,

svn_wc__db_status_t, svn_wc__db_base_add_symlink,

svn_wc__db_op_set_tree_conflict, convert_db_kind_to_node_kind,

walker_helper, svn_wc__internal_walk_children,

svn_wc__node_is_status_absent, svn_wc__internal_node_get_schedule,

svn_wc__check_for_obstructions, repair_timestamps, remove_base_node,

repos_to_wc_copy_locked): Rename things as follows:

status_unauthz -> status_server_excluded; is_unauthz -> is_server_excluded

  1. … 7 more files in changeset.
Following up on r1139082, rename 'forbidden' to 'forbidden_by_server'

* subversion/include/svn_error_codes.h

(SVN_ERR_CLIENT_FORBIDDEN): Rename to...

(SVN_ERR_CLIENT_FORBIDDEN_BY_SERVER): ... this.

* subversion/include/svn_wc.h

(svn_wc_notify_action_t): Rename svn_wc_notify_failed_forbidden to

svn_wc_notify_failed_forbidden_by_server.

* subversion/libsvn_client/commit_util.c

(fixup_out_of_date_error): Update user.

Suggested by: stsp

Improve the error message on a denied commit operation a bit by handling

the error in a place where we know which node failed.

Pass the failure to the notification handler to allow third party applications

access to this information.

* subversion/include/svn_error_codes.h

(SVN_ERR_CLIENT_NO_LOCK_TOKEN): Make the default error message a bit more

generic and make sure the error number is unique.

(SVN_ERR_CLIENT_FORBIDDEN): New error.

* subversion/include/svn_wc.h

(svn_wc_notify_action_t): Add svn_wc_notify_failed_forbidden value.

* subversion/libsvn_client/commit_util.c

(fixup_out_of_date_error): Handle dav forbidden errors.

* subversion/libsvn_wc/wc_db.c

(op_delete_txn): Use absolute paths in error message.

Add a test for issue #3937 "'svn log' of nonexistent path pegged at

existing rev succeeds over ra_serf".

* subversion/tests/cmdline/log_tests.py

(log_on_nonexistent_path_and_valid_rev): New.

(test_list): Add log_on_nonexistent_path_and_valid_rev.

* subversion/include/svn_client.h

(svn_client_patch_func_t): Clarify the documentation of 'filtered'.

* subversion/libsvn_client/deprecated.c

(status4_wrapper_baton): Move the 'old_func' field next to the 'old_baton'

field, because they're a logical pair.

(svn_client_status4): Adjust an initializer accordingly.

* STATUS: typos and clarifications
* subversion/include/svn_client.h

(svn_client_status_func_t): Correct the documentation of the 'path'

parameter: it is not necessarily an abspath.

(svn_client_status5): Promise that an abspath will be passed to the

callback if an abspath is provided.

* STATUS: typo fix
Add Arfrever's vote on r1134734 via IRC.
Nominate r1134734.

Suggested by: Simon Olofsson <simon@olofsson.de>

Backport the 'Fix sqlite-amalgamation location, version, and archive format' parts

of r1134734.

The 'bump dependency versions' part is excluded.

Suggested by: Simon Olofsson <simon@olofsson.de>

(via a patch)

    • ?
    /branches/1.6.x-r1134734/get-deps.sh
* STATS: remove a colon that may or may not break parsing
Nominate r1138975 (with its potential backport pain?) and

conform r966167 entry to recognized syntax.

Revert unintentional parts of r1138975.
Create an r1134734 backport branch.
* get-deps.sh: Warn against cases where 'mv $DEPENDENCY dependency' would

not behave as expected.

* subversion/libsvn_subr/cache-inprocess.c,

subversion/svnserve/cyrus_auth.c

[Unintentional changes, reverted in r1138977.]

Tweak the svn_client_status_t structure.

* subversion/include/svn_client.h

(svn_client_status_t): Rename 'locked' to 'wc_is_locked' to help

distinguish it from the other two lock fields. Move the repository

location fields to be next to the revision number, because they are

closely related. Replace the word 'entry' with 'node' in doc strings.

* subversion/bindings/javahl/native/CreateJ.cpp

(Status): Track the rename.

* subversion/libsvn_client/status.c

(tweak_status, svn_client__create_status): Same.

* subversion/svn/status.c

(print_status, svn_cl__print_status_xml): Same.

* publish/docs/release-notes/1.7.html: Provide an example of the new

mergeinfo notification output.

* subversion/tests/cmdline/log_tests.py

(log_with_unrelated_peg_and_operative_revs): Remove comment about

associated issue #3936 and add 3936 to @Issue decorator list.

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

(merge-notifications): Give this subsection a proper heading.

* subversion/libsvn_client/commit.c

(check_nonrecursive_dir_delete): Include the path in the error message.

* site/publish/download/download.html

Remove "under construction" notice.

* subversion/include/svn_error.h

(svn_error_return): Tweak doc string for accuracy.

* subversion/libsvn_subr/cache.h

(svn_cache__t, svn_cache__vtable_t): Point to the respective semi-public APIs for docstrings.

* subversion/tests/cmdline/tree_conflict_tests.py

(update_dir_with_not_present): New test.

(test_list): Add update_dir_with_not_present.

Fix issue 3935, redirect tests FAIL due to pool lifetime.

* subversion/libsvn_ra_serf/ra_serf.h

(struct svn_ra_serf__simple_request_context_t): Add pool member.

* subversion/libsvn_ra_serf/util.c

(svn_ra_serf__handle_status_only,

svn_ra_serf__handle_multistatus_only): Assert pool member is set,

allocate location and reason in context pool.

(svn_ra_serf__handle_xml_parser): Allocate location in context pool.

* subversion/libsvn_ra_serf/locks.c

(svn_ra_serf__unlock): Initialise pool member.

* subversion/libsvn_ra_serf/commit.c

(checkout_dir, checkout_file, setup_copy_dir_headers,

open_root, delete_entry, add_directory, close_directory,

add_file, close_file, close_edit, abort_edit,

svn_ra_serf__change_rev_prop): Initialise pool member.

* subversion/tests/cmdline/log_tests.py

(log_with_unrelated_peg_and_operative_revs): Typo in comment.

* subversion/tests/cmdline/log_tests.py

(log_with_unrelated_peg_and_operative_revs): Add issue number (#3936)

which is tracking the serf problem. I am not sure if adding multiple

@Issue() markers is allowed, so I've added the number in a comment.