You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by hw...@apache.org on 2011/10/11 17:40:11 UTC
svn commit: r1181849 [1/2] - in /subversion/trunk/subversion: libsvn_wc/
tests/libsvn_wc/
Author: hwright
Date: Tue Oct 11 15:40:10 2011
New Revision: 1181849
URL: http://svn.apache.org/viewvc?rev=1181849&view=rev
Log:
Followup to r1181800 by removing the svn_wc__db_kind_t type and replacing it
with the now-public svn_kind_t. This just affects the internals of libsvn_wc,
not any of the public, or quasi-public APIs.
* subversion/tests/libsvn_wc/:
s/svn_wc__db_kind_/svn_kind_/
Modified:
subversion/trunk/subversion/libsvn_wc/adm_crawler.c
subversion/trunk/subversion/libsvn_wc/adm_files.c
subversion/trunk/subversion/libsvn_wc/adm_ops.c
subversion/trunk/subversion/libsvn_wc/ambient_depth_filter_editor.c
subversion/trunk/subversion/libsvn_wc/cleanup.c
subversion/trunk/subversion/libsvn_wc/conflicts.c
subversion/trunk/subversion/libsvn_wc/conflicts.h
subversion/trunk/subversion/libsvn_wc/copy.c
subversion/trunk/subversion/libsvn_wc/crop.c
subversion/trunk/subversion/libsvn_wc/deprecated.c
subversion/trunk/subversion/libsvn_wc/diff_editor.c
subversion/trunk/subversion/libsvn_wc/diff_local.c
subversion/trunk/subversion/libsvn_wc/entries.c
subversion/trunk/subversion/libsvn_wc/externals.c
subversion/trunk/subversion/libsvn_wc/info.c
subversion/trunk/subversion/libsvn_wc/lock.c
subversion/trunk/subversion/libsvn_wc/merge.c
subversion/trunk/subversion/libsvn_wc/node.c
subversion/trunk/subversion/libsvn_wc/props.c
subversion/trunk/subversion/libsvn_wc/props.h
subversion/trunk/subversion/libsvn_wc/questions.c
subversion/trunk/subversion/libsvn_wc/relocate.c
subversion/trunk/subversion/libsvn_wc/status.c
subversion/trunk/subversion/libsvn_wc/translate.c
subversion/trunk/subversion/libsvn_wc/update_editor.c
subversion/trunk/subversion/libsvn_wc/upgrade.c
subversion/trunk/subversion/libsvn_wc/wc.h
subversion/trunk/subversion/libsvn_wc/wc_db.c
subversion/trunk/subversion/libsvn_wc/wc_db.h
subversion/trunk/subversion/libsvn_wc/workqueue.c
subversion/trunk/subversion/libsvn_wc/workqueue.h
subversion/trunk/subversion/tests/libsvn_wc/db-test.c
Modified: subversion/trunk/subversion/libsvn_wc/adm_crawler.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_crawler.c?rev=1181849&r1=1181848&r2=1181849&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_crawler.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_crawler.c Tue Oct 11 15:40:10 2011
@@ -102,7 +102,7 @@ svn_wc_restore(svn_wc_context_t *wc_ctx,
apr_pool_t *scratch_pool)
{
svn_wc__db_status_t status;
- svn_wc__db_kind_t kind;
+ svn_kind_t kind;
svn_node_kind_t disk_kind;
SVN_ERR(svn_io_check_path(local_abspath, &disk_kind, scratch_pool));
@@ -131,7 +131,7 @@ svn_wc_restore(svn_wc_context_t *wc_ctx,
if (status != svn_wc__db_status_normal
&& status != svn_wc__db_status_copied
&& status != svn_wc__db_status_moved_here
- && !(kind == svn_wc__db_kind_dir
+ && !(kind == svn_kind_dir
&& (status == svn_wc__db_status_added
|| status == svn_wc__db_status_incomplete)))
{
@@ -141,7 +141,7 @@ svn_wc_restore(svn_wc_context_t *wc_ctx,
scratch_pool));
}
- if (kind == svn_wc__db_kind_file || kind == svn_wc__db_kind_symlink)
+ if (kind == svn_kind_file || kind == svn_kind_symlink)
SVN_ERR(restore_file(wc_ctx->db, local_abspath, use_commit_times, FALSE,
scratch_pool));
else
@@ -160,19 +160,19 @@ svn_wc_restore(svn_wc_context_t *wc_ctx,
static svn_error_t *
restore_node(svn_wc__db_t *db,
const char *local_abspath,
- svn_wc__db_kind_t kind,
+ svn_kind_t kind,
svn_boolean_t use_commit_times,
svn_wc_notify_func2_t notify_func,
void *notify_baton,
apr_pool_t *scratch_pool)
{
- if (kind == svn_wc__db_kind_file || kind == svn_wc__db_kind_symlink)
+ if (kind == svn_kind_file || kind == svn_kind_symlink)
{
/* Recreate file from text-base */
SVN_ERR(restore_file(db, local_abspath, use_commit_times, TRUE,
scratch_pool));
}
- else if (kind == svn_wc__db_kind_dir)
+ else if (kind == svn_kind_dir)
{
/* Recreating a directory is just a mkdir */
SVN_ERR(svn_io_dir_make(local_abspath, APR_OS_DEFAULT, scratch_pool));
@@ -373,7 +373,7 @@ report_revisions_and_depths(svn_wc__db_t
&& apr_hash_get(dirents, child, APR_HASH_KEY_STRING) == NULL)
{
svn_wc__db_status_t wrk_status;
- svn_wc__db_kind_t wrk_kind;
+ svn_kind_t wrk_kind;
SVN_ERR(svn_wc__db_read_info(&wrk_status, &wrk_kind, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL,
@@ -391,7 +391,7 @@ report_revisions_and_depths(svn_wc__db_t
if (wrk_status == svn_wc__db_status_normal
|| wrk_status == svn_wc__db_status_copied
|| wrk_status == svn_wc__db_status_moved_here
- || (wrk_kind == svn_wc__db_kind_dir
+ || (wrk_kind == svn_kind_dir
&& (wrk_status == svn_wc__db_status_added
|| wrk_status == svn_wc__db_status_incomplete)))
{
@@ -435,8 +435,8 @@ report_revisions_and_depths(svn_wc__db_t
ths->depth = svn_depth_infinity;
/*** Files ***/
- if (ths->kind == svn_wc__db_kind_file ||
- ths->kind == svn_wc__db_kind_symlink)
+ if (ths->kind == svn_kind_file ||
+ ths->kind == svn_kind_symlink)
{
if (report_everything)
{
@@ -489,7 +489,7 @@ report_revisions_and_depths(svn_wc__db_t
} /* end file case */
/*** Directories (in recursive mode) ***/
- else if (ths->kind == svn_wc__db_kind_dir
+ else if (ths->kind == svn_kind_dir
&& (depth > svn_depth_files
|| depth == svn_depth_unknown))
{
@@ -642,7 +642,7 @@ svn_wc_crawl_revisions5(svn_wc_context_t
svn_revnum_t target_rev = SVN_INVALID_REVNUM;
svn_boolean_t start_empty;
svn_wc__db_status_t status;
- svn_wc__db_kind_t target_kind;
+ svn_kind_t target_kind;
const char *repos_relpath, *repos_root_url;
svn_depth_t target_depth;
svn_wc__db_lock_t *target_lock;
@@ -715,7 +715,7 @@ svn_wc_crawl_revisions5(svn_wc_context_t
&& disk_kind == svn_node_none)
{
svn_wc__db_status_t wrk_status;
- svn_wc__db_kind_t wrk_kind;
+ svn_kind_t wrk_kind;
err = svn_wc__db_read_info(&wrk_status, &wrk_kind, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL,
@@ -729,7 +729,7 @@ svn_wc_crawl_revisions5(svn_wc_context_t
{
svn_error_clear(err);
wrk_status = svn_wc__db_status_not_present;
- wrk_kind = svn_wc__db_kind_file;
+ wrk_kind = svn_kind_file;
}
else
SVN_ERR(err);
@@ -743,7 +743,7 @@ svn_wc_crawl_revisions5(svn_wc_context_t
if (wrk_status == svn_wc__db_status_normal
|| wrk_status == svn_wc__db_status_copied
|| wrk_status == svn_wc__db_status_moved_here
- || (wrk_kind == svn_wc__db_kind_dir
+ || (wrk_kind == svn_kind_dir
&& (wrk_status == svn_wc__db_status_added
|| wrk_status == svn_wc__db_status_incomplete)))
{
@@ -768,7 +768,7 @@ svn_wc_crawl_revisions5(svn_wc_context_t
SVN_ERR(reporter->set_path(report_baton, "", target_rev, report_depth,
start_empty, NULL, scratch_pool));
}
- if (target_kind == svn_wc__db_kind_dir)
+ if (target_kind == svn_kind_dir)
{
if (depth != svn_depth_empty)
{
@@ -795,8 +795,7 @@ svn_wc_crawl_revisions5(svn_wc_context_t
}
}
- else if (target_kind == svn_wc__db_kind_file ||
- target_kind == svn_wc__db_kind_symlink)
+ else if (target_kind == svn_kind_file || target_kind == svn_kind_symlink)
{
const char *parent_abspath, *base;
svn_wc__db_status_t parent_status;
@@ -1207,7 +1206,7 @@ svn_wc__internal_transmit_prop_deltas(sv
apr_pool_t *iterpool = svn_pool_create(scratch_pool);
int i;
apr_array_header_t *propmods;
- svn_wc__db_kind_t kind;
+ svn_kind_t kind;
SVN_ERR(svn_wc__db_read_kind(&kind, db, local_abspath, FALSE, iterpool));
@@ -1222,7 +1221,7 @@ svn_wc__internal_transmit_prop_deltas(sv
svn_pool_clear(iterpool);
- if (kind == svn_wc__db_kind_file)
+ if (kind == svn_kind_file)
SVN_ERR(editor->change_file_prop(baton, p->name, p->value,
iterpool));
else
Modified: subversion/trunk/subversion/libsvn_wc/adm_files.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_files.c?rev=1181849&r1=1181848&r2=1181849&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_files.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_files.c Tue Oct 11 15:40:10 2011
@@ -196,7 +196,7 @@ svn_wc__text_base_path_to_read(const cha
apr_pool_t *scratch_pool)
{
svn_wc__db_status_t status;
- svn_wc__db_kind_t kind;
+ svn_kind_t kind;
const svn_checksum_t *checksum;
SVN_ERR(svn_wc__db_read_pristine_info(&status, &kind, NULL, NULL, NULL, NULL,
@@ -205,7 +205,7 @@ svn_wc__text_base_path_to_read(const cha
scratch_pool, scratch_pool));
/* Sanity */
- if (kind != svn_wc__db_kind_file)
+ if (kind != svn_kind_file)
return svn_error_createf(SVN_ERR_NODE_UNEXPECTED_KIND, NULL,
_("Can only get the pristine contents of files; "
"'%s' is not a file"),
@@ -249,7 +249,7 @@ svn_wc__get_pristine_contents(svn_stream
apr_pool_t *scratch_pool)
{
svn_wc__db_status_t status;
- svn_wc__db_kind_t kind;
+ svn_kind_t kind;
const svn_checksum_t *sha1_checksum;
if (size)
@@ -261,7 +261,7 @@ svn_wc__get_pristine_contents(svn_stream
scratch_pool, scratch_pool));
/* Sanity */
- if (kind != svn_wc__db_kind_file)
+ if (kind != svn_kind_file)
return svn_error_createf(SVN_ERR_NODE_UNEXPECTED_KIND, NULL,
_("Can only get the pristine contents of files; "
"'%s' is not a file"),
Modified: subversion/trunk/subversion/libsvn_wc/adm_ops.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_ops.c?rev=1181849&r1=1181848&r2=1181849&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Tue Oct 11 15:40:10 2011
@@ -123,7 +123,7 @@ process_committed_leaf(svn_wc__db_t *db,
apr_pool_t *scratch_pool)
{
svn_wc__db_status_t status;
- svn_wc__db_kind_t kind;
+ svn_kind_t kind;
const svn_checksum_t *copied_checksum;
svn_revnum_t new_changed_rev = new_revnum;
svn_boolean_t have_base;
@@ -145,7 +145,7 @@ process_committed_leaf(svn_wc__db_t *db,
{
const char *adm_abspath;
- if (kind == svn_wc__db_kind_dir)
+ if (kind == svn_kind_dir)
adm_abspath = local_abspath;
else
adm_abspath = svn_dirent_dirname(local_abspath, scratch_pool);
@@ -176,7 +176,7 @@ process_committed_leaf(svn_wc__db_t *db,
SVN_ERR_ASSERT(status == svn_wc__db_status_normal
|| status == svn_wc__db_status_added);
- if (kind != svn_wc__db_kind_dir)
+ if (kind != svn_kind_dir)
{
/* If we sent a delta (meaning: post-copy modification),
then this file will appear in the queue and so we should have
@@ -249,7 +249,7 @@ svn_wc__process_committed_internal(svn_w
const svn_wc_committed_queue_t *queue,
apr_pool_t *scratch_pool)
{
- svn_wc__db_kind_t kind;
+ svn_kind_t kind;
/* NOTE: be wary of making crazy semantic changes in this function, since
svn_wc_process_committed4() calls this. */
@@ -265,7 +265,7 @@ svn_wc__process_committed_internal(svn_w
have been deleted */
SVN_ERR(svn_wc__db_read_kind(&kind, db, local_abspath, TRUE, scratch_pool));
- if (recurse && kind == svn_wc__db_kind_dir)
+ if (recurse && kind == svn_kind_dir)
{
const apr_array_header_t *children;
apr_pool_t *iterpool = svn_pool_create(scratch_pool);
@@ -301,7 +301,7 @@ svn_wc__process_committed_internal(svn_w
continue;
sha1_checksum = NULL;
- if (kind != svn_wc__db_kind_dir && queue != NULL)
+ if (kind != svn_kind_dir && queue != NULL)
{
const committed_queue_item_t *cqi;
@@ -611,7 +611,7 @@ svn_wc__delete_internal(svn_wc_context_t
svn_wc__db_t *db = wc_ctx->db;
svn_error_t *err;
svn_wc__db_status_t status;
- svn_wc__db_kind_t kind;
+ svn_kind_t kind;
svn_boolean_t conflicted;
const apr_array_header_t *conflicts;
@@ -650,7 +650,7 @@ svn_wc__delete_internal(svn_wc_context_t
}
if (status == svn_wc__db_status_normal
- && kind == svn_wc__db_kind_dir)
+ && kind == svn_kind_dir)
{
svn_boolean_t is_wcroot;
SVN_ERR(svn_wc__db_is_wcroot(&is_wcroot, db, local_abspath, pool));
@@ -788,7 +788,7 @@ check_can_add_to_parent(const char **rep
{
const char *parent_abspath = svn_dirent_dirname(local_abspath, scratch_pool);
svn_wc__db_status_t parent_status;
- svn_wc__db_kind_t parent_kind;
+ svn_kind_t parent_kind;
svn_error_t *err;
SVN_ERR(svn_wc__write_check(db, parent_abspath, scratch_pool));
@@ -821,7 +821,7 @@ check_can_add_to_parent(const char **rep
svn_dirent_local_style(local_abspath,
scratch_pool));
}
- else if (parent_kind != svn_wc__db_kind_dir)
+ else if (parent_kind != svn_kind_dir)
return svn_error_createf(SVN_ERR_NODE_UNEXPECTED_KIND, NULL,
_("Can't schedule an addition of '%s'"
" below a not-directory node"),
@@ -1354,7 +1354,7 @@ revert_restore_handle_copied_dirs(svn_bo
if (cancel_func)
SVN_ERR(cancel_func(cancel_baton));
- if (child_info->kind != svn_wc__db_kind_file)
+ if (child_info->kind != svn_kind_file)
continue;
svn_pool_clear(iterpool);
@@ -1384,7 +1384,7 @@ revert_restore_handle_copied_dirs(svn_bo
if (cancel_func)
SVN_ERR(cancel_func(cancel_baton));
- if (child_info->kind != svn_wc__db_kind_dir)
+ if (child_info->kind != svn_kind_dir)
continue;
svn_pool_clear(iterpool);
@@ -1439,7 +1439,7 @@ revert_restore(svn_wc__db_t *db,
{
svn_error_t *err;
svn_wc__db_status_t status;
- svn_wc__db_kind_t kind;
+ svn_kind_t kind;
svn_node_kind_t on_disk;
svn_boolean_t notify_required;
const char *conflict_old;
@@ -1453,7 +1453,7 @@ revert_restore(svn_wc__db_t *db,
svn_boolean_t special;
#endif
svn_boolean_t copied_here;
- svn_wc__db_kind_t reverted_kind;
+ svn_kind_t reverted_kind;
if (cancel_func)
SVN_ERR(cancel_func(cancel_baton));
@@ -1497,7 +1497,7 @@ revert_restore(svn_wc__db_t *db,
* ### trying to restore anything to disk.
* ### 'status' should be status_unknown but that doesn't exist. */
status = svn_wc__db_status_normal;
- kind = svn_wc__db_kind_unknown;
+ kind = svn_kind_unknown;
recorded_size = SVN_INVALID_FILESIZE;
recorded_mod_time = 0;
}
@@ -1538,12 +1538,12 @@ revert_restore(svn_wc__db_t *db,
if (copied_here)
{
/* The revert target itself is the op-root of a copy. */
- if (reverted_kind == svn_wc__db_kind_file && on_disk == svn_node_file)
+ if (reverted_kind == svn_kind_file && on_disk == svn_node_file)
{
SVN_ERR(svn_io_remove_file2(local_abspath, TRUE, scratch_pool));
on_disk = svn_node_none;
}
- else if (reverted_kind == svn_wc__db_kind_dir && on_disk == svn_node_dir)
+ else if (reverted_kind == svn_kind_dir && on_disk == svn_node_dir)
{
svn_boolean_t removed;
@@ -1565,13 +1565,13 @@ revert_restore(svn_wc__db_t *db,
&& status != svn_wc__db_status_excluded
&& status != svn_wc__db_status_not_present)
{
- if (on_disk == svn_node_dir && kind != svn_wc__db_kind_dir)
+ if (on_disk == svn_node_dir && kind != svn_kind_dir)
{
SVN_ERR(svn_io_remove_dir2(local_abspath, FALSE,
cancel_func, cancel_baton, scratch_pool));
on_disk = svn_node_none;
}
- else if (on_disk == svn_node_file && kind != svn_wc__db_kind_file)
+ else if (on_disk == svn_node_file && kind != svn_kind_file)
{
SVN_ERR(svn_io_remove_file2(local_abspath, FALSE, scratch_pool));
on_disk = svn_node_none;
@@ -1696,10 +1696,10 @@ revert_restore(svn_wc__db_t *db,
&& status != svn_wc__db_status_excluded
&& status != svn_wc__db_status_not_present)
{
- if (kind == svn_wc__db_kind_dir)
+ if (kind == svn_kind_dir)
SVN_ERR(svn_io_dir_make(local_abspath, APR_OS_DEFAULT, scratch_pool));
- if (kind == svn_wc__db_kind_file)
+ if (kind == svn_kind_file)
{
svn_skel_t *work_item;
@@ -1730,7 +1730,7 @@ revert_restore(svn_wc__db_t *db,
scratch_pool),
scratch_pool);
- if (depth == svn_depth_infinity && kind == svn_wc__db_kind_dir)
+ if (depth == svn_depth_infinity && kind == svn_kind_dir)
{
apr_pool_t *iterpool = svn_pool_create(scratch_pool);
const apr_array_header_t *children;
@@ -1946,11 +1946,11 @@ revert_partial(svn_wc__db_t *db,
/* For svn_depth_files: don't revert non-files. */
if (depth == svn_depth_files)
{
- svn_wc__db_kind_t kind;
+ svn_kind_t kind;
SVN_ERR(svn_wc__db_read_kind(&kind, db, local_abspath, TRUE,
iterpool));
- if (kind != svn_wc__db_kind_file)
+ if (kind != svn_kind_file)
continue;
}
@@ -2092,7 +2092,7 @@ svn_wc__internal_remove_from_revision_co
svn_error_t *err;
svn_boolean_t left_something = FALSE;
svn_wc__db_status_t status;
- svn_wc__db_kind_t kind;
+ svn_kind_t kind;
/* ### This whole function should be rewritten to run inside a transaction,
### to allow a stable cancel behavior.
@@ -2116,7 +2116,7 @@ svn_wc__internal_remove_from_revision_co
NULL, NULL, NULL, NULL,
db, local_abspath, scratch_pool, scratch_pool));
- if (kind == svn_wc__db_kind_file || kind == svn_wc__db_kind_symlink)
+ if (kind == svn_kind_file || kind == svn_kind_symlink)
{
svn_boolean_t text_modified_p = FALSE;
@@ -2140,7 +2140,7 @@ svn_wc__internal_remove_from_revision_co
/* Remove NAME from DB */
SVN_ERR(svn_wc__db_op_remove_node(db, local_abspath,
SVN_INVALID_REVNUM,
- svn_wc__db_kind_unknown,
+ svn_kind_unknown,
scratch_pool));
/* If we were asked to destroy the working file, do so unless
@@ -2172,7 +2172,7 @@ svn_wc__internal_remove_from_revision_co
const char *node_name = APR_ARRAY_IDX(children, i, const char*);
const char *node_abspath;
svn_wc__db_status_t node_status;
- svn_wc__db_kind_t node_kind;
+ svn_kind_t node_kind;
svn_pool_clear(iterpool);
@@ -2187,7 +2187,7 @@ svn_wc__internal_remove_from_revision_co
iterpool, iterpool));
if (node_status == svn_wc__db_status_normal
- && node_kind == svn_wc__db_kind_dir)
+ && node_kind == svn_kind_dir)
{
svn_boolean_t is_root;
@@ -2206,7 +2206,7 @@ svn_wc__internal_remove_from_revision_co
versioned nodes */
SVN_ERR(svn_wc__db_op_remove_node(db, node_abspath,
SVN_INVALID_REVNUM,
- svn_wc__db_kind_unknown,
+ svn_kind_unknown,
iterpool));
continue;
@@ -2250,7 +2250,7 @@ svn_wc__internal_remove_from_revision_co
{
SVN_ERR(svn_wc__db_op_remove_node(db, local_abspath,
SVN_INVALID_REVNUM,
- svn_wc__db_kind_unknown,
+ svn_kind_unknown,
iterpool));
}
else
Modified: subversion/trunk/subversion/libsvn_wc/ambient_depth_filter_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/ambient_depth_filter_editor.c?rev=1181849&r1=1181848&r2=1181849&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/ambient_depth_filter_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/ambient_depth_filter_editor.c Tue Oct 11 15:40:10 2011
@@ -117,7 +117,7 @@ struct dir_baton
obtaining information for the ambient depth editor */
static svn_error_t *
ambient_read_info(svn_wc__db_status_t *status,
- svn_wc__db_kind_t *kind,
+ svn_kind_t *kind,
svn_depth_t *depth,
svn_wc__db_t *db,
const char *local_abspath,
@@ -136,7 +136,7 @@ ambient_read_info(svn_wc__db_status_t *s
{
svn_error_clear(err);
- *kind = svn_wc__db_kind_unknown;
+ *kind = svn_kind_unknown;
if (status)
*status = svn_wc__db_status_normal;
if (depth)
@@ -186,7 +186,7 @@ make_dir_baton(struct dir_baton **d_p,
{
svn_boolean_t exclude;
svn_wc__db_status_t status;
- svn_wc__db_kind_t kind;
+ svn_kind_t kind;
svn_boolean_t exists = TRUE;
if (!added)
@@ -197,10 +197,10 @@ make_dir_baton(struct dir_baton **d_p,
else
{
status = svn_wc__db_status_not_present;
- kind = svn_wc__db_kind_unknown;
+ kind = svn_kind_unknown;
}
- exists = (kind != svn_wc__db_kind_unknown);
+ exists = (kind != svn_kind_unknown);
if (pb->ambient_depth == svn_depth_empty
|| pb->ambient_depth == svn_depth_files)
@@ -246,7 +246,7 @@ make_file_baton(struct file_baton **f_p,
struct file_baton *f = apr_pcalloc(pool, sizeof(*f));
struct edit_baton *eb = pb->edit_baton;
svn_wc__db_status_t status;
- svn_wc__db_kind_t kind;
+ svn_kind_t kind;
const char *abspath;
SVN_ERR_ASSERT(path);
@@ -268,7 +268,7 @@ make_file_baton(struct file_baton **f_p,
else
{
status = svn_wc__db_status_not_present;
- kind = svn_wc__db_kind_unknown;
+ kind = svn_kind_unknown;
}
if (pb->ambient_depth == svn_depth_empty)
@@ -281,7 +281,7 @@ make_file_baton(struct file_baton **f_p,
if (status == svn_wc__db_status_not_present
|| status == svn_wc__db_status_server_excluded
|| status == svn_wc__db_status_excluded
- || kind == svn_wc__db_kind_unknown)
+ || kind == svn_kind_unknown)
{
f->ambiently_excluded = TRUE;
*f_p = f;
@@ -340,7 +340,7 @@ open_root(void *edit_baton,
if (! *eb->target)
{
/* For an update with a NULL target, this is equivalent to open_dir(): */
- svn_wc__db_kind_t kind;
+ svn_kind_t kind;
svn_wc__db_status_t status;
svn_depth_t depth;
@@ -349,7 +349,7 @@ open_root(void *edit_baton,
eb->db, eb->anchor_abspath,
pool));
- if (kind != svn_wc__db_kind_unknown
+ if (kind != svn_kind_unknown
&& status != svn_wc__db_status_not_present
&& status != svn_wc__db_status_excluded
&& status != svn_wc__db_status_server_excluded)
@@ -380,7 +380,7 @@ delete_entry(const char *path,
/* If the entry we want to delete doesn't exist, that's OK.
It's probably an old server that doesn't understand
depths. */
- svn_wc__db_kind_t kind;
+ svn_kind_t kind;
svn_wc__db_status_t status;
const char *abspath;
@@ -389,7 +389,7 @@ delete_entry(const char *path,
SVN_ERR(ambient_read_info(&status, &kind, NULL,
eb->db, abspath, pool));
- if (kind == svn_wc__db_kind_unknown
+ if (kind == svn_kind_unknown
|| status == svn_wc__db_status_not_present
|| status == svn_wc__db_status_excluded
|| status == svn_wc__db_status_server_excluded)
@@ -458,7 +458,7 @@ open_directory(const char *path,
struct edit_baton *eb = pb->edit_baton;
struct dir_baton *b;
const char *local_abspath;
- svn_wc__db_kind_t kind;
+ svn_kind_t kind;
svn_wc__db_status_t status;
svn_depth_t depth;
@@ -480,7 +480,7 @@ open_directory(const char *path,
SVN_ERR(ambient_read_info(&status, &kind, &depth,
eb->db, local_abspath, pool));
- if (kind != svn_wc__db_kind_unknown
+ if (kind != svn_kind_unknown
&& status != svn_wc__db_status_not_present
&& status != svn_wc__db_status_excluded
&& status != svn_wc__db_status_server_excluded)
Modified: subversion/trunk/subversion/libsvn_wc/cleanup.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/cleanup.c?rev=1181849&r1=1181848&r2=1181849&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/cleanup.c (original)
+++ subversion/trunk/subversion/libsvn_wc/cleanup.c Tue Oct 11 15:40:10 2011
@@ -76,7 +76,7 @@ repair_timestamps(svn_wc__db_t *db,
void *cancel_baton,
apr_pool_t *scratch_pool)
{
- svn_wc__db_kind_t kind;
+ svn_kind_t kind;
svn_wc__db_status_t status;
if (cancel_func)
@@ -95,15 +95,15 @@ repair_timestamps(svn_wc__db_t *db,
|| status == svn_wc__db_status_not_present)
return SVN_NO_ERROR;
- if (kind == svn_wc__db_kind_file
- || kind == svn_wc__db_kind_symlink)
+ if (kind == svn_kind_file
+ || kind == svn_kind_symlink)
{
svn_boolean_t modified;
SVN_ERR(svn_wc__internal_file_modified_p(&modified,
db, local_abspath, FALSE,
scratch_pool));
}
- else if (kind == svn_wc__db_kind_dir)
+ else if (kind == svn_kind_dir)
{
apr_pool_t *iterpool = svn_pool_create(scratch_pool);
const apr_array_header_t *children;
Modified: subversion/trunk/subversion/libsvn_wc/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/conflicts.c?rev=1181849&r1=1181848&r2=1181849&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.c Tue Oct 11 15:40:10 2011
@@ -180,7 +180,7 @@ resolve_conflict_on_node(svn_wc__db_t *d
const char *conflict_new = NULL;
const char *conflict_working = NULL;
const char *prop_reject_file = NULL;
- svn_wc__db_kind_t kind;
+ svn_kind_t kind;
int i;
const apr_array_header_t *conflicts;
const char *conflict_dir_abspath;
@@ -208,7 +208,7 @@ resolve_conflict_on_node(svn_wc__db_t *d
prop_reject_file = desc->their_abspath;
}
- if (kind == svn_wc__db_kind_dir)
+ if (kind == svn_kind_dir)
conflict_dir_abspath = local_abspath;
else
conflict_dir_abspath = svn_dirent_dirname(local_abspath, pool);
@@ -503,7 +503,7 @@ recursive_resolve_conflict(svn_wc__db_t
const char *name = APR_ARRAY_IDX(children, i, const char *);
const char *child_abspath;
svn_wc__db_status_t status;
- svn_wc__db_kind_t kind;
+ svn_kind_t kind;
svn_boolean_t conflicted;
svn_pool_clear(iterpool);
@@ -526,10 +526,10 @@ recursive_resolve_conflict(svn_wc__db_t
continue;
apr_hash_set(visited, name, APR_HASH_KEY_STRING, name);
- if (kind == svn_wc__db_kind_dir && depth < svn_depth_immediates)
+ if (kind == svn_kind_dir && depth < svn_depth_immediates)
continue;
- if (kind == svn_wc__db_kind_dir)
+ if (kind == svn_kind_dir)
SVN_ERR(recursive_resolve_conflict(db,
child_abspath,
conflicted,
@@ -603,7 +603,7 @@ svn_wc_resolved_conflict5(svn_wc_context
void *notify_baton,
apr_pool_t *scratch_pool)
{
- svn_wc__db_kind_t kind;
+ svn_kind_t kind;
svn_boolean_t conflicted;
/* ### the underlying code does NOT support resolving individual
### properties. bail out if the caller tries it. */
@@ -621,7 +621,7 @@ svn_wc_resolved_conflict5(svn_wc_context
/* When the implementation still used the entry walker, depth
unknown was translated to infinity. */
- if (kind != svn_wc__db_kind_dir)
+ if (kind != svn_kind_dir)
depth = svn_depth_empty;
else if (depth == svn_depth_unknown)
depth = svn_depth_infinity;
Modified: subversion/trunk/subversion/libsvn_wc/conflicts.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/conflicts.h?rev=1181849&r1=1181848&r2=1181849&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.h (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.h Tue Oct 11 15:40:10 2011
@@ -222,12 +222,12 @@ svn_error_t *
svn_wc__conflict_skel_add_tree_conflict(
svn_skel_t *skel,
svn_wc_conflict_reason_t local_change,
- svn_wc__db_kind_t original_local_kind,
+ svn_kind_t original_local_kind,
const svn_checksum_t *original_checksum,
- svn_wc__db_kind_t mine_local_kind,
+ svn_kind_t mine_local_kind,
const svn_checksum_t *mine_checksum,
svn_wc_conflict_action_t incoming_change,
- svn_wc__db_kind_t incoming_kind,
+ svn_kind_t incoming_kind,
const svn_checksum_t *incoming_checksum,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
Modified: subversion/trunk/subversion/libsvn_wc/copy.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/copy.c?rev=1181849&r1=1181848&r2=1181849&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/copy.c (original)
+++ subversion/trunk/subversion/libsvn_wc/copy.c Tue Oct 11 15:40:10 2011
@@ -183,7 +183,7 @@ copy_pristine_text_if_necessary(svn_wc__
versioned file itself.
This also works for versioned symlinks that are stored in the db as
- svn_wc__db_kind_file with svn:special set. */
+ svn_kind_file with svn:special set. */
static svn_error_t *
copy_versioned_file(svn_wc__db_t *db,
const char *src_abspath,
@@ -410,7 +410,7 @@ copy_versioned_dir(svn_wc__db_t *db,
{
const char *child_name, *child_src_abspath, *child_dst_abspath;
svn_wc__db_status_t child_status;
- svn_wc__db_kind_t child_kind;
+ svn_kind_t child_kind;
svn_boolean_t op_root;
svn_boolean_t conflicted;
const svn_checksum_t *checksum;
@@ -441,7 +441,7 @@ copy_versioned_dir(svn_wc__db_t *db,
|| child_status == svn_wc__db_status_added)
{
/* We have more work to do than just changing the DB */
- if (child_kind == svn_wc__db_kind_file)
+ if (child_kind == svn_kind_file)
{
svn_boolean_t skip = FALSE;
@@ -470,7 +470,7 @@ copy_versioned_dir(svn_wc__db_t *db,
NULL, NULL,
iterpool));
}
- else if (child_kind == svn_wc__db_kind_dir)
+ else if (child_kind == svn_kind_dir)
SVN_ERR(copy_versioned_dir(db,
child_src_abspath, child_dst_abspath,
dst_op_root_abspath, tmpdir_abspath,
@@ -589,7 +589,7 @@ copy_or_move(svn_wc_context_t *wc_ctx,
apr_pool_t *scratch_pool)
{
svn_wc__db_t *db = wc_ctx->db;
- svn_wc__db_kind_t src_db_kind;
+ svn_kind_t src_db_kind;
const char *dstdir_abspath;
svn_boolean_t conflicted;
const svn_checksum_t *checksum;
@@ -770,8 +770,8 @@ copy_or_move(svn_wc_context_t *wc_ctx,
dst_abspath,
scratch_pool, scratch_pool));
- if (src_db_kind == svn_wc__db_kind_file
- || src_db_kind == svn_wc__db_kind_symlink)
+ if (src_db_kind == svn_kind_file
+ || src_db_kind == svn_kind_symlink)
{
SVN_ERR(copy_versioned_file(db, src_abspath, dst_abspath, dst_abspath,
tmpdir_abspath, checksum,
@@ -948,7 +948,7 @@ remove_all_conflict_markers(svn_wc__db_t
svn_dirent_join(wc_dir_abspath, name, iterpool),
iterpool));
}
- if (info->kind == svn_wc__db_kind_dir)
+ if (info->kind == svn_kind_dir)
{
svn_pool_clear(iterpool);
SVN_ERR(remove_all_conflict_markers(
@@ -990,7 +990,7 @@ svn_wc_move(svn_wc_context_t *wc_ctx,
SVN_ERR(svn_io_file_rename(src_abspath, dst_abspath, scratch_pool));
{
- svn_wc__db_kind_t kind;
+ svn_kind_t kind;
svn_boolean_t conflicted;
SVN_ERR(svn_wc__db_read_info(NULL, &kind, NULL, NULL, NULL, NULL, NULL,
@@ -1001,7 +1001,7 @@ svn_wc_move(svn_wc_context_t *wc_ctx,
db, src_abspath,
scratch_pool, scratch_pool));
- if (kind == svn_wc__db_kind_dir)
+ if (kind == svn_kind_dir)
SVN_ERR(remove_all_conflict_markers(db, src_abspath, dst_abspath,
scratch_pool));
Modified: subversion/trunk/subversion/libsvn_wc/crop.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/crop.c?rev=1181849&r1=1181848&r2=1181849&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/crop.c (original)
+++ subversion/trunk/subversion/libsvn_wc/crop.c Tue Oct 11 15:40:10 2011
@@ -98,7 +98,7 @@ crop_children(svn_wc__db_t *db,
const char *child_name = APR_ARRAY_IDX(children, i, const char *);
const char *child_abspath;
svn_wc__db_status_t child_status;
- svn_wc__db_kind_t kind;
+ svn_kind_t kind;
svn_depth_t child_depth;
svn_pool_clear(iterpool);
@@ -117,18 +117,18 @@ crop_children(svn_wc__db_t *db,
child_status == svn_wc__db_status_excluded ||
child_status == svn_wc__db_status_not_present)
{
- svn_depth_t remove_below = (kind == svn_wc__db_kind_dir)
+ svn_depth_t remove_below = (kind == svn_kind_dir)
? svn_depth_immediates
: svn_depth_files;
if (new_depth < remove_below)
SVN_ERR(svn_wc__db_op_remove_node(db, local_abspath,
SVN_INVALID_REVNUM,
- svn_wc__db_kind_unknown,
+ svn_kind_unknown,
iterpool));
continue;
}
- else if (kind == svn_wc__db_kind_file)
+ else if (kind == svn_kind_file)
{
/* We currently crop on a directory basis. So don't worry about
svn_depth_exclude here. And even we permit excluding a single
@@ -148,7 +148,7 @@ crop_children(svn_wc__db_t *db,
continue;
}
- else if (kind == svn_wc__db_kind_dir)
+ else if (kind == svn_kind_dir)
{
if (new_depth < svn_depth_immediates)
{
@@ -209,7 +209,7 @@ svn_wc_exclude(svn_wc_context_t *wc_ctx,
{
svn_boolean_t is_root, is_switched;
svn_wc__db_status_t status;
- svn_wc__db_kind_t kind;
+ svn_kind_t kind;
svn_revnum_t revision;
const char *repos_relpath, *repos_root, *repos_uuid;
@@ -318,7 +318,7 @@ svn_wc_crop_tree2(svn_wc_context_t *wc_c
{
svn_wc__db_t *db = wc_ctx->db;
svn_wc__db_status_t status;
- svn_wc__db_kind_t kind;
+ svn_kind_t kind;
svn_depth_t dir_depth;
/* Only makes sense when the depth is restrictive. */
@@ -335,7 +335,7 @@ svn_wc_crop_tree2(svn_wc_context_t *wc_c
db, local_abspath,
scratch_pool, scratch_pool));
- if (kind != svn_wc__db_kind_dir)
+ if (kind != svn_kind_dir)
return svn_error_create(SVN_ERR_UNSUPPORTED_FEATURE, NULL,
_("Can only crop directories"));
Modified: subversion/trunk/subversion/libsvn_wc/deprecated.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/deprecated.c?rev=1181849&r1=1181848&r2=1181849&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/deprecated.c (original)
+++ subversion/trunk/subversion/libsvn_wc/deprecated.c Tue Oct 11 15:40:10 2011
@@ -930,10 +930,10 @@ svn_wc_add3(const char *path,
/* Make sure the caller gets the new access baton in the set. */
if (svn_wc__adm_retrieve_internal2(wc_db, local_abspath, pool) == NULL)
{
- svn_wc__db_kind_t kind;
+ svn_kind_t kind;
SVN_ERR(svn_wc__db_read_kind(&kind, wc_db, local_abspath, FALSE, pool));
- if (kind == svn_wc__db_kind_dir)
+ if (kind == svn_kind_dir)
{
svn_wc_adm_access_t *adm_access;
Modified: subversion/trunk/subversion/libsvn_wc/diff_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/diff_editor.c?rev=1181849&r1=1181848&r2=1181849&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/diff_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/diff_editor.c Tue Oct 11 15:40:10 2011
@@ -839,7 +839,7 @@ walk_local_nodes_diff(struct edit_baton
const char *name = APR_ARRAY_IDX(children, i, const char*);
const char *child_abspath, *child_path;
svn_wc__db_status_t status;
- svn_wc__db_kind_t kind;
+ svn_kind_t kind;
svn_pool_clear(iterpool);
@@ -875,12 +875,12 @@ walk_local_nodes_diff(struct edit_baton
switch (kind)
{
- case svn_wc__db_kind_file:
- case svn_wc__db_kind_symlink:
+ case svn_kind_file:
+ case svn_kind_symlink:
SVN_ERR(file_diff(eb, child_abspath, child_path, iterpool));
break;
- case svn_wc__db_kind_dir:
+ case svn_kind_dir:
/* ### TODO: Don't know how to do replaced dirs. How do I get
information about what is being replaced? If it was a
directory then the directory elements are also going to be
@@ -1080,7 +1080,7 @@ report_wc_directory_as_added(struct edit
const char *name = APR_ARRAY_IDX(children, i, const char *);
const char *child_abspath, *child_path;
svn_wc__db_status_t status;
- svn_wc__db_kind_t kind;
+ svn_kind_t kind;
svn_pool_clear(iterpool);
@@ -1111,13 +1111,13 @@ report_wc_directory_as_added(struct edit
switch (kind)
{
- case svn_wc__db_kind_file:
- case svn_wc__db_kind_symlink:
+ case svn_kind_file:
+ case svn_kind_symlink:
SVN_ERR(report_wc_file_as_added(eb, child_abspath, child_path,
iterpool));
break;
- case svn_wc__db_kind_dir:
+ case svn_kind_dir:
if (depth > svn_depth_files || depth == svn_depth_unknown)
{
svn_depth_t depth_below_here = depth;
@@ -1187,7 +1187,7 @@ delete_entry(const char *path,
const char *name = svn_dirent_basename(path, NULL);
const char *local_abspath = svn_dirent_join(pb->local_abspath, name, pool);
svn_wc__db_status_t status;
- svn_wc__db_kind_t kind;
+ svn_kind_t kind;
/* Mark this node as compared in the parent directory's baton. */
apr_hash_set(pb->compared, apr_pstrdup(pb->pool, path),
@@ -1207,8 +1207,8 @@ delete_entry(const char *path,
SVN_ERR(get_empty_file(pb->eb, &empty_file));
switch (kind)
{
- case svn_wc__db_kind_file:
- case svn_wc__db_kind_symlink:
+ case svn_kind_file:
+ case svn_kind_symlink:
/* A delete is required to change working-copy into requested
revision, so diff should show this as an add. Thus compare
the empty file against the current working copy. If
@@ -1245,7 +1245,7 @@ delete_entry(const char *path,
SVN_ERR(report_wc_file_as_added(eb, local_abspath, path, pool));
}
break;
- case svn_wc__db_kind_dir:
+ case svn_kind_dir:
/* A delete is required to change working-copy into requested
revision, so diff should show this as an add. */
SVN_ERR(report_wc_directory_as_added(eb,
Modified: subversion/trunk/subversion/libsvn_wc/diff_local.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/diff_local.c?rev=1181849&r1=1181848&r2=1181849&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/diff_local.c (original)
+++ subversion/trunk/subversion/libsvn_wc/diff_local.c Tue Oct 11 15:40:10 2011
@@ -138,7 +138,7 @@ file_diff(struct diff_baton *eb,
const char *empty_file;
const char *original_repos_relpath;
svn_wc__db_status_t status;
- svn_wc__db_kind_t kind;
+ svn_kind_t kind;
svn_revnum_t revision;
const svn_checksum_t *checksum;
svn_boolean_t op_root;
@@ -167,7 +167,7 @@ file_diff(struct diff_baton *eb,
if (replaced && base_replace /* && !have_more_work */)
{
- svn_wc__db_kind_t base_kind;
+ svn_kind_t base_kind;
SVN_ERR(svn_wc__db_base_get_info(&base_status, &base_kind,
&base_revision,
NULL, NULL, NULL, NULL, NULL, NULL,
@@ -560,14 +560,14 @@ svn_wc_diff6(svn_wc_context_t *wc_ctx,
apr_pool_t *scratch_pool)
{
struct diff_baton eb = { 0 };
- svn_wc__db_kind_t kind;
+ svn_kind_t kind;
svn_boolean_t get_all;
SVN_ERR_ASSERT(svn_dirent_is_absolute(local_abspath));
SVN_ERR(svn_wc__db_read_kind(&kind, wc_ctx->db, local_abspath, FALSE,
scratch_pool));
- if (kind == svn_wc__db_kind_dir)
+ if (kind == svn_kind_dir)
eb.anchor_abspath = local_abspath;
else
eb.anchor_abspath = svn_dirent_dirname(local_abspath, scratch_pool);
Modified: subversion/trunk/subversion/libsvn_wc/entries.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/entries.c?rev=1181849&r1=1181848&r2=1181849&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/entries.c (original)
+++ subversion/trunk/subversion/libsvn_wc/entries.c Tue Oct 11 15:40:10 2011
@@ -61,7 +61,7 @@ typedef struct db_node_t {
const char *parent_relpath;
svn_wc__db_status_t presence;
svn_revnum_t revision;
- svn_node_kind_t kind; /* ### should switch to svn_wc__db_kind_t */
+ svn_node_kind_t kind; /* ### should switch to svn_kind_t */
svn_checksum_t *checksum;
svn_filesize_t translated_size;
svn_revnum_t changed_rev;
@@ -148,7 +148,7 @@ check_file_external(svn_wc_entry_t *entr
apr_pool_t *scratch_pool)
{
svn_wc__db_status_t status;
- svn_wc__db_kind_t kind;
+ svn_kind_t kind;
const char *repos_relpath;
svn_revnum_t peg_revision;
svn_revnum_t revision;
@@ -169,7 +169,7 @@ check_file_external(svn_wc_entry_t *entr
}
if (status == svn_wc__db_status_normal
- && kind == svn_wc__db_kind_file)
+ && kind == svn_kind_file)
{
entry->file_external_path = repos_relpath;
if (SVN_IS_VALID_REVNUM(peg_revision))
@@ -204,7 +204,7 @@ check_file_external(svn_wc_entry_t *entr
*/
static svn_error_t *
get_info_for_deleted(svn_wc_entry_t *entry,
- svn_wc__db_kind_t *kind,
+ svn_kind_t *kind,
const char **repos_relpath,
const svn_checksum_t **checksum,
svn_wc__db_t *db,
@@ -384,7 +384,7 @@ read_one_entry(const svn_wc_entry_t **ne
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
- svn_wc__db_kind_t kind;
+ svn_kind_t kind;
svn_wc__db_status_t status;
svn_wc__db_lock_t *lock;
const char *repos_relpath;
@@ -840,11 +840,11 @@ read_one_entry(const svn_wc_entry_t **ne
if (entry->depth == svn_depth_unknown)
entry->depth = svn_depth_infinity;
- if (kind == svn_wc__db_kind_dir)
+ if (kind == svn_kind_dir)
entry->kind = svn_node_dir;
- else if (kind == svn_wc__db_kind_file)
+ else if (kind == svn_kind_file)
entry->kind = svn_node_file;
- else if (kind == svn_wc__db_kind_symlink)
+ else if (kind == svn_kind_symlink)
entry->kind = svn_node_file; /* ### no symlink kind */
else
entry->kind = svn_node_unknown;
@@ -926,7 +926,7 @@ read_one_entry(const svn_wc_entry_t **ne
/* Let's check for a file external. ugh. */
if (status == svn_wc__db_status_normal
- && kind == svn_wc__db_kind_file)
+ && kind == svn_kind_file)
SVN_ERR(check_file_external(entry, db, entry_abspath, dir_abspath,
result_pool, scratch_pool));
@@ -2500,7 +2500,7 @@ svn_wc_walk_entries3(const char *path,
const char *local_abspath;
svn_wc__db_t *db = svn_wc__adm_get_db(adm_access);
svn_error_t *err;
- svn_wc__db_kind_t kind;
+ svn_kind_t kind;
svn_depth_t depth;
SVN_ERR(svn_dirent_get_absolute(&local_abspath, path, pool));
@@ -2524,7 +2524,7 @@ svn_wc_walk_entries3(const char *path,
walk_baton, pool);
}
- if (kind == svn_wc__db_kind_file || depth == svn_depth_exclude)
+ if (kind == svn_kind_file || depth == svn_depth_exclude)
{
const svn_wc_entry_t *entry;
@@ -2566,7 +2566,7 @@ svn_wc_walk_entries3(const char *path,
return SVN_NO_ERROR;
}
- if (kind == svn_wc__db_kind_dir)
+ if (kind == svn_kind_dir)
return walker_helper(path, adm_access, walk_callbacks, walk_baton,
walk_depth, show_hidden, cancel_func, cancel_baton,
pool);
Modified: subversion/trunk/subversion/libsvn_wc/externals.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/externals.c?rev=1181849&r1=1181848&r2=1181849&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/externals.c (original)
+++ subversion/trunk/subversion/libsvn_wc/externals.c Tue Oct 11 15:40:10 2011
@@ -442,7 +442,7 @@ open_file(const char *path,
void **file_baton)
{
struct edit_baton *eb = parent_baton;
- svn_wc__db_kind_t kind;
+ svn_kind_t kind;
if (strcmp(path, eb->name))
return svn_error_createf(SVN_ERR_WC_PATH_NOT_FOUND, NULL,
_("This editor can only update '%s'"),
@@ -458,7 +458,7 @@ open_file(const char *path,
eb->db, eb->local_abspath,
eb->pool, file_pool));
- if (kind != svn_wc__db_kind_file)
+ if (kind != svn_kind_file)
return svn_error_createf(SVN_ERR_WC_PATH_UNEXPECTED_STATUS, NULL,
_("Node '%s' is no existing file external"),
svn_dirent_local_style(eb->local_abspath,
@@ -670,7 +670,7 @@ close_file(void *file_baton,
&new_pristine_props,
&new_actual_props,
eb->db, eb->local_abspath,
- svn_wc__db_kind_file,
+ svn_kind_file,
NULL, NULL,
NULL /* server_baseprops*/,
base_props,
@@ -956,7 +956,7 @@ svn_wc__crawl_file_external(svn_wc_conte
{
svn_wc__db_t *db = wc_ctx->db;
svn_error_t *err;
- svn_wc__db_kind_t kind;
+ svn_kind_t kind;
svn_wc__db_lock_t *lock;
svn_revnum_t revision;
const char *repos_root_url;
@@ -971,7 +971,7 @@ svn_wc__crawl_file_external(svn_wc_conte
scratch_pool, scratch_pool);
if (err
- || kind == svn_wc__db_kind_dir
+ || kind == svn_kind_dir
|| !update_root)
{
if (err && err->apr_err != SVN_ERR_WC_PATH_NOT_FOUND)
@@ -1055,7 +1055,7 @@ svn_wc__read_external_info(svn_node_kind
{
const char *repos_root_url;
svn_wc__db_status_t status;
- svn_wc__db_kind_t kind;
+ svn_kind_t kind;
svn_error_t *err;
err = svn_wc__db_external_read(&status, &kind, defining_abspath,
@@ -1097,11 +1097,11 @@ svn_wc__read_external_info(svn_node_kind
else
switch(kind)
{
- case svn_wc__db_kind_file:
- case svn_wc__db_kind_symlink:
+ case svn_kind_file:
+ case svn_kind_symlink:
*external_kind = svn_node_file;
break;
- case svn_wc__db_kind_dir:
+ case svn_kind_dir:
*external_kind = svn_node_dir;
break;
default:
@@ -1164,7 +1164,7 @@ svn_wc__external_remove(svn_wc_context_t
apr_pool_t *scratch_pool)
{
svn_wc__db_status_t status;
- svn_wc__db_kind_t kind;
+ svn_kind_t kind;
SVN_ERR(svn_wc__db_external_read(&status, &kind, NULL, NULL, NULL, NULL,
NULL, NULL,
@@ -1174,7 +1174,7 @@ svn_wc__external_remove(svn_wc_context_t
SVN_ERR(svn_wc__db_external_remove(wc_ctx->db, local_abspath, wri_abspath,
NULL, scratch_pool));
- if (kind == svn_wc__db_kind_dir)
+ if (kind == svn_kind_dir)
SVN_ERR(svn_wc_remove_from_revision_control2(wc_ctx, local_abspath,
TRUE, FALSE,
cancel_func, cancel_baton,
Modified: subversion/trunk/subversion/libsvn_wc/info.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/info.c?rev=1181849&r1=1181848&r2=1181849&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/info.c (original)
+++ subversion/trunk/subversion/libsvn_wc/info.c Tue Oct 11 15:40:10 2011
@@ -86,7 +86,7 @@ build_info_for_node(svn_wc__info2_t **in
svn_wc__info2_t *tmpinfo;
const char *repos_relpath;
svn_wc__db_status_t status;
- svn_wc__db_kind_t db_kind;
+ svn_kind_t db_kind;
const char *original_repos_relpath;
const char *original_repos_root_url;
const char *original_uuid;
Modified: subversion/trunk/subversion/libsvn_wc/lock.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/lock.c?rev=1181849&r1=1181848&r2=1181849&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/lock.c (original)
+++ subversion/trunk/subversion/libsvn_wc/lock.c Tue Oct 11 15:40:10 2011
@@ -125,7 +125,7 @@ svn_wc__internal_check_wc(int *wc_format
if (*wc_format >= SVN_WC__WC_NG_VERSION)
{
svn_wc__db_status_t db_status;
- svn_wc__db_kind_t db_kind;
+ svn_kind_t db_kind;
if (check_path)
{
@@ -159,7 +159,7 @@ svn_wc__internal_check_wc(int *wc_format
else
SVN_ERR(err);
- if (db_kind != svn_wc__db_kind_dir)
+ if (db_kind != svn_kind_dir)
{
/* The WC thinks there must be a file, so this is not
a wc-directory */
@@ -593,7 +593,7 @@ open_single(svn_wc_adm_access_t **adm_ac
### adminstrative area. */
static svn_error_t *
adm_available(svn_boolean_t *available,
- svn_wc__db_kind_t *kind,
+ svn_kind_t *kind,
svn_wc__db_t *db,
const char *local_abspath,
apr_pool_t *scratch_pool)
@@ -601,7 +601,7 @@ adm_available(svn_boolean_t *available,
svn_wc__db_status_t status;
if (kind)
- *kind = svn_wc__db_kind_unknown;
+ *kind = svn_kind_unknown;
SVN_ERR(svn_wc__db_read_info(&status, kind, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL,
@@ -659,7 +659,7 @@ do_open(svn_wc_adm_access_t **adm_access
for (i = 0; i < children->nelts; i++)
{
const char *node_abspath;
- svn_wc__db_kind_t kind;
+ svn_kind_t kind;
svn_boolean_t available;
const char *name = APR_ARRAY_IDX(children, i, const char *);
@@ -677,7 +677,7 @@ do_open(svn_wc_adm_access_t **adm_access
node_abspath,
scratch_pool));
- if (kind != svn_wc__db_kind_dir)
+ if (kind != svn_kind_dir)
continue;
if (available)
@@ -885,7 +885,7 @@ svn_wc_adm_retrieve(svn_wc_adm_access_t
apr_pool_t *pool)
{
const char *local_abspath;
- svn_wc__db_kind_t kind = svn_wc__db_kind_unknown;
+ svn_kind_t kind = svn_kind_unknown;
svn_node_kind_t wckind;
svn_error_t *err;
@@ -924,12 +924,12 @@ svn_wc_adm_retrieve(svn_wc_adm_access_t
if (err)
{
- kind = svn_wc__db_kind_unknown;
+ kind = svn_kind_unknown;
svn_error_clear(err);
}
}
- if (kind == svn_wc__db_kind_dir && wckind == svn_node_file)
+ if (kind == svn_kind_dir && wckind == svn_node_file)
{
err = svn_error_createf(
SVN_ERR_WC_NOT_WORKING_COPY, NULL,
@@ -939,7 +939,7 @@ svn_wc_adm_retrieve(svn_wc_adm_access_t
return svn_error_create(SVN_ERR_WC_NOT_LOCKED, err, err->message);
}
- if (kind != svn_wc__db_kind_dir && kind != svn_wc__db_kind_unknown)
+ if (kind != svn_kind_dir && kind != svn_kind_unknown)
{
err = svn_error_createf(
SVN_ERR_WC_NOT_WORKING_COPY, NULL,
@@ -949,7 +949,7 @@ svn_wc_adm_retrieve(svn_wc_adm_access_t
return svn_error_create(SVN_ERR_WC_NOT_LOCKED, err, err->message);
}
- if (kind == svn_wc__db_kind_unknown || wckind == svn_node_none)
+ if (kind == svn_kind_unknown || wckind == svn_node_none)
{
err = svn_error_createf(SVN_ERR_WC_PATH_NOT_FOUND, NULL,
_("Directory '%s' is missing"),
@@ -974,7 +974,7 @@ svn_wc_adm_probe_retrieve(svn_wc_adm_acc
{
const char *dir;
const char *local_abspath;
- svn_wc__db_kind_t kind;
+ svn_kind_t kind;
svn_error_t *err;
SVN_ERR_ASSERT(associated != NULL);
@@ -982,9 +982,9 @@ svn_wc_adm_probe_retrieve(svn_wc_adm_acc
SVN_ERR(svn_dirent_get_absolute(&local_abspath, path, pool));
SVN_ERR(svn_wc__db_read_kind(&kind, associated->db, local_abspath, TRUE, pool));
- if (kind == svn_wc__db_kind_dir)
+ if (kind == svn_kind_dir)
dir = path;
- else if (kind != svn_wc__db_kind_unknown)
+ else if (kind != svn_kind_unknown)
dir = svn_dirent_dirname(path, pool);
else
/* Not a versioned item, probe it */
@@ -1284,7 +1284,7 @@ open_anchor(svn_wc_adm_access_t **anchor
if (! t_access)
{
svn_boolean_t available;
- svn_wc__db_kind_t kind;
+ svn_kind_t kind;
err = adm_available(&available, &kind, db, local_abspath, pool);
@@ -1511,14 +1511,14 @@ svn_wc__acquire_write_lock(const char **
apr_pool_t *scratch_pool)
{
svn_wc__db_t *db = wc_ctx->db;
- svn_wc__db_kind_t kind;
+ svn_kind_t kind;
svn_error_t *err;
SVN_ERR(svn_wc__db_read_kind(&kind, wc_ctx->db, local_abspath,
(lock_root_abspath != NULL),
scratch_pool));
- if (!lock_root_abspath && kind != svn_wc__db_kind_dir)
+ if (!lock_root_abspath && kind != svn_kind_dir)
return svn_error_createf(SVN_ERR_WC_NOT_DIRECTORY, NULL,
_("Can't obtain lock on non-directory '%s'."),
svn_dirent_local_style(local_abspath,
@@ -1527,7 +1527,7 @@ svn_wc__acquire_write_lock(const char **
if (lock_anchor)
{
const char *parent_abspath;
- svn_wc__db_kind_t parent_kind;
+ svn_kind_t parent_kind;
SVN_ERR_ASSERT(lock_root_abspath != NULL);
@@ -1537,12 +1537,12 @@ svn_wc__acquire_write_lock(const char **
if (err && SVN_WC__ERR_IS_NOT_CURRENT_WC(err))
{
svn_error_clear(err);
- parent_kind = svn_wc__db_kind_unknown;
+ parent_kind = svn_kind_unknown;
}
else
SVN_ERR(err);
- if (kind == svn_wc__db_kind_dir && parent_kind == svn_wc__db_kind_dir)
+ if (kind == svn_kind_dir && parent_kind == svn_kind_dir)
{
svn_boolean_t disjoint;
SVN_ERR(child_is_disjoint(&disjoint, wc_ctx->db, local_abspath,
@@ -1550,25 +1550,25 @@ svn_wc__acquire_write_lock(const char **
if (!disjoint)
local_abspath = parent_abspath;
}
- else if (parent_kind == svn_wc__db_kind_dir)
+ else if (parent_kind == svn_kind_dir)
local_abspath = parent_abspath;
- else if (kind != svn_wc__db_kind_dir)
+ else if (kind != svn_kind_dir)
return svn_error_createf(SVN_ERR_WC_NOT_WORKING_COPY, NULL,
_("'%s' is not a working copy"),
svn_dirent_local_style(local_abspath,
scratch_pool));
}
- else if (kind != svn_wc__db_kind_dir)
+ else if (kind != svn_kind_dir)
{
local_abspath = svn_dirent_dirname(local_abspath, scratch_pool);
/* Can't lock parents that don't exist */
- if (kind == svn_wc__db_kind_unknown)
+ if (kind == svn_kind_unknown)
{
SVN_ERR(svn_wc__db_read_kind(&kind, db, local_abspath, FALSE,
scratch_pool));
- if (kind != svn_wc__db_kind_dir)
+ if (kind != svn_kind_dir)
return svn_error_createf(
SVN_ERR_WC_NOT_DIRECTORY, NULL,
_("Can't obtain lock on non-directory '%s'."),
Modified: subversion/trunk/subversion/libsvn_wc/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/merge.c?rev=1181849&r1=1181848&r2=1181849&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/merge.c (original)
+++ subversion/trunk/subversion/libsvn_wc/merge.c Tue Oct 11 15:40:10 2011
@@ -1503,12 +1503,12 @@ svn_wc_merge4(enum svn_wc_merge_outcome_
* unless the merge target is a copyfrom text, which lives in a
* temporary file and does not exist in ACTUAL yet. */
{
- svn_wc__db_kind_t kind;
+ svn_kind_t kind;
svn_boolean_t hidden;
SVN_ERR(svn_wc__db_read_kind(&kind, wc_ctx->db, target_abspath, TRUE,
scratch_pool));
- if (kind == svn_wc__db_kind_unknown)
+ if (kind == svn_kind_unknown)
{
*merge_outcome = svn_wc_merge_no_merge;
return SVN_NO_ERROR;
Modified: subversion/trunk/subversion/libsvn_wc/node.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/node.c?rev=1181849&r1=1181848&r2=1181849&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/node.c (original)
+++ subversion/trunk/subversion/libsvn_wc/node.c Tue Oct 11 15:40:10 2011
@@ -235,28 +235,28 @@ svn_wc__node_get_repos_info(const char *
* even if DB_STATUS indicates that the node is hidden.
* Else, return svn_kind_none for such nodes.
*
- * ### This is a bit ugly. We should consider promoting svn_wc__db_kind_t
+ * ### This is a bit ugly. We should consider promoting svn_kind_t
* ### to the de-facto node kind type instead of converting between them
* ### in non-backwards compat code.
- * ### See also comments at the definition of svn_wc__db_kind_t. */
+ * ### See also comments at the definition of svn_kind_t. */
static svn_error_t *
convert_db_kind_to_node_kind(svn_node_kind_t *node_kind,
- svn_wc__db_kind_t db_kind,
+ svn_kind_t db_kind,
svn_wc__db_status_t db_status,
svn_boolean_t show_hidden)
{
switch (db_kind)
{
- case svn_wc__db_kind_file:
+ case svn_kind_file:
*node_kind = svn_node_file;
break;
- case svn_wc__db_kind_dir:
+ case svn_kind_dir:
*node_kind = svn_node_dir;
break;
- case svn_wc__db_kind_symlink:
+ case svn_kind_symlink:
*node_kind = svn_node_file;
break;
- case svn_wc__db_kind_unknown:
+ case svn_kind_unknown:
*node_kind = svn_node_unknown;
break;
default:
@@ -287,7 +287,7 @@ svn_wc_read_kind(svn_node_kind_t *kind,
apr_pool_t *scratch_pool)
{
svn_wc__db_status_t db_status;
- svn_wc__db_kind_t db_kind;
+ svn_kind_t db_kind;
svn_error_t *err;
err = svn_wc__db_read_info(&db_status, &db_kind, NULL, NULL, NULL, NULL,
@@ -603,7 +603,7 @@ walker_helper(svn_wc__db_t *db,
{
const char *child_name = svn__apr_hash_index_key(hi);
struct svn_wc__db_walker_info_t *wi = svn__apr_hash_index_val(hi);
- svn_wc__db_kind_t child_kind = wi->kind;
+ svn_kind_t child_kind = wi->kind;
svn_wc__db_status_t child_status = wi->status;
const char *child_abspath;
@@ -627,7 +627,7 @@ walker_helper(svn_wc__db_t *db,
}
/* Return the child, if appropriate. */
- if ( (child_kind == svn_wc__db_kind_file
+ if ( (child_kind == svn_kind_file
|| depth >= svn_depth_immediates)
&& svn_wc__internal_changelist_match(db, child_abspath,
changelist_filter,
@@ -646,7 +646,7 @@ walker_helper(svn_wc__db_t *db,
}
/* Recurse into this directory, if appropriate. */
- if (child_kind == svn_wc__db_kind_dir
+ if (child_kind == svn_kind_dir
&& depth >= svn_depth_immediates)
{
svn_depth_t depth_below_here = depth;
@@ -681,7 +681,7 @@ svn_wc__internal_walk_children(svn_wc__d
void *cancel_baton,
apr_pool_t *scratch_pool)
{
- svn_wc__db_kind_t db_kind;
+ svn_kind_t db_kind;
svn_node_kind_t kind;
svn_wc__db_status_t status;
apr_hash_t *changelist_hash = NULL;
@@ -706,13 +706,13 @@ svn_wc__internal_walk_children(svn_wc__d
changelist_hash, scratch_pool))
SVN_ERR(walk_callback(local_abspath, kind, walk_baton, scratch_pool));
- if (db_kind == svn_wc__db_kind_file
+ if (db_kind == svn_kind_file
|| status == svn_wc__db_status_not_present
|| status == svn_wc__db_status_excluded
|| status == svn_wc__db_status_server_excluded)
return SVN_NO_ERROR;
- if (db_kind == svn_wc__db_kind_dir)
+ if (db_kind == svn_kind_dir)
{
return svn_error_trace(
walker_helper(db, local_abspath, show_hidden, changelist_hash,
@@ -1493,7 +1493,7 @@ svn_wc__node_get_commit_status(svn_node_
apr_pool_t *scratch_pool)
{
svn_wc__db_status_t status;
- svn_wc__db_kind_t db_kind;
+ svn_kind_t db_kind;
svn_wc__db_lock_t *lock;
svn_boolean_t had_props;
svn_boolean_t props_mod_tmp;
@@ -1517,9 +1517,9 @@ svn_wc__node_get_commit_status(svn_node_
if (kind)
{
- if (db_kind == svn_wc__db_kind_file)
+ if (db_kind == svn_kind_file)
*kind = svn_node_file;
- else if (db_kind == svn_wc__db_kind_dir)
+ else if (db_kind == svn_kind_dir)
*kind = svn_node_dir;
else
*kind = svn_node_unknown;
@@ -1552,7 +1552,7 @@ svn_wc__node_get_commit_status(svn_node_
apr_hash_t *props;
*symlink = FALSE;
- if (db_kind == svn_wc__db_kind_file
+ if (db_kind == svn_kind_file
&& (had_props || *props_mod))
{
SVN_ERR(svn_wc__db_read_props(&props, wc_ctx->db, local_abspath,
@@ -1653,7 +1653,7 @@ svn_wc__check_for_obstructions(svn_wc_no
apr_pool_t *scratch_pool)
{
svn_wc__db_status_t status;
- svn_wc__db_kind_t db_kind;
+ svn_kind_t db_kind;
svn_node_kind_t disk_kind;
svn_error_t *err;
@@ -1703,7 +1703,7 @@ svn_wc__check_for_obstructions(svn_wc_no
else
SVN_ERR(err);
- if (db_kind != svn_wc__db_kind_dir
+ if (db_kind != svn_kind_dir
|| (status != svn_wc__db_status_normal
&& status != svn_wc__db_status_added))
{
@@ -1718,7 +1718,7 @@ svn_wc__check_for_obstructions(svn_wc_no
/* Check for obstructing working copies */
if (!no_wcroot_check
- && db_kind == svn_wc__db_kind_dir
+ && db_kind == svn_kind_dir
&& status == svn_wc__db_status_normal)
{
svn_boolean_t is_root;
Modified: subversion/trunk/subversion/libsvn_wc/props.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/props.c?rev=1181849&r1=1181848&r2=1181849&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/props.c (original)
+++ subversion/trunk/subversion/libsvn_wc/props.c Tue Oct 11 15:40:10 2011
@@ -225,7 +225,7 @@ svn_wc__perform_props_merge(svn_wc_notif
{
int i;
svn_wc__db_status_t status;
- svn_wc__db_kind_t kind;
+ svn_kind_t kind;
apr_hash_t *pristine_props = NULL;
apr_hash_t *actual_props = NULL;
apr_hash_t *new_pristine_props;
@@ -315,7 +315,7 @@ svn_wc__perform_props_merge(svn_wc_notif
{
const char *dir_abspath;
- if (kind == svn_wc__db_kind_dir)
+ if (kind == svn_kind_dir)
dir_abspath = local_abspath;
else
dir_abspath = svn_dirent_dirname(local_abspath, scratch_pool);
@@ -1532,7 +1532,7 @@ svn_wc__merge_props(svn_skel_t **work_it
apr_hash_t **new_actual_props,
svn_wc__db_t *db,
const char *local_abspath,
- svn_wc__db_kind_t kind,
+ svn_kind_t kind,
const svn_wc_conflict_version_t *left_version,
const svn_wc_conflict_version_t *right_version,
apr_hash_t *server_baseprops,
@@ -1561,7 +1561,7 @@ svn_wc__merge_props(svn_skel_t **work_it
*new_pristine_props = NULL;
*new_actual_props = NULL;
- is_dir = (kind == svn_wc__db_kind_dir);
+ is_dir = (kind == svn_kind_dir);
if (!server_baseprops)
server_baseprops = pristine_props;
@@ -2421,7 +2421,7 @@ svn_wc_prop_set4(svn_wc_context_t *wc_ct
apr_pool_t *scratch_pool)
{
enum svn_prop_kind prop_kind = svn_property_kind(NULL, name);
- svn_wc__db_kind_t kind;
+ svn_kind_t kind;
const char *dir_abspath;
/* we don't do entry properties here */
@@ -2445,7 +2445,7 @@ svn_wc_prop_set4(svn_wc_context_t *wc_ct
SVN_ERR(svn_wc__db_read_kind(&kind, wc_ctx->db, local_abspath, TRUE,
scratch_pool));
- if (kind == svn_wc__db_kind_dir)
+ if (kind == svn_kind_dir)
dir_abspath = local_abspath;
else
dir_abspath = svn_dirent_dirname(local_abspath, scratch_pool);
@@ -2465,7 +2465,7 @@ svn_wc_prop_set4(svn_wc_context_t *wc_ct
return SVN_NO_ERROR;
SVN_ERR(do_propset(wc_ctx->db, local_abspath,
- kind == svn_wc__db_kind_dir
+ kind == svn_kind_dir
? svn_node_dir
: svn_node_file,
name, value, skip_checks,
Modified: subversion/trunk/subversion/libsvn_wc/props.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/props.h?rev=1181849&r1=1181848&r2=1181849&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/props.h (original)
+++ subversion/trunk/subversion/libsvn_wc/props.h Tue Oct 11 15:40:10 2011
@@ -106,7 +106,7 @@ svn_wc__merge_props(svn_skel_t **work_it
apr_hash_t **new_actual_props,
svn_wc__db_t *db,
const char *local_abspath,
- svn_wc__db_kind_t kind,
+ svn_kind_t kind,
const svn_wc_conflict_version_t *left_version,
const svn_wc_conflict_version_t *right_version,
apr_hash_t *server_baseprops,
Modified: subversion/trunk/subversion/libsvn_wc/questions.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/questions.c?rev=1181849&r1=1181848&r2=1181849&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/questions.c (original)
+++ subversion/trunk/subversion/libsvn_wc/questions.c Tue Oct 11 15:40:10 2011
@@ -244,7 +244,7 @@ svn_wc__internal_file_modified_p(svn_boo
svn_stream_t *pristine_stream;
svn_filesize_t pristine_size;
svn_wc__db_status_t status;
- svn_wc__db_kind_t kind;
+ svn_kind_t kind;
const svn_checksum_t *checksum;
svn_filesize_t recorded_size;
apr_time_t recorded_mod_time;
@@ -265,7 +265,7 @@ svn_wc__internal_file_modified_p(svn_boo
/* If we don't have a pristine or the node has a status that allows a
pristine, just say that the node is modified */
if (!checksum
- || (kind != svn_wc__db_kind_file)
+ || (kind != svn_kind_file)
|| ((status != svn_wc__db_status_normal)
&& (status != svn_wc__db_status_added)))
{
@@ -394,7 +394,7 @@ svn_wc__internal_conflicted_p(svn_boolea
apr_pool_t *scratch_pool)
{
svn_node_kind_t kind;
- svn_wc__db_kind_t node_kind;
+ svn_kind_t node_kind;
const apr_array_header_t *conflicts;
int i;
svn_boolean_t conflicted;
Modified: subversion/trunk/subversion/libsvn_wc/relocate.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/relocate.c?rev=1181849&r1=1181848&r2=1181849&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/relocate.c (original)
+++ subversion/trunk/subversion/libsvn_wc/relocate.c Tue Oct 11 15:40:10 2011
@@ -85,7 +85,7 @@ svn_wc_relocate4(svn_wc_context_t *wc_ct
void *validator_baton,
apr_pool_t *scratch_pool)
{
- svn_wc__db_kind_t kind;
+ svn_kind_t kind;
const char *repos_relpath;
const char *old_repos_root, *old_url;
const char *new_repos_root, *new_url;
@@ -131,7 +131,7 @@ svn_wc_relocate4(svn_wc_context_t *wc_ct
wc_ctx->db, local_abspath, scratch_pool,
scratch_pool));
- if (kind != svn_wc__db_kind_dir)
+ if (kind != svn_kind_dir)
return svn_error_create(SVN_ERR_CLIENT_INVALID_RELOCATION, NULL,
_("Cannot relocate a single file"));
Modified: subversion/trunk/subversion/libsvn_wc/status.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/status.c?rev=1181849&r1=1181848&r2=1181849&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/status.c (original)
+++ subversion/trunk/subversion/libsvn_wc/status.c Tue Oct 11 15:40:10 2011
@@ -273,7 +273,7 @@ read_info(const struct svn_wc__db_info_t
if (mtb->have_base
&& (mtb->status == svn_wc__db_status_added
|| mtb->status == svn_wc__db_status_deleted
- || mtb->kind == svn_wc__db_kind_file))
+ || mtb->kind == svn_kind_file))
{
svn_boolean_t update_root;
svn_wc__db_lock_t **lock_arg = NULL;
@@ -288,7 +288,7 @@ read_info(const struct svn_wc__db_info_t
db, local_abspath,
result_pool, scratch_pool));
- mtb->file_external = (update_root && mtb->kind == svn_wc__db_kind_file);
+ mtb->file_external = (update_root && mtb->kind == svn_kind_file);
if (mtb->status == svn_wc__db_status_deleted)
{
@@ -359,7 +359,7 @@ read_info(const struct svn_wc__db_info_t
mtb->has_checksum = (checksum != NULL);
#ifdef HAVE_SYMLINK
- if (mtb->kind == svn_wc__db_kind_file
+ if (mtb->kind == svn_kind_file
&& (mtb->had_props || mtb->props_mod))
{
apr_hash_t *properties;
@@ -512,7 +512,7 @@ assemble_status(svn_wc_status3_t **statu
/* Examine whether our target is missing or obstructed. To detect
* obstructions, we have to look at the on-disk status in DIRENT. */
- if (info->kind == svn_wc__db_kind_dir)
+ if (info->kind == svn_kind_dir)
{
if (info->status == svn_wc__db_status_incomplete || info->incomplete)
{
@@ -575,7 +575,7 @@ assemble_status(svn_wc_status3_t **statu
If it was changed, then the subdir is incomplete or missing/obstructed.
*/
- if (info->kind != svn_wc__db_kind_dir
+ if (info->kind != svn_kind_dir
&& node_status == svn_wc_status_normal)
{
svn_boolean_t text_modified_p = FALSE;
@@ -587,8 +587,8 @@ assemble_status(svn_wc_status3_t **statu
precedence over M. */
/* If the entry is a file, check for textual modifications */
- if ((info->kind == svn_wc__db_kind_file
- || info->kind == svn_wc__db_kind_symlink)
+ if ((info->kind == svn_kind_file
+ || info->kind == svn_kind_symlink)
#ifdef HAVE_SYMLINK
&& (info->special == (dirent && dirent->special))
#endif /* HAVE_SYMLINK */
@@ -663,7 +663,7 @@ assemble_status(svn_wc_status3_t **statu
{
if (!info->op_root)
copied = TRUE; /* And keep status normal */
- else if (info->kind == svn_wc__db_kind_file
+ else if (info->kind == svn_kind_file
&& !info->have_base && !info->have_more_work)
{
/* Simple addition or copy, no replacement */
@@ -735,14 +735,14 @@ assemble_status(svn_wc_status3_t **statu
switch (info->kind)
{
- case svn_wc__db_kind_dir:
+ case svn_kind_dir:
stat->kind = svn_node_dir;
break;
- case svn_wc__db_kind_file:
- case svn_wc__db_kind_symlink:
+ case svn_kind_file:
+ case svn_kind_symlink:
stat->kind = svn_node_file;
break;
- case svn_wc__db_kind_unknown:
+ case svn_kind_unknown:
default:
stat->kind = svn_node_unknown;
}
@@ -1146,11 +1146,11 @@ one_child_status(const struct walk_statu
&& info->status != svn_wc__db_status_not_present
&& info->status != svn_wc__db_status_excluded
&& info->status != svn_wc__db_status_server_excluded
- && !(info->kind == svn_wc__db_kind_unknown
+ && !(info->kind == svn_kind_unknown
&& info->status == svn_wc__db_status_normal))
{
if (depth == svn_depth_files
- && info->kind == svn_wc__db_kind_dir)
+ && info->kind == svn_kind_dir)
{
return SVN_NO_ERROR;
}
@@ -1165,7 +1165,7 @@ one_child_status(const struct walk_statu
/* Descend in subdirectories. */
if (depth == svn_depth_infinity
- && info->kind == svn_wc__db_kind_dir)
+ && info->kind == svn_kind_dir)
{
SVN_ERR(get_dir_status(wb, local_abspath, TRUE,
dir_repos_root_url, dir_repos_relpath,
@@ -2003,7 +2003,7 @@ delete_entry(const char *path,
struct dir_baton *db = parent_baton;
struct edit_baton *eb = db->edit_baton;
const char *local_abspath = svn_dirent_join(eb->anchor_abspath, path, pool);
- svn_wc__db_kind_t kind;
+ svn_kind_t kind;
/* Note: when something is deleted, it's okay to tweak the
statushash immediately. No need to wait until close_file or
@@ -2012,7 +2012,7 @@ delete_entry(const char *path,
SVN_ERR(svn_wc__db_read_kind(&kind, eb->db, local_abspath, FALSE, pool));
SVN_ERR(tweak_statushash(db, db, TRUE, eb->db,
- local_abspath, kind == svn_wc__db_kind_dir,
+ local_abspath, kind == svn_kind_dir,
svn_wc_status_deleted, 0, 0, revision, NULL, pool));
/* Mark the parent dir -- it lost an entry (unless that parent dir
@@ -2021,7 +2021,7 @@ delete_entry(const char *path,
if (db->parent_baton && (! *eb->target_basename))
SVN_ERR(tweak_statushash(db->parent_baton, db, TRUE,eb->db,
db->local_abspath,
- kind == svn_wc__db_kind_dir,
+ kind == svn_kind_dir,
svn_wc_status_modified, svn_wc_status_modified,
0, SVN_INVALID_REVNUM, NULL, pool));
@@ -2604,7 +2604,7 @@ svn_wc__internal_walk_status(svn_wc__db_
SVN_ERR(svn_io_stat_dirent(&dirent, local_abspath, TRUE,
scratch_pool, scratch_pool));
- if (info && info->kind == svn_wc__db_kind_dir)
+ if (info && info->kind == svn_kind_dir)
{
SVN_ERR(get_dir_status(&wb,
local_abspath,
@@ -2716,7 +2716,7 @@ internal_status(svn_wc_status3_t **statu
apr_pool_t *scratch_pool)
{
const svn_io_dirent2_t *dirent;
- svn_wc__db_kind_t node_kind;
+ svn_kind_t node_kind;
const char *parent_repos_relpath;
const char *parent_repos_root_url;
const char *parent_repos_uuid;
@@ -2740,7 +2740,7 @@ internal_status(svn_wc_status3_t **statu
if (err && err->apr_err == SVN_ERR_WC_PATH_NOT_FOUND)
{
svn_error_clear(err);
- node_kind = svn_wc__db_kind_unknown;
+ node_kind = svn_kind_unknown;
/* Ensure conflicted is always set, but don't hide tree conflicts
on 'hidden' nodes. */
conflicted = FALSE;
@@ -2753,10 +2753,10 @@ internal_status(svn_wc_status3_t **statu
|| node_status == svn_wc__db_status_server_excluded
|| node_status == svn_wc__db_status_excluded)
{
- node_kind = svn_wc__db_kind_unknown;
+ node_kind = svn_kind_unknown;
}
- if (node_kind == svn_wc__db_kind_unknown)
+ if (node_kind == svn_kind_unknown)
return svn_error_trace(assemble_unversioned(status,
db, local_abspath,
dirent, conflicted,
Modified: subversion/trunk/subversion/libsvn_wc/translate.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/translate.c?rev=1181849&r1=1181848&r2=1181849&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/translate.c (original)
+++ subversion/trunk/subversion/libsvn_wc/translate.c Tue Oct 11 15:40:10 2011
@@ -365,7 +365,7 @@ svn_wc__sync_flags_with_props(svn_boolea
apr_pool_t *scratch_pool)
{
svn_wc__db_status_t status;
- svn_wc__db_kind_t kind;
+ svn_kind_t kind;
svn_wc__db_lock_t *lock;
apr_hash_t *props = NULL;
@@ -387,7 +387,7 @@ svn_wc__sync_flags_with_props(svn_boolea
/* We actually only care about the following flags on files, so just
early-out for all other types. */
- if (kind != svn_wc__db_kind_file)
+ if (kind != svn_kind_file)
return SVN_NO_ERROR;
/* If we get this far, we're going to change *something*, so just set