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 [2/2] - in /subversion/trunk/subversion: libsvn_wc/
tests/libsvn_wc/
Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=1181849&r1=1181848&r2=1181849&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Tue Oct 11 15:40:10 2011
@@ -1325,7 +1325,7 @@ create_tree_conflict(svn_wc_conflict_des
else
{
/* A BASE node should exist. */
- svn_wc__db_kind_t base_kind;
+ svn_kind_t base_kind;
/* If anything else shows up, then this assertion is probably naive
* and that other case should also be handled. */
@@ -1346,10 +1346,10 @@ create_tree_conflict(svn_wc_conflict_des
result_pool,
scratch_pool));
/* Translate the node kind. */
- if (base_kind == svn_wc__db_kind_file
- || base_kind == svn_wc__db_kind_symlink)
+ if (base_kind == svn_kind_file
+ || base_kind == svn_kind_symlink)
left_kind = svn_node_file;
- else if (base_kind == svn_wc__db_kind_dir)
+ else if (base_kind == svn_kind_dir)
left_kind = svn_node_dir;
else
SVN_ERR_MALFUNCTION();
@@ -1452,7 +1452,7 @@ check_tree_conflict(svn_wc_conflict_desc
struct edit_baton *eb,
const char *local_abspath,
svn_wc__db_status_t working_status,
- svn_wc__db_kind_t working_kind,
+ svn_kind_t working_kind,
svn_boolean_t exists_in_repos,
svn_wc_conflict_action_t action,
svn_node_kind_t their_node_kind,
@@ -1706,7 +1706,7 @@ delete_entry(const char *path,
const char *base = svn_relpath_basename(path, NULL);
const char *local_abspath;
const char *repos_relpath;
- svn_wc__db_kind_t kind, base_kind;
+ svn_kind_t kind, base_kind;
svn_boolean_t conflicted;
svn_boolean_t have_base;
svn_boolean_t have_work;
@@ -1882,7 +1882,7 @@ delete_entry(const char *path,
SVN_ERR(svn_wc__wq_build_base_remove(&work_item,
eb->db, local_abspath,
SVN_INVALID_REVNUM,
- svn_wc__db_kind_unknown,
+ svn_kind_unknown,
scratch_pool, scratch_pool));
}
else
@@ -1912,7 +1912,7 @@ delete_entry(const char *path,
if (pb->shadowed)
action = svn_wc_notify_update_shadowed_delete;
- if (kind == svn_wc__db_kind_dir)
+ if (kind == svn_kind_dir)
node_kind = svn_node_dir;
else
node_kind = svn_node_file;
@@ -1939,7 +1939,7 @@ add_directory(const char *path,
struct dir_baton *db;
svn_node_kind_t kind;
svn_wc__db_status_t status;
- svn_wc__db_kind_t wc_kind;
+ svn_kind_t wc_kind;
svn_boolean_t conflicted;
svn_boolean_t versioned_locally_and_present;
svn_wc_conflict_description2_t *tree_conflict = NULL;
@@ -1995,13 +1995,13 @@ add_directory(const char *path,
return svn_error_trace(err);
svn_error_clear(err);
- wc_kind = svn_wc__db_kind_unknown;
+ wc_kind = svn_kind_unknown;
status = svn_wc__db_status_normal;
conflicted = FALSE;
versioned_locally_and_present = FALSE;
}
- else if (wc_kind == svn_wc__db_kind_dir
+ else if (wc_kind == svn_kind_dir
&& status == svn_wc__db_status_normal)
{
/* !! We found the root of a separate working copy obstructing the wc !!
@@ -2019,7 +2019,7 @@ add_directory(const char *path,
eb->repos_root,
eb->repos_uuid,
*eb->target_revision,
- svn_wc__db_kind_file,
+ svn_kind_file,
NULL, NULL,
pool));
@@ -2033,8 +2033,8 @@ add_directory(const char *path,
return SVN_NO_ERROR;
}
else if (status == svn_wc__db_status_normal
- && (wc_kind == svn_wc__db_kind_file
- || wc_kind == svn_wc__db_kind_symlink))
+ && (wc_kind == svn_kind_file
+ || wc_kind == svn_kind_symlink))
{
/* We found a file external occupating the place we need in BASE.
@@ -2056,7 +2056,7 @@ add_directory(const char *path,
return SVN_NO_ERROR;
}
- else if (wc_kind == svn_wc__db_kind_unknown)
+ else if (wc_kind == svn_kind_unknown)
versioned_locally_and_present = FALSE; /* Tree conflict ACTUAL-only node */
else
versioned_locally_and_present = IS_NODE_PRESENT(status);
@@ -2116,7 +2116,7 @@ add_directory(const char *path,
eb->repos_root,
eb->repos_uuid,
*eb->target_revision,
- svn_wc__db_kind_dir,
+ svn_kind_dir,
NULL, NULL,
pool));
@@ -2155,7 +2155,7 @@ add_directory(const char *path,
/* Is there *something* that is not a dir? */
- local_is_non_dir = (wc_kind != svn_wc__db_kind_dir
+ local_is_non_dir = (wc_kind != svn_kind_dir
&& status != svn_wc__db_status_deleted);
/* Do tree conflict checking if
@@ -2286,7 +2286,7 @@ open_directory(const char *path,
svn_boolean_t conflicted;
svn_wc_conflict_description2_t *tree_conflict = NULL;
svn_wc__db_status_t status, base_status;
- svn_wc__db_kind_t wc_kind;
+ svn_kind_t wc_kind;
SVN_ERR(make_dir_baton(&db, path, eb, pb, FALSE, pool));
*child_baton = db;
@@ -2594,7 +2594,7 @@ close_directory(void *dir_baton,
&new_actual_props,
eb->db,
db->local_abspath,
- svn_wc__db_kind_dir,
+ svn_kind_dir,
NULL, /* left_version */
NULL, /* right_version */
NULL /* use baseprops */,
@@ -2640,7 +2640,7 @@ close_directory(void *dir_baton,
const char *child_relpath;
const svn_dirent_t *dirent;
svn_wc__db_status_t status;
- svn_wc__db_kind_t child_kind;
+ svn_kind_t child_kind;
svn_error_t *err;
svn_pool_clear(iterpool);
@@ -2651,11 +2651,11 @@ close_directory(void *dir_baton,
dirent = svn__apr_hash_index_val(hi);
child_kind = (dirent->kind == svn_node_dir)
- ? svn_wc__db_kind_dir
- : svn_wc__db_kind_file;
+ ? svn_kind_dir
+ : svn_kind_file;
if (db->ambient_depth < svn_depth_immediates
- && child_kind == svn_wc__db_kind_dir)
+ && child_kind == svn_kind_dir)
continue; /* We don't need the subdirs */
/* ### We just check if there is some node in BASE at this path */
@@ -2726,7 +2726,7 @@ close_directory(void *dir_baton,
eb->repos_root,
eb->repos_uuid,
*eb->target_revision,
- svn_wc__db_kind_file,
+ svn_kind_file,
NULL, NULL,
iterpool));
}
@@ -2848,7 +2848,7 @@ close_directory(void *dir_baton,
/* Common code for 'absent_file' and 'absent_directory'. */
static svn_error_t *
absent_node(const char *path,
- svn_wc__db_kind_t absent_kind,
+ svn_kind_t absent_kind,
void *parent_baton,
apr_pool_t *pool)
{
@@ -2859,7 +2859,7 @@ absent_node(const char *path,
const char *local_abspath;
svn_error_t *err;
svn_wc__db_status_t status;
- svn_wc__db_kind_t kind;
+ svn_kind_t kind;
if (pb->skip_this)
return SVN_NO_ERROR;
@@ -2884,11 +2884,11 @@ absent_node(const char *path,
svn_error_clear(err);
status = svn_wc__db_status_not_present;
- kind = svn_wc__db_kind_unknown;
+ kind = svn_kind_unknown;
}
if (status == svn_wc__db_status_normal
- && kind == svn_wc__db_kind_dir)
+ && kind == svn_kind_dir)
{
/* We found an obstructing working copy!
@@ -2954,7 +2954,7 @@ absent_file(const char *path,
void *parent_baton,
apr_pool_t *pool)
{
- return absent_node(path, svn_wc__db_kind_file, parent_baton, pool);
+ return absent_node(path, svn_kind_file, parent_baton, pool);
}
@@ -2964,7 +2964,7 @@ absent_directory(const char *path,
void *parent_baton,
apr_pool_t *pool)
{
- return absent_node(path, svn_wc__db_kind_dir, parent_baton, pool);
+ return absent_node(path, svn_kind_dir, parent_baton, pool);
}
@@ -2981,7 +2981,7 @@ add_file(const char *path,
struct edit_baton *eb = pb->edit_baton;
struct file_baton *fb;
svn_node_kind_t kind = svn_node_none;
- svn_wc__db_kind_t wc_kind = svn_wc__db_kind_unknown;
+ svn_kind_t wc_kind = svn_kind_unknown;
svn_wc__db_status_t status = svn_wc__db_status_normal;
apr_pool_t *scratch_pool;
svn_boolean_t conflicted = FALSE;
@@ -3030,12 +3030,12 @@ add_file(const char *path,
return svn_error_trace(err);
svn_error_clear(err);
- wc_kind = svn_wc__db_kind_unknown;
+ wc_kind = svn_kind_unknown;
conflicted = FALSE;
versioned_locally_and_present = FALSE;
}
- else if (wc_kind == svn_wc__db_kind_dir
+ else if (wc_kind == svn_kind_dir
&& status == svn_wc__db_status_normal)
{
/* !! We found the root of a separate working copy obstructing the wc !!
@@ -3061,8 +3061,8 @@ add_file(const char *path,
return SVN_NO_ERROR;
}
else if (status == svn_wc__db_status_normal
- && (wc_kind == svn_wc__db_kind_file
- || wc_kind == svn_wc__db_kind_symlink))
+ && (wc_kind == svn_kind_file
+ || wc_kind == svn_kind_symlink))
{
/* We found a file external occupating the place we need in BASE.
@@ -3085,7 +3085,7 @@ add_file(const char *path,
return SVN_NO_ERROR;
}
- else if (wc_kind == svn_wc__db_kind_unknown)
+ else if (wc_kind == svn_kind_unknown)
versioned_locally_and_present = FALSE; /* Tree conflict ACTUAL-only node */
else
versioned_locally_and_present = IS_NODE_PRESENT(status);
@@ -3182,8 +3182,8 @@ add_file(const char *path,
scratch_pool, scratch_pool));
/* Is there something that is a file? */
- local_is_file = (wc_kind == svn_wc__db_kind_file
- || wc_kind == svn_wc__db_kind_symlink);
+ local_is_file = (wc_kind == svn_kind_file
+ || wc_kind == svn_kind_symlink);
/* Do tree conflict checking if
* - if there is a local copy.
@@ -3278,7 +3278,7 @@ open_file(const char *path,
svn_boolean_t conflicted;
svn_boolean_t have_work;
svn_wc__db_status_t status;
- svn_wc__db_kind_t wc_kind;
+ svn_kind_t wc_kind;
svn_wc_conflict_description2_t *tree_conflict = NULL;
/* the file_pool can stick around for a *long* time, so we want to use
@@ -4121,7 +4121,7 @@ close_file(void *file_baton,
### verifying again */
SVN_ERR(check_tree_conflict(&tree_conflict, eb, fb->local_abspath,
svn_wc__db_status_added,
- svn_wc__db_kind_file, TRUE,
+ svn_kind_file, TRUE,
svn_wc_conflict_action_add,
svn_node_file, fb->new_relpath, NULL,
scratch_pool, scratch_pool));
@@ -4154,7 +4154,7 @@ close_file(void *file_baton,
&new_actual_props,
eb->db,
working_abspath,
- svn_wc__db_kind_file,
+ svn_kind_file,
NULL /* left_version */,
NULL /* right_version */,
NULL /* server_baseprops (update, not merge) */,
@@ -4293,7 +4293,7 @@ close_file(void *file_baton,
&new_actual_props,
eb->db,
fb->local_abspath,
- svn_wc__db_kind_file,
+ svn_kind_file,
NULL /* left_version */,
NULL /* right_version */,
NULL /* server_baseprops (not merging) */,
@@ -4588,14 +4588,14 @@ fetch_kind_func(svn_node_kind_t *kind,
struct fetch_baton *fpb = baton;
const char *local_abspath = svn_dirent_join(fpb->target_abspath, path,
scratch_pool);
- svn_wc__db_kind_t db_kind;
+ svn_kind_t db_kind;
SVN_ERR(svn_wc__db_read_kind(&db_kind, fpb->db, local_abspath, FALSE,
scratch_pool));
- if (db_kind == svn_wc__db_kind_dir)
+ if (db_kind == svn_kind_dir)
*kind = svn_node_dir;
- else if (db_kind == svn_wc__db_kind_file)
+ else if (db_kind == svn_kind_file)
*kind = svn_node_file;
else
*kind = svn_node_none;
@@ -4739,7 +4739,7 @@ make_editor(svn_revnum_t *target_revisio
depth. In this case the update won't describe additions that would
have been reported if we updated at the ambient depth. */
svn_error_t *err;
- svn_wc__db_kind_t dir_kind;
+ svn_kind_t dir_kind;
svn_wc__db_status_t dir_status;
const char *dir_repos_relpath;
svn_depth_t dir_depth;
@@ -4753,7 +4753,7 @@ make_editor(svn_revnum_t *target_revisio
scratch_pool, scratch_pool);
if (!err
- && dir_kind == svn_wc__db_kind_dir
+ && dir_kind == svn_kind_dir
&& dir_status == svn_wc__db_status_normal)
{
if (dir_depth > depth)
@@ -4809,7 +4809,7 @@ make_editor(svn_revnum_t *target_revisio
db, child_abspath,
iterpool, iterpool));
- if (dir_kind == svn_wc__db_kind_dir
+ if (dir_kind == svn_kind_dir
&& dir_status == svn_wc__db_status_normal
&& dir_depth > svn_depth_empty)
{
@@ -5075,7 +5075,7 @@ svn_wc_get_switch_editor4(const svn_delt
svn_error_t *
svn_wc__check_wc_root(svn_boolean_t *wc_root,
- svn_wc__db_kind_t *kind,
+ svn_kind_t *kind,
svn_boolean_t *switched,
svn_wc__db_t *db,
const char *local_abspath,
@@ -5084,7 +5084,7 @@ svn_wc__check_wc_root(svn_boolean_t *wc_
const char *parent_abspath, *name;
const char *repos_relpath, *repos_root, *repos_uuid;
svn_wc__db_status_t status;
- svn_wc__db_kind_t my_kind;
+ svn_kind_t my_kind;
if (!kind)
kind = &my_kind;
@@ -5108,7 +5108,7 @@ svn_wc__check_wc_root(svn_boolean_t *wc_
*wc_root = FALSE;
return SVN_NO_ERROR;
}
- if (*kind != svn_wc__db_kind_dir)
+ if (*kind != svn_kind_dir)
{
/* File/symlinks cannot be a root. */
*wc_root = FALSE;
@@ -5192,7 +5192,7 @@ svn_wc_is_wc_root2(svn_boolean_t *wc_roo
{
svn_boolean_t is_root;
svn_boolean_t is_switched;
- svn_wc__db_kind_t kind;
+ svn_kind_t kind;
svn_error_t *err;
SVN_ERR_ASSERT(svn_dirent_is_absolute(local_abspath));
@@ -5208,7 +5208,7 @@ svn_wc_is_wc_root2(svn_boolean_t *wc_roo
return svn_error_create(SVN_ERR_ENTRY_NOT_FOUND, err, err->message);
}
- *wc_root = is_root || (kind == svn_wc__db_kind_dir && is_switched);
+ *wc_root = is_root || (kind == svn_kind_dir && is_switched);
return SVN_NO_ERROR;
}
@@ -5248,7 +5248,7 @@ svn_wc_get_actual_target2(const char **a
apr_pool_t *scratch_pool)
{
svn_boolean_t is_wc_root, is_switched;
- svn_wc__db_kind_t kind;
+ svn_kind_t kind;
const char *local_abspath;
svn_error_t *err;
@@ -5270,7 +5270,7 @@ svn_wc_get_actual_target2(const char **a
}
/* If PATH is not a WC root, or if it is a file, lop off a basename. */
- if (!(is_wc_root || is_switched) || (kind != svn_wc__db_kind_dir))
+ if (!(is_wc_root || is_switched) || (kind != svn_kind_dir))
{
svn_dirent_split(anchor, target, path, result_pool);
}
@@ -5308,7 +5308,7 @@ svn_wc_add_repos_file4(svn_wc_context_t
svn_wc__db_t *db = wc_ctx->db;
const char *dir_abspath = svn_dirent_dirname(local_abspath, scratch_pool);
svn_wc__db_status_t status;
- svn_wc__db_kind_t kind;
+ svn_kind_t kind;
const char *tmp_text_base_abspath;
svn_checksum_t *new_text_base_md5_checksum;
svn_checksum_t *new_text_base_sha1_checksum;
@@ -5379,7 +5379,7 @@ svn_wc_add_repos_file4(svn_wc_context_t
svn_dirent_local_style(local_abspath,
scratch_pool));
}
- if (kind != svn_wc__db_kind_dir)
+ if (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"),
Modified: subversion/trunk/subversion/libsvn_wc/upgrade.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/upgrade.c?rev=1181849&r1=1181848&r2=1181849&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/upgrade.c (original)
+++ subversion/trunk/subversion/libsvn_wc/upgrade.c Tue Oct 11 15:40:10 2011
@@ -1997,19 +1997,19 @@ svn_wc__upgrade_add_external_info(svn_wc
svn_revnum_t def_revision,
apr_pool_t *scratch_pool)
{
- svn_wc__db_kind_t db_kind;
+ svn_kind_t db_kind;
switch (kind)
{
case svn_node_dir:
- db_kind = svn_wc__db_kind_dir;
+ db_kind = svn_kind_dir;
break;
case svn_node_file:
- db_kind = svn_wc__db_kind_file;
+ db_kind = svn_kind_file;
break;
case svn_node_unknown:
- db_kind = svn_wc__db_kind_unknown;
+ db_kind = svn_kind_unknown;
break;
default:
Modified: subversion/trunk/subversion/libsvn_wc/wc.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc.h?rev=1181849&r1=1181848&r2=1181849&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc.h (original)
+++ subversion/trunk/subversion/libsvn_wc/wc.h Tue Oct 11 15:40:10 2011
@@ -680,7 +680,7 @@ svn_wc__wipe_postupgrade(const char *dir
*/
svn_error_t *
svn_wc__check_wc_root(svn_boolean_t *wc_root,
- svn_wc__db_kind_t *kind,
+ svn_kind_t *kind,
svn_boolean_t *switched,
svn_wc__db_t *db,
const char *local_abspath,
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1181849&r1=1181848&r2=1181849&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Tue Oct 11 15:40:10 2011
@@ -142,7 +142,7 @@ apr_int64_t svn_wc__db_op_depth_for_upgr
typedef struct insert_base_baton_t {
/* common to all insertions into BASE */
svn_wc__db_status_t status;
- svn_wc__db_kind_t kind;
+ svn_kind_t kind;
apr_int64_t repos_id;
const char *repos_relpath;
svn_revnum_t revision;
@@ -192,7 +192,7 @@ typedef struct insert_base_baton_t {
typedef struct insert_working_baton_t {
/* common to all insertions into WORKING (including NODE_DATA) */
svn_wc__db_status_t presence;
- svn_wc__db_kind_t kind;
+ svn_kind_t kind;
apr_int64_t op_depth;
/* common to all "normal" presence insertions */
@@ -226,7 +226,7 @@ typedef struct insert_working_baton_t {
typedef struct insert_external_baton_t {
/* common to all insertions into EXTERNALS */
- svn_wc__db_kind_t kind;
+ svn_kind_t kind;
svn_wc__db_status_t presence;
/* The repository of the external */
@@ -274,10 +274,10 @@ typedef struct insert_external_baton_t {
static const svn_token_map_t kind_map[] = {
- { "file", svn_wc__db_kind_file },
- { "dir", svn_wc__db_kind_dir },
- { "symlink", svn_wc__db_kind_symlink },
- { "unknown", svn_wc__db_kind_unknown },
+ { "file", svn_kind_file },
+ { "dir", svn_kind_dir },
+ { "symlink", svn_kind_symlink },
+ { "unknown", svn_kind_unknown },
{ NULL }
};
@@ -329,7 +329,7 @@ db_read_pristine_props(apr_hash_t **prop
static svn_error_t *
read_info(svn_wc__db_status_t *status,
- svn_wc__db_kind_t *kind,
+ svn_kind_t *kind,
svn_revnum_t *revision,
const char **repos_relpath,
apr_int64_t *repos_id,
@@ -830,17 +830,17 @@ insert_base_node(void *baton,
pibb->repos_relpath,
pibb->revision,
presence_map, pibb->status, /* 8 */
- (pibb->kind == svn_wc__db_kind_dir) ? /* 9 */
+ (pibb->kind == svn_kind_dir) ? /* 9 */
svn_depth_to_word(pibb->depth) : NULL,
kind_map, pibb->kind, /* 10 */
pibb->changed_rev, /* 11 */
pibb->changed_date, /* 12 */
pibb->changed_author, /* 13 */
- (pibb->kind == svn_wc__db_kind_symlink) ?
+ (pibb->kind == svn_kind_symlink) ?
pibb->target : NULL, /* 19 */
NULL /* 20 */,
moved_to_relpath /* 21 */));
- if (pibb->kind == svn_wc__db_kind_file)
+ if (pibb->kind == svn_kind_file)
{
SVN_ERR(svn_sqlite__bind_checksum(stmt, 14, pibb->checksum,
scratch_pool));
@@ -886,7 +886,7 @@ insert_base_node(void *baton,
wcroot->sdb, scratch_pool));
}
- if (pibb->kind == svn_wc__db_kind_dir && pibb->children)
+ if (pibb->kind == svn_kind_dir && pibb->children)
SVN_ERR(insert_incomplete_children(wcroot->sdb, wcroot->wc_id,
local_relpath,
repos_id,
@@ -1023,18 +1023,18 @@ insert_working_node(void *baton,
piwb->op_depth,
parent_relpath,
presence_map, piwb->presence,
- (piwb->kind == svn_wc__db_kind_dir)
+ (piwb->kind == svn_kind_dir)
? svn_depth_to_word(piwb->depth) : NULL,
kind_map, piwb->kind,
piwb->changed_rev,
piwb->changed_date,
piwb->changed_author,
/* Note: incomplete nodes may have a NULL target. */
- (piwb->kind == svn_wc__db_kind_symlink)
+ (piwb->kind == svn_kind_symlink)
? piwb->target : NULL,
(apr_int64_t)piwb->moved_here));
- if (piwb->kind == svn_wc__db_kind_file)
+ if (piwb->kind == svn_kind_file)
{
SVN_ERR(svn_sqlite__bind_checksum(stmt, 14, piwb->checksum,
scratch_pool));
@@ -1055,7 +1055,7 @@ insert_working_node(void *baton,
The children are part of the same op and so have the same op_depth.
(The only time we'd want a different depth is during a recursive
simple add, but we never insert children here during a simple add.) */
- if (piwb->kind == svn_wc__db_kind_dir && piwb->children)
+ if (piwb->kind == svn_kind_dir && piwb->children)
SVN_ERR(insert_incomplete_children(wcroot->sdb, wcroot->wc_id,
local_relpath,
INVALID_REPOS_ID /* inherit repos_id */,
@@ -1065,7 +1065,7 @@ insert_working_node(void *baton,
piwb->op_depth,
scratch_pool));
- if (piwb->kind == svn_wc__db_kind_dir)
+ if (piwb->kind == svn_kind_dir)
{
SVN_ERR(svn_sqlite__get_statement(&stmt, wcroot->sdb,
STMT_UPDATE_ACTUAL_CLEAR_CHANGELIST));
@@ -1463,7 +1463,7 @@ svn_wc__db_init(svn_wc__db_t *db,
ibb.status = svn_wc__db_status_incomplete;
else
ibb.status = svn_wc__db_status_normal;
- ibb.kind = svn_wc__db_kind_dir;
+ ibb.kind = svn_kind_dir;
ibb.repos_id = repos_id;
ibb.repos_relpath = repos_relpath;
ibb.revision = initial_rev;
@@ -1613,7 +1613,7 @@ svn_wc__db_base_add_directory(svn_wc__db
ibb.repos_uuid = repos_uuid;
ibb.status = svn_wc__db_status_normal;
- ibb.kind = svn_wc__db_kind_dir;
+ ibb.kind = svn_kind_dir;
ibb.repos_relpath = repos_relpath;
ibb.revision = revision;
@@ -1694,7 +1694,7 @@ svn_wc__db_base_add_file(svn_wc__db_t *d
ibb.repos_uuid = repos_uuid;
ibb.status = svn_wc__db_status_normal;
- ibb.kind = svn_wc__db_kind_file;
+ ibb.kind = svn_kind_file;
ibb.repos_relpath = repos_relpath;
ibb.revision = revision;
@@ -1773,7 +1773,7 @@ svn_wc__db_base_add_symlink(svn_wc__db_t
ibb.repos_uuid = repos_uuid;
ibb.status = svn_wc__db_status_normal;
- ibb.kind = svn_wc__db_kind_symlink;
+ ibb.kind = svn_kind_symlink;
ibb.repos_relpath = repos_relpath;
ibb.revision = revision;
@@ -1812,7 +1812,7 @@ add_excluded_or_not_present_node(svn_wc_
const char *repos_root_url,
const char *repos_uuid,
svn_revnum_t revision,
- svn_wc__db_kind_t kind,
+ svn_kind_t kind,
svn_wc__db_status_t status,
const svn_skel_t *conflict,
const svn_skel_t *work_items,
@@ -1884,7 +1884,7 @@ svn_wc__db_base_add_excluded_node(svn_wc
const char *repos_root_url,
const char *repos_uuid,
svn_revnum_t revision,
- svn_wc__db_kind_t kind,
+ svn_kind_t kind,
svn_wc__db_status_t status,
const svn_skel_t *conflict,
const svn_skel_t *work_items,
@@ -1906,7 +1906,7 @@ svn_wc__db_base_add_not_present_node(svn
const char *repos_root_url,
const char *repos_uuid,
svn_revnum_t revision,
- svn_wc__db_kind_t kind,
+ svn_kind_t kind,
const svn_skel_t *conflict,
const svn_skel_t *work_items,
apr_pool_t *scratch_pool)
@@ -1983,7 +1983,7 @@ svn_wc__db_base_remove(svn_wc__db_t *db,
DB+LOCAL_ABSPATH and outputting REPOS_ID instead of URL+UUID. */
static svn_error_t *
base_get_info(svn_wc__db_status_t *status,
- svn_wc__db_kind_t *kind,
+ svn_kind_t *kind,
svn_revnum_t *revision,
const char **repos_relpath,
apr_int64_t *repos_id,
@@ -2013,7 +2013,7 @@ base_get_info(svn_wc__db_status_t *statu
if (have_row)
{
- svn_wc__db_kind_t node_kind = svn_sqlite__column_token(stmt, 3,
+ svn_kind_t node_kind = svn_sqlite__column_token(stmt, 3,
kind_map);
if (kind)
@@ -2047,7 +2047,7 @@ base_get_info(svn_wc__db_status_t *statu
}
if (depth)
{
- if (node_kind != svn_wc__db_kind_dir)
+ if (node_kind != svn_kind_dir)
{
*depth = svn_depth_unknown;
}
@@ -2063,7 +2063,7 @@ base_get_info(svn_wc__db_status_t *statu
}
if (checksum)
{
- if (node_kind != svn_wc__db_kind_file)
+ if (node_kind != svn_kind_file)
{
*checksum = NULL;
}
@@ -2081,7 +2081,7 @@ base_get_info(svn_wc__db_status_t *statu
}
if (target)
{
- if (node_kind != svn_wc__db_kind_symlink)
+ if (node_kind != svn_kind_symlink)
*target = NULL;
else
*target = svn_sqlite__column_text(stmt, 11, result_pool);
@@ -2110,7 +2110,7 @@ base_get_info(svn_wc__db_status_t *statu
svn_error_t *
svn_wc__db_base_get_info(svn_wc__db_status_t *status,
- svn_wc__db_kind_t *kind,
+ svn_kind_t *kind,
svn_revnum_t *revision,
const char **repos_relpath,
const char **repos_root_url,
@@ -2362,7 +2362,7 @@ svn_wc__db_base_clear_dav_cache_recursiv
DB+LOCAL_ABSPATH and outputting REPOS_ID instead of URL+UUID. */
static svn_error_t *
depth_get_info(svn_wc__db_status_t *status,
- svn_wc__db_kind_t *kind,
+ svn_kind_t *kind,
svn_revnum_t *revision,
const char **repos_relpath,
apr_int64_t *repos_id,
@@ -2391,7 +2391,7 @@ depth_get_info(svn_wc__db_status_t *stat
if (have_row)
{
- svn_wc__db_kind_t node_kind = svn_sqlite__column_token(stmt, 3,
+ svn_kind_t node_kind = svn_sqlite__column_token(stmt, 3,
kind_map);
if (kind)
@@ -2423,7 +2423,7 @@ depth_get_info(svn_wc__db_status_t *stat
}
if (depth)
{
- if (node_kind != svn_wc__db_kind_dir)
+ if (node_kind != svn_kind_dir)
{
*depth = svn_depth_unknown;
}
@@ -2439,7 +2439,7 @@ depth_get_info(svn_wc__db_status_t *stat
}
if (checksum)
{
- if (node_kind != svn_wc__db_kind_file)
+ if (node_kind != svn_kind_file)
{
*checksum = NULL;
}
@@ -2457,7 +2457,7 @@ depth_get_info(svn_wc__db_status_t *stat
}
if (target)
{
- if (node_kind != svn_wc__db_kind_symlink)
+ if (node_kind != svn_kind_symlink)
*target = NULL;
else
*target = svn_sqlite__column_text(stmt, 11, result_pool);
@@ -2616,8 +2616,8 @@ insert_external_node(void *baton,
else if (status == svn_wc__db_status_normal && !update_root)
return svn_error_create(SVN_ERR_WC_PATH_UNEXPECTED_STATUS, NULL, NULL);
- if (ieb->kind == svn_wc__db_kind_file
- || ieb->kind == svn_wc__db_kind_symlink)
+ if (ieb->kind == svn_kind_file
+ || ieb->kind == svn_kind_symlink)
{
struct insert_base_baton_t ibb;
@@ -2738,7 +2738,7 @@ svn_wc__db_external_add_file(svn_wc__db_
blank_ieb(&ieb);
- ieb.kind = svn_wc__db_kind_file;
+ ieb.kind = svn_kind_file;
ieb.presence = svn_wc__db_status_normal;
ieb.repos_root_url = repos_root_url;
@@ -2822,7 +2822,7 @@ svn_wc__db_external_add_symlink(svn_wc__
blank_ieb(&ieb);
- ieb.kind = svn_wc__db_kind_symlink;
+ ieb.kind = svn_kind_symlink;
ieb.presence = svn_wc__db_status_normal;
ieb.repos_root_url = repos_root_url;
@@ -2895,7 +2895,7 @@ svn_wc__db_external_add_dir(svn_wc__db_t
blank_ieb(&ieb);
- ieb.kind = svn_wc__db_kind_dir;
+ ieb.kind = svn_kind_dir;
ieb.presence = svn_wc__db_status_normal;
ieb.repos_root_url = repos_root_url;
@@ -2972,7 +2972,7 @@ svn_wc__db_external_remove(svn_wc__db_t
svn_error_t *
svn_wc__db_external_read(svn_wc__db_status_t *status,
- svn_wc__db_kind_t *kind,
+ svn_kind_t *kind,
const char **definining_abspath,
const char **repos_root_url,
const char **repos_uuid,
@@ -3240,7 +3240,7 @@ cross_db_copy(svn_wc__db_wcroot_t *src_w
svn_wc__db_status_t dst_status,
apr_int64_t dst_op_depth,
apr_int64_t dst_np_op_depth,
- svn_wc__db_kind_t kind,
+ svn_kind_t kind,
const apr_array_header_t *children,
apr_int64_t copyfrom_id,
const char *copyfrom_relpath,
@@ -3255,8 +3255,8 @@ cross_db_copy(svn_wc__db_wcroot_t *src_w
apr_hash_t *props;
svn_depth_t depth;
- SVN_ERR_ASSERT(kind == svn_wc__db_kind_file
- || kind == svn_wc__db_kind_dir
+ SVN_ERR_ASSERT(kind == svn_kind_file
+ || kind == svn_kind_dir
);
SVN_ERR(read_info(NULL, NULL, NULL, NULL, NULL,
@@ -3307,7 +3307,7 @@ get_info_for_copy(apr_int64_t *copyfrom_
const char **copyfrom_relpath,
svn_revnum_t *copyfrom_rev,
svn_wc__db_status_t *status,
- svn_wc__db_kind_t *kind,
+ svn_kind_t *kind,
svn_boolean_t *op_root,
svn_boolean_t *have_work,
svn_wc__db_wcroot_t *wcroot,
@@ -3332,7 +3332,7 @@ get_info_for_copy(apr_int64_t *copyfrom_
adjust the relpath */
const char *parent_relpath, *base_name;
svn_wc__db_status_t parent_status;
- svn_wc__db_kind_t parent_kind;
+ svn_kind_t parent_kind;
svn_boolean_t parent_have_work;
svn_dirent_split(&parent_relpath, &base_name, local_relpath,
@@ -3453,7 +3453,7 @@ db_op_copy(svn_wc__db_wcroot_t *src_wcro
apr_int64_t copyfrom_id;
apr_int64_t dst_op_depth;
apr_int64_t dst_np_op_depth;
- svn_wc__db_kind_t kind;
+ svn_kind_t kind;
const apr_array_header_t *children;
SVN_ERR(get_info_for_copy(©from_id, ©from_relpath, ©from_rev,
@@ -3464,7 +3464,7 @@ db_op_copy(svn_wc__db_wcroot_t *src_wcro
copyfrom_relpath, copyfrom_rev,
dst_wcroot, dst_relpath, scratch_pool));
- SVN_ERR_ASSERT(kind == svn_wc__db_kind_file || kind == svn_wc__db_kind_dir);
+ SVN_ERR_ASSERT(kind == svn_kind_file || kind == svn_kind_dir);
/* ### New status, not finished, see notes/wc-ng/copying */
switch (status)
@@ -3532,7 +3532,7 @@ db_op_copy(svn_wc__db_wcroot_t *src_wcro
scratch_pool));
}
- if (kind == svn_wc__db_kind_dir)
+ if (kind == svn_kind_dir)
{
apr_int64_t src_op_depth;
@@ -3595,7 +3595,7 @@ db_op_copy(svn_wc__db_wcroot_t *src_wcro
The children are part of the same op and so have the same op_depth.
(The only time we'd want a different depth is during a recursive
simple add, but we never insert children here during a simple add.) */
- if (kind == svn_wc__db_kind_dir
+ if (kind == svn_kind_dir
&& dst_presence == svn_wc__db_status_normal)
SVN_ERR(insert_incomplete_children(
dst_wcroot->sdb,
@@ -3716,7 +3716,7 @@ db_op_copy_shadowed_layer(svn_wc__db_wcr
const apr_array_header_t *children;
apr_pool_t *iterpool;
svn_wc__db_status_t status;
- svn_wc__db_kind_t kind;
+ svn_kind_t kind;
svn_revnum_t node_revision;
const char *node_repos_relpath;
apr_int64_t node_repos_id;
@@ -4203,7 +4203,7 @@ svn_wc__db_op_copy_dir(svn_wc__db_t *db,
blank_iwb(&iwb);
iwb.presence = svn_wc__db_status_normal;
- iwb.kind = svn_wc__db_kind_dir;
+ iwb.kind = svn_kind_dir;
iwb.props = props;
iwb.changed_rev = changed_rev;
@@ -4278,7 +4278,7 @@ svn_wc__db_op_copy_file(svn_wc__db_t *db
blank_iwb(&iwb);
iwb.presence = svn_wc__db_status_normal;
- iwb.kind = svn_wc__db_kind_file;
+ iwb.kind = svn_kind_file;
iwb.props = props;
iwb.changed_rev = changed_rev;
@@ -4347,7 +4347,7 @@ svn_wc__db_op_copy_symlink(svn_wc__db_t
blank_iwb(&iwb);
iwb.presence = svn_wc__db_status_normal;
- iwb.kind = svn_wc__db_kind_symlink;
+ iwb.kind = svn_kind_symlink;
iwb.props = props;
iwb.changed_rev = changed_rev;
@@ -4401,7 +4401,7 @@ svn_wc__db_op_add_directory(svn_wc__db_t
blank_iwb(&iwb);
iwb.presence = svn_wc__db_status_normal;
- iwb.kind = svn_wc__db_kind_dir;
+ iwb.kind = svn_kind_dir;
iwb.op_depth = relpath_depth(local_relpath);
iwb.work_items = work_items;
@@ -4436,7 +4436,7 @@ svn_wc__db_op_add_file(svn_wc__db_t *db,
blank_iwb(&iwb);
iwb.presence = svn_wc__db_status_normal;
- iwb.kind = svn_wc__db_kind_file;
+ iwb.kind = svn_kind_file;
iwb.op_depth = relpath_depth(local_relpath);
iwb.work_items = work_items;
@@ -4470,7 +4470,7 @@ svn_wc__db_op_add_symlink(svn_wc__db_t *
blank_iwb(&iwb);
iwb.presence = svn_wc__db_status_normal;
- iwb.kind = svn_wc__db_kind_symlink;
+ iwb.kind = svn_kind_symlink;
iwb.op_depth = relpath_depth(local_relpath);
iwb.target = target;
@@ -5494,7 +5494,7 @@ struct revert_list_read_baton {
const char **conflict_working;
const char **prop_reject;
svn_boolean_t *copied_here;
- svn_wc__db_kind_t *kind;
+ svn_kind_t *kind;
apr_pool_t *result_pool;
};
@@ -5512,7 +5512,7 @@ revert_list_read(void *baton,
*(b->conflict_new) = *(b->conflict_old) = *(b->conflict_working) = NULL;
*(b->prop_reject) = NULL;
*(b->copied_here) = FALSE;
- *(b->kind) = svn_wc__db_kind_unknown;
+ *(b->kind) = svn_kind_unknown;
SVN_ERR(svn_sqlite__get_statement(&stmt, wcroot->sdb,
STMT_SELECT_REVERT_LIST));
@@ -5587,7 +5587,7 @@ svn_wc__db_revert_list_read(svn_boolean_
const char **conflict_working,
const char **prop_reject,
svn_boolean_t *copied_here,
- svn_wc__db_kind_t *kind,
+ svn_kind_t *kind,
svn_wc__db_t *db,
const char *local_abspath,
apr_pool_t *result_pool,
@@ -5901,7 +5901,7 @@ svn_wc__db_op_read_tree_conflict(
struct remove_node_baton
{
svn_revnum_t not_present_rev;
- svn_wc__db_kind_t not_present_kind;
+ svn_kind_t not_present_kind;
};
/* Implements svn_wc__db_txn_callback_t for svn_wc__db_op_remove_node */
@@ -5966,7 +5966,7 @@ svn_error_t *
svn_wc__db_op_remove_node(svn_wc__db_t *db,
const char *local_abspath,
svn_revnum_t not_present_revision,
- svn_wc__db_kind_t not_present_kind,
+ svn_kind_t not_present_kind,
apr_pool_t *scratch_pool)
{
svn_wc__db_wcroot_t *wcroot;
@@ -6234,7 +6234,7 @@ op_delete_txn(void *baton,
svn_sqlite__stmt_t *stmt;
apr_int64_t select_depth; /* Depth of what is to be deleted */
svn_boolean_t refetch_depth = FALSE;
- svn_wc__db_kind_t kind;
+ svn_kind_t kind;
SVN_ERR(svn_sqlite__exec_statements(wcroot->sdb, STMT_CREATE_DELETE_LIST));
@@ -6296,7 +6296,7 @@ op_delete_txn(void *baton,
/* If a subtree is being moved-away, we need to update moved-to
* information in BASE for all children that were moved into this
* subtree. */
- if (kind == svn_wc__db_kind_dir)
+ if (kind == svn_kind_dir)
{
apr_pool_t *iterpool;
@@ -6586,7 +6586,7 @@ svn_wc__db_op_delete(svn_wc__db_t *db,
DB+LOCAL_ABSPATH, and outputting repos ids instead of URL+UUID. */
static svn_error_t *
read_info(svn_wc__db_status_t *status,
- svn_wc__db_kind_t *kind,
+ svn_kind_t *kind,
svn_revnum_t *revision,
const char **repos_relpath,
apr_int64_t *repos_id,
@@ -6645,7 +6645,7 @@ read_info(svn_wc__db_status_t *status,
if (have_info)
{
apr_int64_t op_depth;
- svn_wc__db_kind_t node_kind;
+ svn_kind_t node_kind;
op_depth = svn_sqlite__column_int64(stmt_info, 0);
node_kind = svn_sqlite__column_token(stmt_info, 4, kind_map);
@@ -6704,7 +6704,7 @@ read_info(svn_wc__db_status_t *status,
}
if (depth)
{
- if (node_kind != svn_wc__db_kind_dir)
+ if (node_kind != svn_kind_dir)
{
*depth = svn_depth_unknown;
}
@@ -6722,7 +6722,7 @@ read_info(svn_wc__db_status_t *status,
}
if (checksum)
{
- if (node_kind != svn_wc__db_kind_file)
+ if (node_kind != svn_kind_file)
{
*checksum = NULL;
}
@@ -6748,7 +6748,7 @@ read_info(svn_wc__db_status_t *status,
}
if (target)
{
- if (node_kind != svn_wc__db_kind_symlink)
+ if (node_kind != svn_kind_symlink)
*target = NULL;
else
*target = svn_sqlite__column_text(stmt_info, 12, result_pool);
@@ -6865,7 +6865,7 @@ read_info(svn_wc__db_status_t *status,
if (status)
*status = svn_wc__db_status_normal; /* What! No it's not! */
if (kind)
- *kind = svn_wc__db_kind_unknown;
+ *kind = svn_kind_unknown;
if (revision)
*revision = SVN_INVALID_REVNUM;
if (repos_relpath)
@@ -6930,7 +6930,7 @@ read_info(svn_wc__db_status_t *status,
svn_error_t *
svn_wc__db_read_info(svn_wc__db_status_t *status,
- svn_wc__db_kind_t *kind,
+ svn_kind_t *kind,
svn_revnum_t *revision,
const char **repos_relpath,
const char **repos_root_url,
@@ -7114,7 +7114,7 @@ read_children_info(void *baton,
child->changed_author = svn_sqlite__column_text(stmt, 10,
result_pool);
- if (child->kind != svn_wc__db_kind_dir)
+ if (child->kind != svn_kind_dir)
child->depth = svn_depth_unknown;
else
{
@@ -7285,7 +7285,7 @@ svn_wc__db_read_children_info(apr_hash_t
svn_error_t *
svn_wc__db_read_pristine_info(svn_wc__db_status_t *status,
- svn_wc__db_kind_t *kind,
+ svn_kind_t *kind,
svn_revnum_t *changed_rev,
apr_time_t *changed_date,
const char **changed_author,
@@ -7305,7 +7305,7 @@ svn_wc__db_read_pristine_info(svn_wc__db
svn_error_t *err = NULL;
apr_int64_t op_depth;
svn_wc__db_status_t raw_status;
- svn_wc__db_kind_t node_kind;
+ svn_kind_t node_kind;
SVN_ERR_ASSERT(svn_dirent_is_absolute(local_abspath));
@@ -7375,7 +7375,7 @@ svn_wc__db_read_pristine_info(svn_wc__db
}
if (depth)
{
- if (node_kind != svn_wc__db_kind_dir)
+ if (node_kind != svn_kind_dir)
{
*depth = svn_depth_unknown;
}
@@ -7393,7 +7393,7 @@ svn_wc__db_read_pristine_info(svn_wc__db
}
if (checksum)
{
- if (node_kind != svn_wc__db_kind_file)
+ if (node_kind != svn_kind_file)
{
*checksum = NULL;
}
@@ -7419,7 +7419,7 @@ svn_wc__db_read_pristine_info(svn_wc__db
}
if (target)
{
- if (node_kind != svn_wc__db_kind_symlink)
+ if (node_kind != svn_kind_symlink)
*target = NULL;
else
*target = svn_sqlite__column_text(stmt, 12, result_pool);
@@ -8535,7 +8535,7 @@ commit_node(void *baton,
const char *changelist = NULL;
const char *parent_relpath;
svn_wc__db_status_t new_presence;
- svn_wc__db_kind_t new_kind;
+ svn_kind_t new_kind;
const char *new_depth_str = NULL;
svn_sqlite__stmt_t *stmt;
apr_int64_t repos_id;
@@ -8573,7 +8573,7 @@ commit_node(void *baton,
new_kind = svn_sqlite__column_token(stmt_info, 4, kind_map);
/* What will the new depth be? */
- if (new_kind == svn_wc__db_kind_dir)
+ if (new_kind == svn_kind_dir)
new_depth_str = svn_sqlite__column_text(stmt_info, 11, scratch_pool);
/* Check that the repository information is not being changed. */
@@ -8711,7 +8711,7 @@ commit_node(void *baton,
}
}
- if (new_kind == svn_wc__db_kind_dir)
+ if (new_kind == svn_kind_dir)
{
/* When committing a directory, we should have its new children. */
/* ### one day. just not today. */
@@ -8808,7 +8808,7 @@ struct update_baton_t {
svn_error_t *
svn_wc__db_global_update(svn_wc__db_t *db,
const char *local_abspath,
- svn_wc__db_kind_t new_kind,
+ svn_kind_t new_kind,
const char *new_repos_relpath,
svn_revnum_t new_revision,
const apr_hash_t *new_props,
@@ -8945,7 +8945,7 @@ bump_node_revision(svn_wc__db_wcroot_t *
const apr_array_header_t *children;
int i;
svn_wc__db_status_t status;
- svn_wc__db_kind_t db_kind;
+ svn_kind_t db_kind;
svn_revnum_t revision;
const char *repos_relpath;
apr_int64_t repos_id;
@@ -8965,11 +8965,11 @@ bump_node_revision(svn_wc__db_wcroot_t *
/* Skip file externals */
if (update_root
- && db_kind == svn_wc__db_kind_file
+ && db_kind == svn_kind_file
&& !is_root)
return SVN_NO_ERROR;
- if (skip_when_dir && db_kind == svn_wc__db_kind_dir)
+ if (skip_when_dir && db_kind == svn_kind_dir)
return SVN_NO_ERROR;
/* If the node is still marked 'not-present', then the server did not
@@ -9001,7 +9001,7 @@ bump_node_revision(svn_wc__db_wcroot_t *
/* Early out */
if (depth <= svn_depth_empty
- || db_kind != svn_wc__db_kind_dir
+ || db_kind != svn_kind_dir
|| status == svn_wc__db_status_server_excluded
|| status == svn_wc__db_status_excluded
|| status == svn_wc__db_status_not_present)
@@ -9066,7 +9066,7 @@ bump_revisions_post_update(void *baton,
{
struct bump_revisions_baton_t *brb = baton;
svn_wc__db_status_t status;
- svn_wc__db_kind_t kind;
+ svn_kind_t kind;
svn_error_t *err;
apr_int64_t new_repos_id = INVALID_REPOS_ID;
@@ -10372,7 +10372,7 @@ svn_wc__db_upgrade_apply_props(svn_sqlit
svn_error_t *
svn_wc__db_upgrade_insert_external(svn_wc__db_t *db,
const char *local_abspath,
- svn_wc__db_kind_t kind,
+ svn_kind_t kind,
const char *parent_abspath,
const char *def_local_abspath,
const char *repos_relpath,
@@ -10981,7 +10981,7 @@ svn_wc__db_read_conflicts(const apr_arra
svn_error_t *
-svn_wc__db_read_kind(svn_wc__db_kind_t *kind,
+svn_wc__db_read_kind(svn_kind_t *kind,
svn_wc__db_t *db,
const char *local_abspath,
svn_boolean_t allow_missing,
@@ -11007,7 +11007,7 @@ svn_wc__db_read_kind(svn_wc__db_kind_t *
{
if (allow_missing)
{
- *kind = svn_wc__db_kind_unknown;
+ *kind = svn_kind_unknown;
SVN_ERR(svn_sqlite__reset(stmt_info));
return SVN_NO_ERROR;
}
@@ -12061,7 +12061,7 @@ svn_wc__db_temp_op_set_new_dir_to_incomp
ibb.repos_uuid = repos_uuid;
ibb.status = svn_wc__db_status_incomplete;
- ibb.kind = svn_wc__db_kind_dir;
+ ibb.kind = svn_kind_dir;
ibb.repos_relpath = repos_relpath;
ibb.revision = revision;
ibb.depth = depth;
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.h?rev=1181849&r1=1181848&r2=1181849&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.h (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.h Tue Oct 11 15:40:10 2011
@@ -128,37 +128,6 @@ extern "C" {
typedef struct svn_wc__db_t svn_wc__db_t;
-/* Enum indicating what kind of versioned object we're talking about.
-
- ### KFF: That is, my understanding is that this is *not* an enum
- ### indicating what kind of storage the DB is using, even though
- ### one might think that from its name. Rather, the "svn_wc__db_"
- ### is a generic prefix, and this "_kind_t" type indicates the kind
- ### of something that's being stored in the DB.
-
- ### KFF: Does this overlap too much with what svn_node_kind_t does?
-
- ### gjs: possibly. but that doesn't have a symlink kind. and that
- ### cannot simply be added. it would surprise too much code.
- ### (we could probably create svn_node_kind2_t though)
-*/
-typedef enum svn_wc__db_kind_t {
- /* The node is a directory. */
- svn_wc__db_kind_dir,
-
- /* The node is a file. */
- svn_wc__db_kind_file,
-
- /* The node is a symbolic link. */
- svn_wc__db_kind_symlink,
-
- /* The type of the node is not known, due to its absence, exclusion,
- deletion, or incomplete status. */
- svn_wc__db_kind_unknown,
-
-} svn_wc__db_kind_t;
-
-
/* Enumerated values describing the state of a node. */
typedef enum svn_wc__db_status_t {
/* The node is present and has no known modifications applied to it. */
@@ -630,7 +599,7 @@ svn_wc__db_base_add_excluded_node(svn_wc
const char *repos_root_url,
const char *repos_uuid,
svn_revnum_t revision,
- svn_wc__db_kind_t kind,
+ svn_kind_t kind,
svn_wc__db_status_t status,
const svn_skel_t *conflict,
const svn_skel_t *work_items,
@@ -661,7 +630,7 @@ svn_wc__db_base_add_not_present_node(svn
const char *repos_root_url,
const char *repos_uuid,
svn_revnum_t revision,
- svn_wc__db_kind_t kind,
+ svn_kind_t kind,
const svn_skel_t *conflict,
const svn_skel_t *work_items,
apr_pool_t *scratch_pool);
@@ -740,7 +709,7 @@ svn_wc__db_base_remove(svn_wc__db_t *db,
*/
svn_error_t *
svn_wc__db_base_get_info(svn_wc__db_status_t *status,
- svn_wc__db_kind_t *kind,
+ svn_kind_t *kind,
svn_revnum_t *revision,
const char **repos_relpath,
const char **repos_root_url,
@@ -763,7 +732,7 @@ svn_wc__db_base_get_info(svn_wc__db_stat
fields needed by the adm crawler. */
struct svn_wc__db_base_info_t {
svn_wc__db_status_t status;
- svn_wc__db_kind_t kind;
+ svn_kind_t kind;
svn_revnum_t revnum;
const char *repos_relpath;
const char *repos_root_url;
@@ -1148,7 +1117,7 @@ svn_wc__db_external_remove(svn_wc__db_t
*/
svn_error_t *
svn_wc__db_external_read(svn_wc__db_status_t *status,
- svn_wc__db_kind_t *kind,
+ svn_kind_t *kind,
const char **defining_abspath,
const char **repos_root_url,
@@ -1521,7 +1490,7 @@ svn_wc__db_revert_list_read(svn_boolean_
const char **conflict_working,
const char **prop_reject,
svn_boolean_t *copied_here,
- svn_wc__db_kind_t *kind,
+ svn_kind_t *kind,
svn_wc__db_t *db,
const char *local_abspath,
apr_pool_t *result_pool,
@@ -1531,7 +1500,7 @@ svn_wc__db_revert_list_read(svn_boolean_
* svn_wc__db_revert_list_read_copied_children(). */
typedef struct svn_wc__db_revert_list_copied_child_info_t {
const char *abspath;
- svn_wc__db_kind_t kind;
+ svn_kind_t kind;
} svn_wc__db_revert_list_copied_child_info_t ;
/* Return in *CHILDREN a list of reverted copied nodes at or within
@@ -1791,7 +1760,7 @@ svn_wc__db_op_set_tree_conflict(svn_wc__
*/
svn_error_t *
svn_wc__db_read_info(svn_wc__db_status_t *status, /* ### derived */
- svn_wc__db_kind_t *kind,
+ svn_kind_t *kind,
svn_revnum_t *revision,
const char **repos_relpath,
const char **repos_root_url,
@@ -1839,7 +1808,7 @@ svn_wc__db_read_info(svn_wc__db_status_t
fields needed by status. */
struct svn_wc__db_info_t {
svn_wc__db_status_t status;
- svn_wc__db_kind_t kind;
+ svn_kind_t kind;
svn_revnum_t revnum;
const char *repos_relpath;
const char *repos_root_url;
@@ -1897,7 +1866,7 @@ svn_wc__db_read_children_info(apr_hash_t
fields needed by svn_wc__internal_walk_children(). */
struct svn_wc__db_walker_info_t {
svn_wc__db_status_t status;
- svn_wc__db_kind_t kind;
+ svn_kind_t kind;
};
/* When a node is deleted in WORKING, some of its information is no longer
@@ -1916,7 +1885,7 @@ struct svn_wc__db_walker_info_t {
*/
svn_error_t *
svn_wc__db_read_pristine_info(svn_wc__db_status_t *status,
- svn_wc__db_kind_t *kind,
+ svn_kind_t *kind,
svn_revnum_t *changed_rev,
apr_time_t *changed_date,
const char **changed_author,
@@ -2129,7 +2098,7 @@ svn_wc__db_read_conflicts(const apr_arra
Uses SCRATCH_POOL for temporary allocations. */
svn_error_t *
-svn_wc__db_read_kind(svn_wc__db_kind_t *kind,
+svn_wc__db_read_kind(svn_kind_t *kind,
svn_wc__db_t *db,
const char *local_abspath,
svn_boolean_t allow_missing,
@@ -2289,7 +2258,7 @@ svn_wc__db_global_commit(svn_wc__db_t *d
svn_error_t *
svn_wc__db_global_update(svn_wc__db_t *db,
const char *local_abspath,
- svn_wc__db_kind_t new_kind,
+ svn_kind_t new_kind,
const char *new_repos_relpath,
svn_revnum_t new_revision,
const apr_hash_t *new_props,
@@ -2659,7 +2628,7 @@ svn_wc__db_upgrade_apply_props(svn_sqlit
svn_error_t *
svn_wc__db_upgrade_insert_external(svn_wc__db_t *db,
const char *local_abspath,
- svn_wc__db_kind_t kind,
+ svn_kind_t kind,
const char *parent_abspath,
const char *def_local_abspath,
const char *repos_relpath,
@@ -2787,7 +2756,7 @@ svn_error_t *
svn_wc__db_op_remove_node(svn_wc__db_t *db,
const char *local_abspath,
svn_revnum_t not_present_revision,
- svn_wc__db_kind_t not_present_kind,
+ svn_kind_t not_present_kind,
apr_pool_t *scratch_pool);
/* Remove the WORKING_NODE row of LOCAL_ABSPATH in DB. */
Modified: subversion/trunk/subversion/libsvn_wc/workqueue.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/workqueue.c?rev=1181849&r1=1181848&r2=1181849&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/workqueue.c (original)
+++ subversion/trunk/subversion/libsvn_wc/workqueue.c Tue Oct 11 15:40:10 2011
@@ -109,7 +109,7 @@ remove_base_node(svn_wc__db_t *db,
apr_pool_t *scratch_pool)
{
svn_wc__db_status_t base_status, wrk_status;
- svn_wc__db_kind_t base_kind, wrk_kind;
+ svn_kind_t base_kind, wrk_kind;
svn_boolean_t have_base, have_work;
svn_error_t *err;
@@ -148,7 +148,7 @@ remove_base_node(svn_wc__db_t *db,
scratch_pool, scratch_pool));
/* Children first */
- if (base_kind == svn_wc__db_kind_dir
+ if (base_kind == svn_kind_dir
&& base_status == svn_wc__db_status_normal)
{
const apr_array_header_t *children;
@@ -179,12 +179,12 @@ remove_base_node(svn_wc__db_t *db,
&& wrk_status != svn_wc__db_status_excluded)
{
if (wrk_status != svn_wc__db_status_deleted
- && (base_kind == svn_wc__db_kind_file
- || base_kind == svn_wc__db_kind_symlink))
+ && (base_kind == svn_kind_file
+ || base_kind == svn_kind_symlink))
{
SVN_ERR(svn_io_remove_file2(local_abspath, TRUE, scratch_pool));
}
- else if (base_kind == svn_wc__db_kind_dir
+ else if (base_kind == svn_kind_dir
&& wrk_status != svn_wc__db_status_deleted)
{
err = svn_io_dir_remove_nonrecursive(local_abspath, scratch_pool);
@@ -218,7 +218,7 @@ run_base_remove(svn_wc__db_t *db,
const char *local_relpath;
const char *local_abspath;
svn_revnum_t not_present_rev = SVN_INVALID_REVNUM;
- svn_wc__db_kind_t not_present_kind;
+ svn_kind_t not_present_kind;
const char *repos_relpath, *repos_root_url, *repos_uuid;
apr_int64_t val;
@@ -232,7 +232,7 @@ run_base_remove(svn_wc__db_t *db,
not_present_rev = (svn_revnum_t)val;
SVN_ERR(svn_skel__parse_int(&val, arg1->next->next, scratch_pool));
- not_present_kind = (svn_wc__db_kind_t)val;
+ not_present_kind = (svn_kind_t)val;
if (SVN_IS_VALID_REVNUM(not_present_rev))
{
@@ -295,7 +295,7 @@ svn_wc__wq_build_base_remove(svn_skel_t
svn_wc__db_t *db,
const char *local_abspath,
svn_revnum_t not_present_revision,
- svn_wc__db_kind_t not_present_kind,
+ svn_kind_t not_present_kind,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
Modified: subversion/trunk/subversion/libsvn_wc/workqueue.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/workqueue.h?rev=1181849&r1=1181848&r2=1181849&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/workqueue.h (original)
+++ subversion/trunk/subversion/libsvn_wc/workqueue.h Tue Oct 11 15:40:10 2011
@@ -212,7 +212,7 @@ svn_wc__wq_build_base_remove(svn_skel_t
svn_wc__db_t *db,
const char *local_abspath,
svn_revnum_t not_present_revision,
- svn_wc__db_kind_t not_present_kind,
+ svn_kind_t not_present_kind,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
Modified: subversion/trunk/subversion/tests/libsvn_wc/db-test.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/db-test.c?rev=1181849&r1=1181848&r2=1181849&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/db-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/db-test.c Tue Oct 11 15:40:10 2011
@@ -374,7 +374,7 @@ static svn_error_t *
test_getting_info(apr_pool_t *pool)
{
const char *local_abspath;
- svn_wc__db_kind_t kind;
+ svn_kind_t kind;
svn_wc__db_status_t status;
svn_revnum_t revision;
const char *repos_relpath;
@@ -403,7 +403,7 @@ test_getting_info(apr_pool_t *pool)
&update_root,
db, local_abspath,
pool, pool));
- SVN_TEST_ASSERT(kind == svn_wc__db_kind_dir);
+ SVN_TEST_ASSERT(kind == svn_kind_dir);
SVN_TEST_ASSERT(status == svn_wc__db_status_normal);
SVN_TEST_ASSERT(revision == 1);
SVN_TEST_STRING_ASSERT(repos_relpath, "");
@@ -426,7 +426,7 @@ test_getting_info(apr_pool_t *pool)
NULL, NULL,
db, svn_dirent_join(local_abspath, "A", pool),
pool, pool));
- SVN_TEST_ASSERT(kind == svn_wc__db_kind_file);
+ SVN_TEST_ASSERT(kind == svn_kind_file);
SVN_TEST_STRING_ASSERT(SHA1_1, svn_checksum_to_cstring(checksum, pool));
SVN_TEST_STRING_ASSERT(repos_relpath, "A");
SVN_TEST_STRING_ASSERT(repos_root_url, ROOT_ONE);
@@ -441,7 +441,7 @@ test_getting_info(apr_pool_t *pool)
NULL, NULL,
db, svn_dirent_join(local_abspath, "B", pool),
pool, pool));
- SVN_TEST_ASSERT(kind == svn_wc__db_kind_symlink);
+ SVN_TEST_ASSERT(kind == svn_kind_symlink);
SVN_TEST_ASSERT(status == svn_wc__db_status_excluded);
SVN_TEST_ASSERT(!SVN_IS_VALID_REVNUM(revision));
SVN_TEST_STRING_ASSERT(repos_relpath, "B");
@@ -464,7 +464,7 @@ test_getting_info(apr_pool_t *pool)
NULL, NULL, NULL,
db, svn_dirent_join(local_abspath, "C", pool),
pool, pool));
- SVN_TEST_ASSERT(kind == svn_wc__db_kind_unknown);
+ SVN_TEST_ASSERT(kind == svn_kind_unknown);
SVN_TEST_ASSERT(status == svn_wc__db_status_server_excluded);
/* Test: not-present presence. */
@@ -549,12 +549,12 @@ static svn_error_t *
validate_node(svn_wc__db_t *db,
const char *local_abspath,
const char *relpath,
- svn_wc__db_kind_t expected_kind,
+ svn_kind_t expected_kind,
svn_wc__db_status_t expected_status,
apr_pool_t *scratch_pool)
{
const char *path = svn_dirent_join(local_abspath, relpath, scratch_pool);
- svn_wc__db_kind_t kind;
+ svn_kind_t kind;
svn_wc__db_status_t status;
apr_hash_t *props;
const svn_string_t *value;
@@ -679,7 +679,7 @@ test_inserting_nodes(apr_pool_t *pool)
SVN_ERR(svn_wc__db_base_add_excluded_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_server_excluded,
+ svn_kind_file, svn_wc__db_status_server_excluded,
NULL, NULL,
pool));
@@ -687,7 +687,7 @@ test_inserting_nodes(apr_pool_t *pool)
SVN_ERR(svn_wc__db_base_add_excluded_node(
db, svn_dirent_join(local_abspath, "P", pool),
"P", ROOT_ONE, UUID_ONE, 3,
- svn_wc__db_kind_dir, svn_wc__db_status_excluded,
+ svn_kind_dir, svn_wc__db_status_excluded,
NULL, NULL,
pool));
@@ -695,7 +695,7 @@ test_inserting_nodes(apr_pool_t *pool)
SVN_ERR(svn_wc__db_base_add_not_present_node(
db, svn_dirent_join(local_abspath, "Q", pool),
"Q", ROOT_ONE, UUID_ONE, 3,
- svn_wc__db_kind_symlink,
+ svn_kind_symlink,
NULL, NULL,
pool));
@@ -703,36 +703,36 @@ test_inserting_nodes(apr_pool_t *pool)
SVN_ERR(svn_wc__db_base_add_excluded_node(
db, svn_dirent_join(local_abspath, "R", pool),
"R", ROOT_ONE, UUID_ONE, 3,
- svn_wc__db_kind_unknown, svn_wc__db_status_server_excluded,
+ svn_kind_unknown, svn_wc__db_status_server_excluded,
NULL, NULL,
pool));
/* Are all the nodes where we expect them to be? */
SVN_ERR(validate_node(db, local_abspath, "N",
- svn_wc__db_kind_dir, svn_wc__db_status_normal,
+ svn_kind_dir, svn_wc__db_status_normal,
pool));
SVN_ERR(validate_node(db, local_abspath, "N/N-a",
- svn_wc__db_kind_file, svn_wc__db_status_normal,
+ svn_kind_file, svn_wc__db_status_normal,
pool));
SVN_ERR(validate_node(db, local_abspath, "N/N-b",
- svn_wc__db_kind_file,
+ svn_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,
+ svn_kind_unknown, svn_wc__db_status_incomplete,
pool));
SVN_ERR(validate_node(db, local_abspath, "O",
- svn_wc__db_kind_symlink, svn_wc__db_status_normal,
+ svn_kind_symlink, svn_wc__db_status_normal,
pool));
SVN_ERR(validate_node(db, local_abspath, "P",
- svn_wc__db_kind_dir, svn_wc__db_status_excluded,
+ svn_kind_dir, svn_wc__db_status_excluded,
pool));
SVN_ERR(validate_node(db, local_abspath, "Q",
- svn_wc__db_kind_symlink, svn_wc__db_status_not_present,
+ svn_kind_symlink, svn_wc__db_status_not_present,
pool));
SVN_ERR(validate_node(db, local_abspath, "R",
- svn_wc__db_kind_unknown,
+ svn_kind_unknown,
svn_wc__db_status_server_excluded,
pool));
@@ -788,7 +788,7 @@ static svn_error_t *
test_working_info(apr_pool_t *pool)
{
const char *local_abspath;
- svn_wc__db_kind_t kind;
+ svn_kind_t kind;
svn_wc__db_status_t status;
svn_revnum_t revision;
const char *repos_relpath;
@@ -832,7 +832,7 @@ test_working_info(apr_pool_t *pool)
db, svn_dirent_join(local_abspath, "I", pool),
pool, pool));
SVN_TEST_ASSERT(status == svn_wc__db_status_added);
- SVN_TEST_ASSERT(kind == svn_wc__db_kind_dir);
+ SVN_TEST_ASSERT(kind == svn_kind_dir);
SVN_TEST_ASSERT(revision == SVN_INVALID_REVNUM);
SVN_TEST_ASSERT(repos_relpath == NULL);
SVN_TEST_ASSERT(repos_root_url == NULL);
@@ -879,14 +879,14 @@ test_pdh(apr_pool_t *pool)
SVN_ERR(svn_wc__db_base_add_excluded_node(
db, svn_dirent_join(local_abspath, "sub", pool),
"sub", ROOT_ONE, UUID_ONE, 1,
- svn_wc__db_kind_file, svn_wc__db_status_server_excluded,
+ svn_kind_file, svn_wc__db_status_server_excluded,
NULL, NULL,
pool));
SVN_ERR(svn_wc__db_base_add_excluded_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_server_excluded,
+ svn_kind_file, svn_wc__db_status_server_excluded,
NULL, NULL,
pool));
@@ -1428,7 +1428,7 @@ test_externals_store(apr_pool_t *pool)
{
svn_wc__db_status_t status;
- svn_wc__db_kind_t kind;
+ svn_kind_t kind;
const char *repos_root_url;
const char *repos_uuid;
const char *defining_abspath;
@@ -1445,7 +1445,7 @@ test_externals_store(apr_pool_t *pool)
pool, pool));
SVN_TEST_ASSERT(status == svn_wc__db_status_normal);
- SVN_TEST_ASSERT(kind == svn_wc__db_kind_file);
+ SVN_TEST_ASSERT(kind == svn_kind_file);
SVN_TEST_STRING_ASSERT(repos_root_url, "svn://some-repos/svn");
SVN_TEST_STRING_ASSERT(repos_uuid, "not-a-uuid");
SVN_TEST_STRING_ASSERT(defining_abspath, subdir);
@@ -1476,7 +1476,7 @@ test_externals_store(apr_pool_t *pool)
pool, pool));
SVN_TEST_ASSERT(status == svn_wc__db_status_normal);
- SVN_TEST_ASSERT(kind == svn_wc__db_kind_dir);
+ SVN_TEST_ASSERT(kind == svn_kind_dir);
SVN_TEST_STRING_ASSERT(repos_root_url, "svn://other-repos/nsv");
SVN_TEST_STRING_ASSERT(repos_uuid, "no-uuid-either");
SVN_TEST_STRING_ASSERT(defining_abspath, subdir);