On Thu, Jun 23, 2011 at 04:35:36PM +0200, Stefan Sperling wrote:
> On Thu, Jun 23, 2011 at 10:17:19AM -0400, C. Michael Pilato wrote:
> > On 06/23/2011 10:09 AM, Stefan Sperling wrote:
> > > On Thu, Jun 23, 2011 at 09:59:48AM -0400, C. Michael Pilato wrote:
> > >> Now, I'm fine with using something other than "absent" ("omitted",
> > >> "withheld", ...), but -1 on any terminology that allows the WC to presume to
> > >> know what it simply cannot.
> > >
> > > Julian also suggested "server-excluded". Would that work?
> >
> > Sure! That would work quite well, actually.
>
> OK. As stated on IRC I am going to wait a while and then change it again
> from "unauthz" to "server-excluded" unless I hear objections.
For the record here is the log message and diff to make this change.
Not committing just yet in case the discussion continues and this idea
gets rejected as well.
[[[
As per the discussion following r1138871, rename 'status_unauthz'
(former 'status_absent') again, this time to 'status_server_excluded'.
Suggested by: julianfoad
(the 'server-excluded' name)
* 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_unauthz, 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
]]]
Index: subversion/include/private/svn_wc_private.h
===================================================================
--- subversion/include/private/svn_wc_private.h (revision 1138903)
+++ subversion/include/private/svn_wc_private.h (working copy)
@@ -466,16 +466,16 @@ svn_wc__node_is_status_deleted(svn_boolean_t *is_d
apr_pool_t *scratch_pool);
/**
- * Set @a *is_unauthz to whether access to @a local_abspath is not authorized,
- * using @a wc_ctx. If @a local_abspath is not in the working copy, return
- * @c SVN_ERR_WC_PATH_NOT_FOUND. Use @a scratch_pool for all temporary
- * allocations.
+ * Set @a *is_server_excluded to whether @a local_abspath has been
+ * excluded by the server, using @a wc_ctx. If @a local_abspath is not
+ * in the working copy, return @c SVN_ERR_WC_PATH_NOT_FOUND.
+ * Use @a scratch_pool for all temporary allocations.
*/
svn_error_t *
-svn_wc__node_is_status_unauthz(svn_boolean_t *is_unauthz,
- svn_wc_context_t *wc_ctx,
- const char *local_abspath,
- apr_pool_t *scratch_pool);
+svn_wc__node_is_status_server_excluded(svn_boolean_t *is_server_excluded,
+ svn_wc_context_t *wc_ctx,
+ const char *local_abspath,
+ apr_pool_t *scratch_pool);
/**
* Set @a *is_not_present to whether the status of @a local_abspath is
Index: subversion/tests/libsvn_wc/db-test.c
===================================================================
--- subversion/tests/libsvn_wc/db-test.c (revision 1138903)
+++ subversion/tests/libsvn_wc/db-test.c (working copy)
@@ -445,7 +445,7 @@ test_getting_info(apr_pool_t *pool)
db, svn_dirent_join(local_abspath, "C", pool),
pool, pool));
SVN_TEST_ASSERT(kind == svn_wc__db_kind_unknown);
- SVN_TEST_ASSERT(status == svn_wc__db_status_unauthz);
+ SVN_TEST_ASSERT(status == svn_wc__db_status_server_excluded);
/* Test: not-present presence. */
SVN_ERR(svn_wc__db_base_get_info(
@@ -554,7 +554,7 @@ validate_node(svn_wc__db_t *db,
scratch_pool, scratch_pool));
switch (status)
{
- case svn_wc__db_status_unauthz:
+ case svn_wc__db_status_server_excluded:
case svn_wc__db_status_excluded:
case svn_wc__db_status_incomplete:
case svn_wc__db_status_not_present:
@@ -659,7 +659,7 @@ test_inserting_nodes(apr_pool_t *pool)
SVN_ERR(svn_wc__db_base_add_absent_node(
db, svn_dirent_join(local_abspath, "N/N-b", pool),
"N/N-b", ROOT_ONE, UUID_ONE, 3,
- svn_wc__db_kind_file, svn_wc__db_status_unauthz,
+ svn_wc__db_kind_file, svn_wc__db_status_server_excluded,
NULL, NULL,
pool));
@@ -683,7 +683,7 @@ test_inserting_nodes(apr_pool_t *pool)
SVN_ERR(svn_wc__db_base_add_absent_node(
db, svn_dirent_join(local_abspath, "R", pool),
"R", ROOT_ONE, UUID_ONE, 3,
- svn_wc__db_kind_unknown, svn_wc__db_status_unauthz,
+ svn_wc__db_kind_unknown, svn_wc__db_status_server_excluded,
NULL, NULL,
pool));
@@ -696,7 +696,8 @@ test_inserting_nodes(apr_pool_t *pool)
svn_wc__db_kind_file, svn_wc__db_status_normal,
pool));
SVN_ERR(validate_node(db, local_abspath, "N/N-b",
- svn_wc__db_kind_file, svn_wc__db_status_unauthz,
+ svn_wc__db_kind_file,
+ svn_wc__db_status_server_excluded,
pool));
SVN_ERR(validate_node(db, local_abspath, "N/N-c",
svn_wc__db_kind_unknown, svn_wc__db_status_incomplete,
@@ -711,7 +712,8 @@ test_inserting_nodes(apr_pool_t *pool)
svn_wc__db_kind_symlink, svn_wc__db_status_not_present,
pool));
SVN_ERR(validate_node(db, local_abspath, "R",
- svn_wc__db_kind_unknown, svn_wc__db_status_unauthz,
+ svn_wc__db_kind_unknown,
+ svn_wc__db_status_server_excluded,
pool));
/* ### do we need to test any attributes of the node? */
@@ -857,14 +859,14 @@ test_pdh(apr_pool_t *pool)
SVN_ERR(svn_wc__db_base_add_absent_node(
db, svn_dirent_join(local_abspath, "sub", pool),
"sub", ROOT_ONE, UUID_ONE, 1,
- svn_wc__db_kind_file, svn_wc__db_status_unauthz,
+ svn_wc__db_kind_file, svn_wc__db_status_server_excluded,
NULL, NULL,
pool));
SVN_ERR(svn_wc__db_base_add_absent_node(
db, svn_dirent_join(local_abspath, "sub/A", pool),
"sub/A", ROOT_ONE, UUID_ONE, 1,
- svn_wc__db_kind_file, svn_wc__db_status_unauthz,
+ svn_wc__db_kind_file, svn_wc__db_status_server_excluded,
NULL, NULL,
pool));
Index: subversion/libsvn_wc/props.c
===================================================================
--- subversion/libsvn_wc/props.c (revision 1138903)
+++ subversion/libsvn_wc/props.c (working copy)
@@ -246,7 +246,7 @@ svn_wc__perform_props_merge(svn_wc_notify_state_t
/* Checks whether the node exists and returns the hidden flag */
if (status == svn_wc__db_status_not_present
- || status == svn_wc__db_status_unauthz
+ || status == svn_wc__db_status_server_excluded
|| status == svn_wc__db_status_excluded)
{
return svn_error_createf(
@@ -1941,7 +1941,7 @@ svn_wc__get_pristine_props(apr_hash_t **props,
|| status == svn_wc__db_status_incomplete
#endif
|| status == svn_wc__db_status_excluded
- || status == svn_wc__db_status_unauthz
+ || status == svn_wc__db_status_server_excluded
|| status == svn_wc__db_status_not_present)
{
*props = NULL;
Index: subversion/libsvn_wc/adm_ops.c
===================================================================
--- subversion/libsvn_wc/adm_ops.c (revision 1138903)
+++ subversion/libsvn_wc/adm_ops.c (working copy)
@@ -635,7 +635,7 @@ svn_wc_delete4(svn_wc_context_t *wc_ctx,
switch (status)
{
- /* svn_wc__db_status_unauthz handled by svn_wc__db_op_delete */
+ /* svn_wc__db_status_server_excluded handled by svn_wc__db_op_delete */
case svn_wc__db_status_excluded:
case svn_wc__db_status_not_present:
return svn_error_createf(SVN_ERR_WC_PATH_NOT_FOUND, NULL,
@@ -781,7 +781,7 @@ check_can_add_to_parent(const char **repos_root_ur
if (err
|| parent_status == svn_wc__db_status_not_present
|| parent_status == svn_wc__db_status_excluded
- || parent_status == svn_wc__db_status_unauthz)
+ || parent_status == svn_wc__db_status_server_excluded)
{
return
svn_error_createf(SVN_ERR_ENTRY_NOT_FOUND, err,
@@ -1363,7 +1363,7 @@ revert_restore(svn_wc__db_t *db,
item on disk matches the versioned item, if it doesn't match then
fix it or delete it. */
if (on_disk != svn_node_none
- && status != svn_wc__db_status_unauthz
+ && status != svn_wc__db_status_server_excluded
&& status != svn_wc__db_status_deleted
&& status != svn_wc__db_status_excluded
&& status != svn_wc__db_status_not_present)
@@ -1485,7 +1485,7 @@ revert_restore(svn_wc__db_t *db,
/* If we expect a versioned item to be present and there is nothing
on disk then recreate it. */
if (on_disk == svn_node_none
- && status != svn_wc__db_status_unauthz
+ && status != svn_wc__db_status_server_excluded
&& status != svn_wc__db_status_deleted
&& status != svn_wc__db_status_excluded
&& status != svn_wc__db_status_not_present)
Index: subversion/libsvn_wc/adm_crawler.c
===================================================================
--- subversion/libsvn_wc/adm_crawler.c (revision 1138903)
+++ subversion/libsvn_wc/adm_crawler.c (working copy)
@@ -350,7 +350,7 @@ report_revisions_and_depths(svn_wc__db_t *db,
}
/*** The Big Tests: ***/
- if (ths->status == svn_wc__db_status_unauthz
+ if (ths->status == svn_wc__db_status_server_excluded
|| ths->status == svn_wc__db_status_not_present)
{
/* If the entry is 'absent' or 'not-present', make sure the server
Index: subversion/libsvn_wc/conflicts.c
===================================================================
--- subversion/libsvn_wc/conflicts.c (revision 1138903)
+++ subversion/libsvn_wc/conflicts.c (working copy)
@@ -524,7 +524,7 @@ recursive_resolve_conflict(svn_wc__db_t *db,
if (status == svn_wc__db_status_not_present
|| status == svn_wc__db_status_excluded
- || status == svn_wc__db_status_unauthz)
+ || status == svn_wc__db_status_server_excluded)
continue;
apr_hash_set(visited, name, APR_HASH_KEY_STRING, name);
Index: subversion/libsvn_wc/crop.c
===================================================================
--- subversion/libsvn_wc/crop.c (revision 1138903)
+++ subversion/libsvn_wc/crop.c (working copy)
@@ -113,7 +113,7 @@ crop_children(svn_wc__db_t *db,
NULL, NULL, NULL, NULL, NULL,
db, child_abspath, iterpool, iterpool));
- if (child_status == svn_wc__db_status_unauthz ||
+ if (child_status == svn_wc__db_status_server_excluded ||
child_status == svn_wc__db_status_excluded ||
child_status == svn_wc__db_status_not_present)
{
@@ -243,7 +243,7 @@ svn_wc_exclude(svn_wc_context_t *wc_ctx,
switch (status)
{
- case svn_wc__db_status_unauthz:
+ case svn_wc__db_status_server_excluded:
case svn_wc__db_status_excluded:
case svn_wc__db_status_not_present:
return svn_error_createf(SVN_ERR_WC_PATH_NOT_FOUND, NULL,
@@ -342,7 +342,7 @@ svn_wc_crop_tree2(svn_wc_context_t *wc_ctx,
switch (status)
{
case svn_wc__db_status_not_present:
- case svn_wc__db_status_unauthz:
+ case svn_wc__db_status_server_excluded:
return svn_error_createf(SVN_ERR_WC_PATH_NOT_FOUND, NULL,
_("The node '%s' was not found."),
svn_dirent_local_style(local_abspath,
Index: subversion/libsvn_wc/diff_editor.c
===================================================================
--- subversion/libsvn_wc/diff_editor.c (revision 1138903)
+++ subversion/libsvn_wc/diff_editor.c (working copy)
@@ -869,7 +869,7 @@ walk_local_nodes_diff(struct edit_baton *eb,
if (status == svn_wc__db_status_not_present
|| status == svn_wc__db_status_excluded
- || status == svn_wc__db_status_unauthz)
+ || status == svn_wc__db_status_server_excluded)
continue;
child_path = svn_relpath_join(path, name, iterpool);
@@ -1102,7 +1102,7 @@ report_wc_directory_as_added(struct edit_baton *eb
if (status == svn_wc__db_status_not_present
|| status == svn_wc__db_status_excluded
- || status == svn_wc__db_status_unauthz)
+ || status == svn_wc__db_status_server_excluded)
{
continue;
}
Index: subversion/libsvn_wc/adm_files.c
===================================================================
--- subversion/libsvn_wc/adm_files.c (revision 1138903)
+++ subversion/libsvn_wc/adm_files.c (working copy)
@@ -220,7 +220,7 @@ svn_wc__text_base_path_to_read(const char **result
"because its delete is already committed"),
svn_dirent_local_style(local_abspath,
scratch_pool));
- else if (status == svn_wc__db_status_unauthz
+ else if (status == svn_wc__db_status_server_excluded
|| status == svn_wc__db_status_excluded
|| status == svn_wc__db_status_incomplete)
return svn_error_createf(SVN_ERR_WC_PATH_UNEXPECTED_STATUS, NULL,
@@ -282,7 +282,7 @@ svn_wc__get_pristine_contents(svn_stream_t **conte
"because its delete is already committed"),
svn_dirent_local_style(local_abspath,
scratch_pool));
- else if (status == svn_wc__db_status_unauthz
+ else if (status == svn_wc__db_status_server_excluded
|| status == svn_wc__db_status_excluded
|| status == svn_wc__db_status_incomplete)
return svn_error_createf(SVN_ERR_WC_PATH_UNEXPECTED_STATUS, NULL,
Index: subversion/libsvn_wc/update_editor.c
===================================================================
--- subversion/libsvn_wc/update_editor.c (revision 1138903)
+++ subversion/libsvn_wc/update_editor.c (working copy)
@@ -53,7 +53,7 @@
/* Checks whether a svn_wc__db_status_t indicates whether a node is
present in a working copy. Used by the editor implementation */
#define IS_NODE_PRESENT(status) \
- ((status) != svn_wc__db_status_unauthz && \
+ ((status) != svn_wc__db_status_server_excluded &&\
(status) != svn_wc__db_status_excluded && \
(status) != svn_wc__db_status_not_present)
@@ -1528,7 +1528,7 @@ check_tree_conflict(svn_wc_conflict_description2_t
}
break;
- case svn_wc__db_status_unauthz:
+ case svn_wc__db_status_server_excluded:
/* Not allowed to view the node. Not allowed to report tree
* conflicts. */
case svn_wc__db_status_excluded:
@@ -1753,7 +1753,7 @@ delete_entry(const char *path,
Do not notify, but perform the change even when the node is shadowed */
if (base_status == svn_wc__db_status_not_present
|| base_status == svn_wc__db_status_excluded
- || base_status == svn_wc__db_status_unauthz)
+ || base_status == svn_wc__db_status_server_excluded)
{
SVN_ERR(svn_wc__db_base_remove(eb->db, local_abspath, scratch_pool));
@@ -2855,7 +2855,7 @@ absent_node(const char *path,
*/
}
else if (status == svn_wc__db_status_not_present
- || status == svn_wc__db_status_unauthz
+ || status == svn_wc__db_status_server_excluded
|| status == svn_wc__db_status_excluded)
{
/* The BASE node is not actually there, so we can safely turn it into
@@ -2891,7 +2891,7 @@ absent_node(const char *path,
eb->repos_uuid,
*(eb->target_revision),
absent_kind,
- svn_wc__db_status_unauthz,
+ svn_wc__db_status_server_excluded,
NULL, NULL,
scratch_pool));
}
@@ -4944,7 +4944,7 @@ svn_wc__check_wc_root(svn_boolean_t *wc_root,
{
*wc_root = FALSE;
}
- else if (status == svn_wc__db_status_unauthz
+ else if (status == svn_wc__db_status_server_excluded
|| status == svn_wc__db_status_excluded
|| status == svn_wc__db_status_not_present)
{
Index: subversion/libsvn_wc/info.c
===================================================================
--- subversion/libsvn_wc/info.c (revision 1138903)
+++ subversion/libsvn_wc/info.c (working copy)
@@ -235,7 +235,7 @@ build_info_for_entry(svn_wc__info2_t **info,
wc_info->schedule = svn_wc_schedule_delete;
}
else if (status == svn_wc__db_status_not_present
- || status == svn_wc__db_status_unauthz)
+ || status == svn_wc__db_status_server_excluded)
{
return svn_error_createf(SVN_ERR_WC_PATH_NOT_FOUND, NULL,
_("The node '%s' was not found."),
Index: subversion/libsvn_wc/copy.c
===================================================================
--- subversion/libsvn_wc/copy.c (revision 1138903)
+++ subversion/libsvn_wc/copy.c (working copy)
@@ -511,7 +511,7 @@ copy_versioned_dir(svn_wc__db_t *db,
}
else
{
- SVN_ERR_ASSERT(child_status == svn_wc__db_status_unauthz);
+ SVN_ERR_ASSERT(child_status == svn_wc__db_status_server_excluded);
return svn_error_createf(SVN_ERR_WC_PATH_UNEXPECTED_STATUS, NULL,
_("Cannot copy '%s' excluded by server"),
@@ -725,7 +725,7 @@ svn_wc_copy3(svn_wc_context_t *wc_ctx,
_("'%s' is already under version control "
"but is excluded."),
svn_dirent_local_style(dst_abspath, scratch_pool));
- case svn_wc__db_status_unauthz:
+ case svn_wc__db_status_server_excluded:
return svn_error_createf(
SVN_ERR_ENTRY_EXISTS, NULL,
_("'%s' is already under version control"),
Index: subversion/libsvn_wc/ambient_depth_filter_editor.c
===================================================================
--- subversion/libsvn_wc/ambient_depth_filter_editor.c (revision 1138903)
+++ subversion/libsvn_wc/ambient_depth_filter_editor.c (working copy)
@@ -279,7 +279,7 @@ make_file_baton(struct file_baton **f_p,
doesn't want to hear about the file at all. */
if (status == svn_wc__db_status_not_present
- || status == svn_wc__db_status_unauthz
+ || status == svn_wc__db_status_server_excluded
|| status == svn_wc__db_status_excluded
|| kind == svn_wc__db_kind_unknown)
{
@@ -352,7 +352,7 @@ open_root(void *edit_baton,
if (kind != svn_wc__db_kind_unknown
&& status != svn_wc__db_status_not_present
&& status != svn_wc__db_status_excluded
- && status != svn_wc__db_status_unauthz)
+ && status != svn_wc__db_status_server_excluded)
{
b->ambient_depth = depth;
}
@@ -392,7 +392,7 @@ delete_entry(const char *path,
if (kind == svn_wc__db_kind_unknown
|| status == svn_wc__db_status_not_present
|| status == svn_wc__db_status_excluded
- || status == svn_wc__db_status_unauthz)
+ || status == svn_wc__db_status_server_excluded)
return SVN_NO_ERROR;
}
@@ -483,7 +483,7 @@ open_directory(const char *path,
if (kind != svn_wc__db_kind_unknown
&& status != svn_wc__db_status_not_present
&& status != svn_wc__db_status_excluded
- && status != svn_wc__db_status_unauthz)
+ && status != svn_wc__db_status_server_excluded)
{
b->ambient_depth = depth;
}
Index: subversion/libsvn_wc/status.c
===================================================================
--- subversion/libsvn_wc/status.c (revision 1138903)
+++ subversion/libsvn_wc/status.c (working copy)
@@ -1131,7 +1131,7 @@ get_dir_status(const struct walk_status_baton *wb,
{
if (info->status != svn_wc__db_status_not_present
&& info->status != svn_wc__db_status_excluded
- && info->status != svn_wc__db_status_unauthz)
+ && info->status != svn_wc__db_status_server_excluded)
{
if (depth == svn_depth_files
&& info->kind == svn_wc__db_kind_dir)
@@ -2443,7 +2443,7 @@ internal_status(svn_wc_status3_t **status,
if ((err && err->apr_err == SVN_ERR_WC_PATH_NOT_FOUND)
|| node_status == svn_wc__db_status_not_present
- || node_status == svn_wc__db_status_unauthz
+ || node_status == svn_wc__db_status_server_excluded
|| node_status == svn_wc__db_status_excluded)
{
svn_error_clear(err);
Index: subversion/libsvn_wc/lock.c
===================================================================
--- subversion/libsvn_wc/lock.c (revision 1138903)
+++ subversion/libsvn_wc/lock.c (working copy)
@@ -170,7 +170,7 @@ svn_wc__internal_check_wc(int *wc_format,
switch (db_status)
{
case svn_wc__db_status_not_present:
- case svn_wc__db_status_unauthz:
+ case svn_wc__db_status_server_excluded:
case svn_wc__db_status_excluded:
/* If there is a directory here, it is not related to the parent
working copy: Obstruction */
@@ -609,7 +609,7 @@ adm_available(svn_boolean_t *available,
NULL, NULL, NULL, NULL, NULL, NULL,
db, local_abspath, scratch_pool, scratch_pool));
- *available = !(status == svn_wc__db_status_unauthz
+ *available = !(status == svn_wc__db_status_server_excluded
|| status == svn_wc__db_status_excluded
|| status == svn_wc__db_status_not_present);
Index: subversion/libsvn_wc/entries.c
===================================================================
--- subversion/libsvn_wc/entries.c (revision 1138903)
+++ subversion/libsvn_wc/entries.c (working copy)
@@ -803,7 +803,7 @@ read_one_entry(const svn_wc_entry_t **new_entry,
entry->schedule = svn_wc_schedule_normal;
entry->deleted = TRUE;
}
- else if (status == svn_wc__db_status_unauthz)
+ else if (status == svn_wc__db_status_server_excluded)
{
entry->absent = TRUE;
}
@@ -857,7 +857,7 @@ read_one_entry(const svn_wc_entry_t **new_entry,
SVN_ERR_ASSERT(repos_relpath != NULL
|| entry->schedule == svn_wc_schedule_delete
|| status == svn_wc__db_status_not_present
- || status == svn_wc__db_status_unauthz
+ || status == svn_wc__db_status_server_excluded
|| status == svn_wc__db_status_excluded);
if (repos_relpath)
entry->url = svn_path_url_add_component2(entry->repos,
@@ -1694,7 +1694,7 @@ write_entry(struct write_baton **entry_node,
if (entry->absent)
{
SVN_ERR_ASSERT(base_node && !working_node);
- base_node->presence = svn_wc__db_status_unauthz;
+ base_node->presence = svn_wc__db_status_server_excluded;
}
if (entry->copied)
Index: subversion/libsvn_wc/wc_db.c
===================================================================
--- subversion/libsvn_wc/wc_db.c (revision 1138903)
+++ subversion/libsvn_wc/wc_db.c (working copy)
@@ -285,9 +285,9 @@ static const svn_token_map_t kind_map[] = {
of all the status values. */
static const svn_token_map_t presence_map[] = {
{ "normal", svn_wc__db_status_normal },
- /* ### "absent" is the former name of 'not authorized' state, we should
- * ### change it to "unauthz" in the DB as well with a format bump. */
- { "absent", svn_wc__db_status_unauthz },
+ /* ### "absent" is the former name of the "server-excluded" presence.
+ * ### We should change it to "server-excluded" with a format bump. */
+ { "absent", svn_wc__db_status_server_excluded },
{ "excluded", svn_wc__db_status_excluded },
{ "not-present", svn_wc__db_status_not_present },
{ "incomplete", svn_wc__db_status_incomplete },
@@ -897,7 +897,7 @@ insert_base_node(void *baton,
SVN_ERR(extend_parent_delete(wcroot, local_relpath, scratch_pool));
}
else if (pibb->status == svn_wc__db_status_not_present
- || pibb->status == svn_wc__db_status_unauthz
+ || pibb->status == svn_wc__db_status_server_excluded
|| pibb->status == svn_wc__db_status_excluded)
{
SVN_ERR(retract_parent_delete(wcroot, local_relpath, scratch_pool));
@@ -1819,7 +1819,7 @@ add_absent_excluded_not_present_node(svn_wc__db_t
SVN_ERR_ASSERT(svn_uri_is_canonical(repos_root_url, scratch_pool));
SVN_ERR_ASSERT(repos_uuid != NULL);
SVN_ERR_ASSERT(SVN_IS_VALID_REVNUM(revision));
- SVN_ERR_ASSERT(status == svn_wc__db_status_unauthz
+ SVN_ERR_ASSERT(status == svn_wc__db_status_server_excluded
|| status == svn_wc__db_status_excluded
|| status == svn_wc__db_status_not_present);
@@ -1881,7 +1881,7 @@ svn_wc__db_base_add_absent_node(svn_wc__db_t *db,
const svn_skel_t *work_items,
apr_pool_t *scratch_pool)
{
- SVN_ERR_ASSERT(status == svn_wc__db_status_unauthz
+ SVN_ERR_ASSERT(status == svn_wc__db_status_server_excluded
|| status == svn_wc__db_status_excluded);
return add_absent_excluded_not_present_node(
@@ -3512,7 +3512,7 @@ db_op_copy(svn_wc__db_wcroot_t *src_wcroot,
else
dst_presence = svn_wc__db_status_not_present;
break;
- case svn_wc__db_status_unauthz:
+ case svn_wc__db_status_server_excluded:
return svn_error_createf(SVN_ERR_WC_PATH_UNEXPECTED_STATUS, NULL,
_("Cannot copy '%s' excluded by server"),
path_for_error_message(src_wcroot,
@@ -3739,7 +3739,7 @@ db_op_copy_shadowed_layer(svn_wc__db_wcroot_t *src
an unshadowed depth) */
if (status == svn_wc__db_status_not_present
|| status == svn_wc__db_status_excluded
- || status == svn_wc__db_status_unauthz
+ || status == svn_wc__db_status_server_excluded
|| node_revision != revision
|| node_repos_id != repos_id
|| strcmp(node_repos_relpath, repos_relpath))
@@ -3794,7 +3794,7 @@ db_op_copy_shadowed_layer(svn_wc__db_wcroot_t *src
case svn_wc__db_status_excluded:
dst_presence = svn_wc__db_status_excluded;
break;
- case svn_wc__db_status_unauthz:
+ case svn_wc__db_status_server_excluded:
return svn_error_createf(SVN_ERR_WC_PATH_UNEXPECTED_STATUS, NULL,
_("Cannot copy '%s' excluded by server"),
path_for_error_message(src_wcroot,
@@ -7759,7 +7759,7 @@ check_replace_txn(void *baton,
the delete root. */
if (replaced_status != svn_wc__db_status_not_present
&& replaced_status != svn_wc__db_status_excluded
- && replaced_status != svn_wc__db_status_unauthz
+ && replaced_status != svn_wc__db_status_server_excluded
&& replaced_status != svn_wc__db_status_base_deleted)
crb->is_replace = TRUE;
@@ -8622,7 +8622,8 @@ bump_node_revision(svn_wc__db_wcroot_t *wcroot,
re-absent it, so we can remove the node. */
if (!is_root
&& (status == svn_wc__db_status_not_present
- || (status == svn_wc__db_status_unauthz && revision != new_rev)))
+ || (status == svn_wc__db_status_server_excluded &&
+ revision != new_rev)))
{
return svn_error_return(db_base_remove(NULL, wcroot, local_relpath,
scratch_pool));
@@ -8643,7 +8644,7 @@ bump_node_revision(svn_wc__db_wcroot_t *wcroot,
/* Early out */
if (depth <= svn_depth_empty
|| db_kind != svn_wc__db_kind_dir
- || status == svn_wc__db_status_unauthz
+ || status == svn_wc__db_status_server_excluded
|| status == svn_wc__db_status_excluded
|| status == svn_wc__db_status_not_present)
return SVN_NO_ERROR;
@@ -8725,7 +8726,7 @@ bump_revisions_post_update(void *baton,
switch (status)
{
case svn_wc__db_status_excluded:
- case svn_wc__db_status_unauthz:
+ case svn_wc__db_status_server_excluded:
case svn_wc__db_status_not_present:
return SVN_NO_ERROR;
@@ -10401,7 +10402,7 @@ svn_wc__db_node_hidden(svn_boolean_t *hidden,
wcroot, local_relpath,
scratch_pool, scratch_pool));
- *hidden = (status == svn_wc__db_status_unauthz
+ *hidden = (status == svn_wc__db_status_server_excluded
|| status == svn_wc__db_status_not_present
|| status == svn_wc__db_status_excluded);
Index: subversion/libsvn_wc/wc_db.h
===================================================================
--- subversion/libsvn_wc/wc_db.h (revision 1138903)
+++ subversion/libsvn_wc/wc_db.h (working copy)
@@ -189,7 +189,7 @@ typedef enum svn_wc__db_status_t {
/* This node was named by the server, but no information was provided
* since the user has no authorization to this node. */
- svn_wc__db_status_unauthz,
+ svn_wc__db_status_server_excluded,
/* This node has been administratively excluded. */
svn_wc__db_status_excluded,
@@ -613,7 +613,7 @@ svn_wc__db_base_add_symlink(svn_wc__db_t *db,
The node's kind is described by KIND, and the reason for its absence
is specified by STATUS. Only three values are allowed for STATUS:
- svn_wc__db_status_unauthz
+ svn_wc__db_status_server_excluded
svn_wc__db_status_excluded
If CONFLICT is not NULL, then it describes a conflict for this node. The
@@ -1668,7 +1668,7 @@ svn_wc__db_op_set_tree_conflict(svn_wc__db_t *db,
an ancestor location. Call scan_deletion() to determine the full
details of the operations upon this node.
- svn_wc__db_status_unauthz
+ svn_wc__db_status_server_excluded
The node is versioned/known by the server, but the server has
decided not to provide further information about the node. This
is a BASE node (since changes are not allowed to this node).
Index: subversion/libsvn_wc/node.c
===================================================================
--- subversion/libsvn_wc/node.c (revision 1138903)
+++ subversion/libsvn_wc/node.c (working copy)
@@ -268,7 +268,7 @@ convert_db_kind_to_node_kind(svn_node_kind_t *node
switch (db_status)
{
case svn_wc__db_status_not_present:
- case svn_wc__db_status_unauthz:
+ case svn_wc__db_status_server_excluded:
case svn_wc__db_status_excluded:
*node_kind = svn_node_none;
@@ -619,7 +619,7 @@ walker_helper(svn_wc__db_t *db,
switch (child_status)
{
case svn_wc__db_status_not_present:
- case svn_wc__db_status_unauthz:
+ case svn_wc__db_status_server_excluded:
case svn_wc__db_status_excluded:
continue;
default:
@@ -709,7 +709,7 @@ svn_wc__internal_walk_children(svn_wc__db_t *db,
if (db_kind == svn_wc__db_kind_file
|| status == svn_wc__db_status_not_present
|| status == svn_wc__db_status_excluded
- || status == svn_wc__db_status_unauthz)
+ || status == svn_wc__db_status_server_excluded)
return SVN_NO_ERROR;
if (db_kind == svn_wc__db_kind_dir)
@@ -748,10 +748,10 @@ svn_wc__node_is_status_deleted(svn_boolean_t *is_d
}
svn_error_t *
-svn_wc__node_is_status_unauthz(svn_boolean_t *is_unauthz,
- svn_wc_context_t *wc_ctx,
- const char *local_abspath,
- apr_pool_t *scratch_pool)
+svn_wc__node_is_status_server_excluded(svn_boolean_t *is_server_excluded,
+ svn_wc_context_t *wc_ctx,
+ const char *local_abspath,
+ apr_pool_t *scratch_pool)
{
svn_wc__db_status_t status;
@@ -762,7 +762,7 @@ svn_error_t *
NULL, NULL, NULL, NULL, NULL,
wc_ctx->db, local_abspath,
scratch_pool, scratch_pool));
- *is_unauthz = (status == svn_wc__db_status_unauthz);
+ *is_server_excluded = (status == svn_wc__db_status_server_excluded);
return SVN_NO_ERROR;
}
@@ -1107,7 +1107,7 @@ svn_wc__internal_node_get_schedule(svn_wc_schedule
switch (status)
{
case svn_wc__db_status_not_present:
- case svn_wc__db_status_unauthz:
+ case svn_wc__db_status_server_excluded:
case svn_wc__db_status_excluded:
/* We used status normal in the entries world. */
if (schedule)
@@ -1724,7 +1724,7 @@ svn_wc__check_for_obstructions(svn_wc_notify_state
break;
case svn_wc__db_status_excluded:
- case svn_wc__db_status_unauthz:
+ case svn_wc__db_status_server_excluded:
case svn_wc__db_status_incomplete:
*obstruction_state = svn_wc_notify_state_missing;
break;
Index: subversion/libsvn_wc/cleanup.c
===================================================================
--- subversion/libsvn_wc/cleanup.c (revision 1138903)
+++ subversion/libsvn_wc/cleanup.c (working copy)
@@ -89,7 +89,7 @@ repair_timestamps(svn_wc__db_t *db,
NULL, NULL, NULL,
db, local_abspath, scratch_pool, scratch_pool));
- if (status == svn_wc__db_status_unauthz
+ if (status == svn_wc__db_status_server_excluded
|| status == svn_wc__db_status_deleted
|| status == svn_wc__db_status_excluded
|| status == svn_wc__db_status_not_present)
Index: subversion/libsvn_wc/workqueue.c
===================================================================
--- subversion/libsvn_wc/workqueue.c (revision 1138903)
+++ subversion/libsvn_wc/workqueue.c (working copy)
@@ -135,7 +135,7 @@ remove_base_node(svn_wc__db_t *db,
if (wrk_status == svn_wc__db_status_normal
|| wrk_status == svn_wc__db_status_not_present
- || wrk_status == svn_wc__db_status_unauthz)
+ || wrk_status == svn_wc__db_status_server_excluded)
{
base_status = wrk_status;
base_kind = wrk_kind;
Index: subversion/libsvn_client/copy.c
===================================================================
--- subversion/libsvn_client/copy.c (revision 1138903)
+++ subversion/libsvn_client/copy.c (working copy)
@@ -1681,7 +1681,7 @@ repos_to_wc_copy_locked(const apr_array_header_t *
svn_client__copy_pair_t *);
svn_node_kind_t kind;
svn_boolean_t is_excluded;
- svn_boolean_t is_unauthz;
+ svn_boolean_t is_server_excluded;
svn_pool_clear(iterpool);
@@ -1706,10 +1706,11 @@ repos_to_wc_copy_locked(const apr_array_header_t *
}
/* Hidden by server exclusion (not authorized) */
- SVN_ERR(svn_wc__node_is_status_unauthz(&is_unauthz, ctx->wc_ctx,
- pair->dst_abspath_or_url,
- iterpool));
- if (is_unauthz)
+ SVN_ERR(svn_wc__node_is_status_server_excluded(&is_server_excluded,
+ ctx->wc_ctx,
+ pair->dst_abspath_or_url,
+ iterpool));
+ if (is_server_excluded)
{
return svn_error_createf
(SVN_ERR_ENTRY_EXISTS,
Received on 2011-06-23 16:56:03 CEST