You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by br...@apache.org on 2013/03/12 15:48:57 UTC
svn commit: r1455559 [3/3] - in /subversion/trunk: notes/
subversion/include/ subversion/include/private/ subversion/libsvn_client/
subversion/libsvn_delta/ subversion/libsvn_fs/ subversion/libsvn_ra_serf/
subversion/libsvn_repos/ subversion/libsvn_sub...
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=1455559&r1=1455558&r2=1455559&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Tue Mar 12 14:48:56 2013
@@ -122,7 +122,7 @@ svn_wc__db_op_depth_for_upgrade(const ch
typedef struct insert_base_baton_t {
/* common to all insertions into BASE */
svn_wc__db_status_t status;
- svn_kind_t kind;
+ svn_node_kind_t kind;
apr_int64_t repos_id;
const char *repos_relpath;
svn_revnum_t revision;
@@ -181,7 +181,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_kind_t kind;
+ svn_node_kind_t kind;
int op_depth;
/* common to all "normal" presence insertions */
@@ -222,7 +222,7 @@ typedef struct insert_working_baton_t {
/* Representation of a new row for the EXTERNALS table */
typedef struct insert_external_baton_t {
/* common to all insertions into EXTERNALS */
- svn_kind_t kind;
+ svn_node_kind_t kind;
svn_wc__db_status_t presence;
/* The repository of the external */
@@ -304,7 +304,7 @@ db_read_pristine_props(apr_hash_t **prop
static svn_error_t *
read_info(svn_wc__db_status_t *status,
- svn_kind_t *kind,
+ svn_node_kind_t *kind,
svn_revnum_t *revision,
const char **repos_relpath,
apr_int64_t *repos_id,
@@ -362,7 +362,7 @@ wclock_owns_lock(svn_boolean_t *own_lock
static svn_error_t *
db_is_switched(svn_boolean_t *is_switched,
- svn_kind_t *kind,
+ svn_node_kind_t *kind,
svn_wc__db_wcroot_t *wcroot,
const char *local_relpath,
apr_pool_t *scratch_pool);
@@ -578,7 +578,7 @@ blank_ibb(insert_base_baton_t *pibb)
svn_error_t *
svn_wc__db_extend_parent_delete(svn_wc__db_wcroot_t *wcroot,
const char *local_relpath,
- svn_kind_t kind,
+ svn_node_kind_t kind,
int op_depth,
apr_pool_t *scratch_pool)
{
@@ -700,15 +700,15 @@ insert_base_node(const insert_base_baton
pibb->repos_relpath,
pibb->revision,
presence_map, pibb->status, /* 8 */
- (pibb->kind == svn_kind_dir) ? /* 9 */
+ (pibb->kind == svn_node_dir) ? /* 9 */
svn_token__to_word(depth_map, pibb->depth) : NULL,
kind_map, pibb->kind, /* 10 */
pibb->changed_rev, /* 11 */
pibb->changed_date, /* 12 */
pibb->changed_author, /* 13 */
- (pibb->kind == svn_kind_symlink) ?
+ (pibb->kind == svn_node_symlink) ?
pibb->target : NULL)); /* 19 */
- if (pibb->kind == svn_kind_file)
+ if (pibb->kind == svn_node_file)
{
if (!pibb->checksum
&& pibb->status != svn_wc__db_status_not_present
@@ -771,7 +771,7 @@ insert_base_node(const insert_base_baton
wcroot->sdb, scratch_pool));
}
- if (pibb->kind == svn_kind_dir && pibb->children)
+ if (pibb->kind == svn_node_dir && pibb->children)
SVN_ERR(insert_incomplete_children(wcroot->sdb, wcroot->wc_id,
local_relpath,
repos_id,
@@ -969,14 +969,14 @@ insert_working_node(const insert_working
piwb->op_depth,
parent_relpath,
presence_map, piwb->presence,
- (piwb->kind == svn_kind_dir)
+ (piwb->kind == svn_node_dir)
? svn_token__to_word(depth_map, 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_kind_symlink)
+ (piwb->kind == svn_node_symlink)
? piwb->target : NULL,
moved_to_relpath));
@@ -985,7 +985,7 @@ insert_working_node(const insert_working
SVN_ERR(svn_sqlite__bind_int(stmt, 8, TRUE));
}
- if (piwb->kind == svn_kind_file)
+ if (piwb->kind == svn_node_file)
{
SVN_ERR(svn_sqlite__bind_checksum(stmt, 14, piwb->checksum,
scratch_pool));
@@ -1010,7 +1010,7 @@ insert_working_node(const insert_working
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_kind_dir && piwb->children)
+ if (piwb->kind == svn_node_dir && piwb->children)
SVN_ERR(insert_incomplete_children(wcroot->sdb, wcroot->wc_id,
local_relpath,
INVALID_REPOS_ID /* inherit repos_id */,
@@ -1043,7 +1043,7 @@ insert_working_node(const insert_working
wcroot->sdb, scratch_pool));
}
- if (piwb->kind == svn_kind_dir)
+ if (piwb->kind == svn_node_dir)
{
SVN_ERR(svn_sqlite__get_statement(&stmt, wcroot->sdb,
STMT_UPDATE_ACTUAL_CLEAR_CHANGELIST));
@@ -1224,7 +1224,7 @@ svn_wc__db_get_children_op_depth(apr_has
while (have_row)
{
const char *child_relpath = svn_sqlite__column_text(stmt, 0, NULL);
- svn_kind_t *child_kind = apr_palloc(result_pool, sizeof(svn_kind_t));
+ svn_node_kind_t *child_kind = apr_palloc(result_pool, sizeof(svn_node_kind_t));
*child_kind = svn_sqlite__column_token(stmt, 1, kind_map);
apr_hash_set(*children,
@@ -1442,7 +1442,7 @@ init_db(/* output values */
presence_map, status, /* 8 */
svn_token__to_word(depth_map,
root_node_depth),
- kind_map, svn_kind_dir /* 10 */));
+ kind_map, svn_node_dir /* 10 */));
SVN_ERR(svn_sqlite__insert(NULL, stmt));
}
@@ -1675,7 +1675,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_kind_dir;
+ ibb.kind = svn_node_dir;
ibb.repos_relpath = repos_relpath;
ibb.revision = revision;
@@ -1745,7 +1745,7 @@ svn_wc__db_base_add_incomplete_directory
ibb.repos_uuid = repos_uuid;
ibb.status = svn_wc__db_status_incomplete;
- ibb.kind = svn_kind_dir;
+ ibb.kind = svn_node_dir;
ibb.repos_relpath = repos_relpath;
ibb.revision = revision;
ibb.depth = depth;
@@ -1814,7 +1814,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_kind_file;
+ ibb.kind = svn_node_file;
ibb.repos_relpath = repos_relpath;
ibb.revision = revision;
@@ -1901,7 +1901,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_kind_symlink;
+ ibb.kind = svn_node_symlink;
ibb.repos_relpath = repos_relpath;
ibb.revision = revision;
@@ -1947,7 +1947,7 @@ add_excluded_or_not_present_node(svn_wc_
const char *repos_root_url,
const char *repos_uuid,
svn_revnum_t revision,
- svn_kind_t kind,
+ svn_node_kind_t kind,
svn_wc__db_status_t status,
const svn_skel_t *conflict,
const svn_skel_t *work_items,
@@ -2020,7 +2020,7 @@ svn_wc__db_base_add_excluded_node(svn_wc
const char *repos_root_url,
const char *repos_uuid,
svn_revnum_t revision,
- svn_kind_t kind,
+ svn_node_kind_t kind,
svn_wc__db_status_t status,
const svn_skel_t *conflict,
const svn_skel_t *work_items,
@@ -2042,7 +2042,7 @@ svn_wc__db_base_add_not_present_node(svn
const char *repos_root_url,
const char *repos_uuid,
svn_revnum_t revision,
- svn_kind_t kind,
+ svn_node_kind_t kind,
const svn_skel_t *conflict,
const svn_skel_t *work_items,
apr_pool_t *scratch_pool)
@@ -2097,7 +2097,7 @@ db_base_remove(svn_wc__db_wcroot_t *wcro
svn_wc__db_status_t status;
apr_int64_t repos_id;
const char *repos_relpath;
- svn_kind_t kind;
+ svn_node_kind_t kind;
svn_boolean_t keep_working;
SVN_ERR(svn_wc__db_base_get_info_internal(&status, &kind, NULL,
@@ -2140,7 +2140,7 @@ db_base_remove(svn_wc__db_wcroot_t *wcro
local_abspath = svn_dirent_join(wcroot->abspath, local_relpath,
scratch_pool);
- if (kind == svn_kind_dir)
+ if (kind == svn_node_dir)
{
apr_pool_t *iterpool;
SVN_ERR(svn_sqlite__get_statement(&stmt, wcroot->sdb,
@@ -2154,7 +2154,7 @@ db_base_remove(svn_wc__db_wcroot_t *wcro
while (have_row)
{
const char *node_relpath = svn_sqlite__column_text(stmt, 0, NULL);
- svn_kind_t node_kind = svn_sqlite__column_token(stmt, 1,
+ svn_node_kind_t node_kind = svn_sqlite__column_token(stmt, 1,
kind_map);
const char *node_abspath;
svn_error_t *err;
@@ -2164,7 +2164,7 @@ db_base_remove(svn_wc__db_wcroot_t *wcro
node_abspath = svn_dirent_join(wcroot->abspath, node_relpath,
iterpool);
- if (node_kind == svn_kind_dir)
+ if (node_kind == svn_node_dir)
err = svn_wc__wq_build_dir_remove(&work_item,
db, wcroot->abspath,
node_abspath, FALSE,
@@ -2365,7 +2365,7 @@ svn_wc__db_base_remove(svn_wc__db_t *db,
svn_error_t *
svn_wc__db_base_get_info_internal(svn_wc__db_status_t *status,
- svn_kind_t *kind,
+ svn_node_kind_t *kind,
svn_revnum_t *revision,
const char **repos_relpath,
apr_int64_t *repos_id,
@@ -2398,7 +2398,7 @@ svn_wc__db_base_get_info_internal(svn_wc
{
svn_wc__db_status_t node_status = svn_sqlite__column_token(stmt, 2,
presence_map);
- svn_kind_t node_kind = svn_sqlite__column_token(stmt, 3, kind_map);
+ svn_node_kind_t node_kind = svn_sqlite__column_token(stmt, 3, kind_map);
if (kind)
{
@@ -2431,7 +2431,7 @@ svn_wc__db_base_get_info_internal(svn_wc
}
if (depth)
{
- if (node_kind != svn_kind_dir)
+ if (node_kind != svn_node_dir)
{
*depth = svn_depth_unknown;
}
@@ -2443,7 +2443,7 @@ svn_wc__db_base_get_info_internal(svn_wc
}
if (checksum)
{
- if (node_kind != svn_kind_file)
+ if (node_kind != svn_node_file)
{
*checksum = NULL;
}
@@ -2461,7 +2461,7 @@ svn_wc__db_base_get_info_internal(svn_wc
}
if (target)
{
- if (node_kind != svn_kind_symlink)
+ if (node_kind != svn_node_symlink)
*target = NULL;
else
*target = svn_sqlite__column_text(stmt, 11, result_pool);
@@ -2507,7 +2507,7 @@ svn_wc__db_base_get_info_internal(svn_wc
svn_error_t *
svn_wc__db_base_get_info(svn_wc__db_status_t *status,
- svn_kind_t *kind,
+ svn_node_kind_t *kind,
svn_revnum_t *revision,
const char **repos_relpath,
const char **repos_root_url,
@@ -2749,7 +2749,7 @@ svn_wc__db_base_clear_dav_cache_recursiv
svn_error_t *
svn_wc__db_depth_get_info(svn_wc__db_status_t *status,
- svn_kind_t *kind,
+ svn_node_kind_t *kind,
svn_revnum_t *revision,
const char **repos_relpath,
apr_int64_t *repos_id,
@@ -2781,7 +2781,7 @@ svn_wc__db_depth_get_info(svn_wc__db_sta
{
svn_wc__db_status_t node_status = svn_sqlite__column_token(stmt, 2,
presence_map);
- svn_kind_t node_kind = svn_sqlite__column_token(stmt, 3, kind_map);
+ svn_node_kind_t node_kind = svn_sqlite__column_token(stmt, 3, kind_map);
if (kind)
{
@@ -2812,7 +2812,7 @@ svn_wc__db_depth_get_info(svn_wc__db_sta
}
if (depth)
{
- if (node_kind != svn_kind_dir)
+ if (node_kind != svn_node_dir)
{
*depth = svn_depth_unknown;
}
@@ -2824,7 +2824,7 @@ svn_wc__db_depth_get_info(svn_wc__db_sta
}
if (checksum)
{
- if (node_kind != svn_kind_file)
+ if (node_kind != svn_node_file)
{
*checksum = NULL;
}
@@ -2842,7 +2842,7 @@ svn_wc__db_depth_get_info(svn_wc__db_sta
}
if (target)
{
- if (node_kind != svn_kind_symlink)
+ if (node_kind != svn_node_symlink)
*target = NULL;
else
*target = svn_sqlite__column_text(stmt, 11, result_pool);
@@ -3025,8 +3025,8 @@ insert_external_node(const insert_extern
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_kind_file
- || ieb->kind == svn_kind_symlink)
+ if (ieb->kind == svn_node_file
+ || ieb->kind == svn_node_symlink)
{
struct insert_base_baton_t ibb;
@@ -3150,7 +3150,7 @@ svn_wc__db_external_add_file(svn_wc__db_
blank_ieb(&ieb);
- ieb.kind = svn_kind_file;
+ ieb.kind = svn_node_file;
ieb.presence = svn_wc__db_status_normal;
ieb.repos_root_url = repos_root_url;
@@ -3238,7 +3238,7 @@ svn_wc__db_external_add_symlink(svn_wc__
blank_ieb(&ieb);
- ieb.kind = svn_kind_symlink;
+ ieb.kind = svn_node_symlink;
ieb.presence = svn_wc__db_status_normal;
ieb.repos_root_url = repos_root_url;
@@ -3313,7 +3313,7 @@ svn_wc__db_external_add_dir(svn_wc__db_t
blank_ieb(&ieb);
- ieb.kind = svn_kind_dir;
+ ieb.kind = svn_node_dir;
ieb.presence = svn_wc__db_status_normal;
ieb.repos_root_url = repos_root_url;
@@ -3387,7 +3387,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_kind_t *kind,
+ svn_node_kind_t *kind,
const char **definining_abspath,
const char **repos_root_url,
const char **repos_uuid,
@@ -3487,7 +3487,7 @@ svn_wc__db_committable_externals_below(a
const char *local_relpath;
svn_boolean_t have_row;
svn_wc__committable_external_info_t *info;
- svn_kind_t db_kind;
+ svn_node_kind_t db_kind;
apr_array_header_t *result = NULL;
SVN_ERR_ASSERT(svn_dirent_is_absolute(local_abspath));
@@ -3519,7 +3519,7 @@ svn_wc__db_committable_externals_below(a
result_pool);
db_kind = svn_sqlite__column_token(stmt, 1, kind_map);
- SVN_ERR_ASSERT(db_kind == svn_kind_file || db_kind == svn_kind_dir);
+ SVN_ERR_ASSERT(db_kind == svn_node_file || db_kind == svn_node_dir);
info->kind = db_kind;
info->repos_relpath = svn_sqlite__column_text(stmt, 2, result_pool);
@@ -3714,7 +3714,7 @@ cross_db_copy(svn_wc__db_wcroot_t *src_w
svn_wc__db_status_t dst_status,
int dst_op_depth,
int dst_np_op_depth,
- svn_kind_t kind,
+ svn_node_kind_t kind,
const apr_array_header_t *children,
apr_int64_t copyfrom_id,
const char *copyfrom_relpath,
@@ -3729,8 +3729,8 @@ cross_db_copy(svn_wc__db_wcroot_t *src_w
apr_hash_t *props;
svn_depth_t depth;
- SVN_ERR_ASSERT(kind == svn_kind_file
- || kind == svn_kind_dir
+ SVN_ERR_ASSERT(kind == svn_node_file
+ || kind == svn_node_dir
);
SVN_ERR(read_info(NULL, NULL, NULL, NULL, NULL,
@@ -4048,7 +4048,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_kind_t *kind,
+ svn_node_kind_t *kind,
svn_boolean_t *op_root,
svn_wc__db_wcroot_t *wcroot,
const char *local_relpath,
@@ -4306,7 +4306,7 @@ db_op_copy(svn_wc__db_wcroot_t *src_wcro
int dst_op_depth;
int dst_np_op_depth;
int dst_parent_op_depth;
- svn_kind_t kind;
+ svn_node_kind_t kind;
const apr_array_header_t *children;
SVN_ERR(get_info_for_copy(©from_id, ©from_relpath, ©from_rev,
@@ -4318,7 +4318,7 @@ db_op_copy(svn_wc__db_wcroot_t *src_wcro
copyfrom_id, copyfrom_relpath, copyfrom_rev,
dst_wcroot, dst_relpath, scratch_pool));
- SVN_ERR_ASSERT(kind == svn_kind_file || kind == svn_kind_dir);
+ SVN_ERR_ASSERT(kind == svn_node_file || kind == svn_node_dir);
/* ### New status, not finished, see notes/wc-ng/copying */
switch (status)
@@ -4406,7 +4406,7 @@ db_op_copy(svn_wc__db_wcroot_t *src_wcro
scratch_pool));
}
- if (kind == svn_kind_dir)
+ if (kind == svn_node_dir)
{
int src_op_depth;
@@ -4521,7 +4521,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_kind_dir
+ if (kind == svn_node_dir
&& dst_presence == svn_wc__db_status_normal)
SVN_ERR(insert_incomplete_children(
dst_wcroot->sdb,
@@ -4878,7 +4878,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_kind_t kind;
+ svn_node_kind_t kind;
svn_revnum_t node_revision;
const char *node_repos_relpath;
apr_int64_t node_repos_id;
@@ -5250,7 +5250,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_kind_dir;
+ iwb.kind = svn_node_dir;
iwb.props = props;
iwb.changed_rev = changed_rev;
@@ -5330,7 +5330,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_kind_file;
+ iwb.kind = svn_node_file;
iwb.props = props;
iwb.changed_rev = changed_rev;
@@ -5408,7 +5408,7 @@ svn_wc__db_op_copy_symlink(svn_wc__db_t
blank_iwb(&iwb);
iwb.presence = svn_wc__db_status_normal;
- iwb.kind = svn_kind_symlink;
+ iwb.kind = svn_node_symlink;
iwb.props = props;
iwb.changed_rev = changed_rev;
@@ -5470,7 +5470,7 @@ svn_wc__db_op_add_directory(svn_wc__db_t
local_relpath = svn_relpath_join(local_relpath, name, scratch_pool);
iwb.presence = svn_wc__db_status_normal;
- iwb.kind = svn_kind_dir;
+ iwb.kind = svn_node_dir;
iwb.op_depth = relpath_depth(local_relpath);
if (props && apr_hash_count((apr_hash_t *)props))
{
@@ -5517,7 +5517,7 @@ svn_wc__db_op_add_file(svn_wc__db_t *db,
local_relpath = svn_relpath_join(local_relpath, name, scratch_pool);
iwb.presence = svn_wc__db_status_normal;
- iwb.kind = svn_kind_file;
+ iwb.kind = svn_node_file;
iwb.op_depth = relpath_depth(local_relpath);
if (props && apr_hash_count((apr_hash_t *)props))
{
@@ -5565,7 +5565,7 @@ svn_wc__db_op_add_symlink(svn_wc__db_t *
local_relpath = svn_relpath_join(local_relpath, name, scratch_pool);
iwb.presence = svn_wc__db_status_normal;
- iwb.kind = svn_kind_symlink;
+ iwb.kind = svn_node_symlink;
iwb.op_depth = relpath_depth(local_relpath);
if (props && apr_hash_count((apr_hash_t *)props))
{
@@ -6670,7 +6670,7 @@ static svn_error_t *
revert_list_read(svn_boolean_t *reverted,
const apr_array_header_t **marker_paths,
svn_boolean_t *copied_here,
- svn_kind_t *kind,
+ svn_node_kind_t *kind,
svn_wc__db_wcroot_t *wcroot,
const char *local_relpath,
svn_wc__db_t *db,
@@ -6683,7 +6683,7 @@ revert_list_read(svn_boolean_t *reverted
*reverted = FALSE;
*marker_paths = NULL;
*copied_here = FALSE;
- *kind = svn_kind_unknown;
+ *kind = svn_node_unknown;
SVN_ERR(svn_sqlite__get_statement(&stmt, wcroot->sdb,
STMT_SELECT_REVERT_LIST));
@@ -6749,7 +6749,7 @@ svn_error_t *
svn_wc__db_revert_list_read(svn_boolean_t *reverted,
const apr_array_header_t **marker_files,
svn_boolean_t *copied_here,
- svn_kind_t *kind,
+ svn_node_kind_t *kind,
svn_wc__db_t *db,
const char *local_abspath,
apr_pool_t *result_pool,
@@ -6919,7 +6919,7 @@ remove_node_txn(svn_boolean_t *left_chan
svn_boolean_t destroy_changes,
svn_revnum_t not_present_rev,
svn_wc__db_status_t not_present_status,
- svn_kind_t not_present_kind,
+ svn_node_kind_t not_present_kind,
const svn_skel_t *conflict,
const svn_skel_t *work_items,
svn_cancel_func_t cancel_func,
@@ -6970,7 +6970,7 @@ remove_node_txn(svn_boolean_t *left_chan
{
const char *child_relpath;
const char *child_abspath;
- svn_kind_t child_kind;
+ svn_node_kind_t child_kind;
svn_boolean_t have_checksum;
svn_filesize_t recorded_size;
apr_int64_t recorded_time;
@@ -6986,7 +6986,7 @@ remove_node_txn(svn_boolean_t *left_chan
child_abspath = svn_dirent_join(wcroot->abspath, child_relpath,
iterpool);
- if (child_kind == svn_kind_file)
+ if (child_kind == svn_node_file)
{
have_checksum = !svn_sqlite__column_is_null(stmt, 2);
recorded_size = get_recorded_size(stmt, 3);
@@ -7007,12 +7007,12 @@ remove_node_txn(svn_boolean_t *left_chan
if (destroy_changes
|| dirent->kind != svn_node_file
- || child_kind != svn_kind_file)
+ || child_kind != svn_node_file)
{
/* Not interested in keeping changes */
modified_p = FALSE;
}
- else if (child_kind == svn_kind_file
+ else if (child_kind == svn_node_file
&& dirent->kind == svn_node_file
&& dirent->filesize == recorded_size
&& dirent->mtime == recorded_time)
@@ -7032,14 +7032,14 @@ remove_node_txn(svn_boolean_t *left_chan
if (left_changes)
*left_changes = TRUE;
}
- else if (child_kind == svn_kind_dir)
+ else if (child_kind == svn_node_dir)
{
err = svn_wc__wq_build_dir_remove(&work_item,
db, wcroot->abspath,
child_abspath, FALSE,
iterpool, iterpool);
}
- else /* svn_kind_file || svn_kind_symlink */
+ else /* svn_node_file || svn_node_symlink */
{
err = svn_wc__wq_build_file_remove(&work_item,
db, wcroot->abspath,
@@ -7068,7 +7068,7 @@ remove_node_txn(svn_boolean_t *left_chan
{
/* Create work item for destroying the root */
svn_wc__db_status_t status;
- svn_kind_t kind;
+ svn_node_kind_t kind;
SVN_ERR(read_info(&status, &kind, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
@@ -7084,7 +7084,7 @@ remove_node_txn(svn_boolean_t *left_chan
local_relpath,
scratch_pool);
- if (kind == svn_kind_dir)
+ if (kind == svn_node_dir)
{
SVN_ERR(svn_wc__wq_build_dir_remove(&work_item,
db, wcroot->abspath,
@@ -7181,7 +7181,7 @@ svn_wc__db_op_remove_node(svn_boolean_t
svn_boolean_t destroy_changes,
svn_revnum_t not_present_revision,
svn_wc__db_status_t not_present_status,
- svn_kind_t not_present_kind,
+ svn_node_kind_t not_present_kind,
const svn_skel_t *conflict,
const svn_skel_t *work_items,
svn_cancel_func_t cancel_func,
@@ -7458,7 +7458,7 @@ delete_node(void *baton,
svn_sqlite__stmt_t *stmt;
int select_depth; /* Depth of what is to be deleted */
svn_boolean_t refetch_depth = FALSE;
- svn_kind_t kind;
+ svn_node_kind_t kind;
apr_array_header_t *moved_nodes = NULL;
int delete_depth = relpath_depth(local_relpath);
@@ -7475,7 +7475,7 @@ delete_node(void *baton,
return SVN_NO_ERROR;
/* Don't copy BASE directories with server excluded nodes */
- if (status == svn_wc__db_status_normal && kind == svn_kind_dir)
+ if (status == svn_wc__db_status_normal && kind == svn_node_dir)
{
SVN_ERR(svn_sqlite__get_statement(&stmt, wcroot->sdb,
STMT_HAS_SERVER_EXCLUDED_DESCENDANTS));
@@ -8035,7 +8035,7 @@ svn_wc__db_op_delete_many(svn_wc__db_t *
DB+LOCAL_ABSPATH, and outputting repos ids instead of URL+UUID. */
static svn_error_t *
read_info(svn_wc__db_status_t *status,
- svn_kind_t *kind,
+ svn_node_kind_t *kind,
svn_revnum_t *revision,
const char **repos_relpath,
apr_int64_t *repos_id,
@@ -8094,7 +8094,7 @@ read_info(svn_wc__db_status_t *status,
if (have_info)
{
int op_depth;
- svn_kind_t node_kind;
+ svn_node_kind_t node_kind;
op_depth = svn_sqlite__column_int(stmt_info, 0);
node_kind = svn_sqlite__column_token(stmt_info, 4, kind_map);
@@ -8152,7 +8152,7 @@ read_info(svn_wc__db_status_t *status,
}
if (depth)
{
- if (node_kind != svn_kind_dir)
+ if (node_kind != svn_node_dir)
{
*depth = svn_depth_unknown;
}
@@ -8164,7 +8164,7 @@ read_info(svn_wc__db_status_t *status,
}
if (checksum)
{
- if (node_kind != svn_kind_file)
+ if (node_kind != svn_node_file)
{
*checksum = NULL;
}
@@ -8182,7 +8182,7 @@ read_info(svn_wc__db_status_t *status,
}
if (target)
{
- if (node_kind != svn_kind_symlink)
+ if (node_kind != svn_node_symlink)
*target = NULL;
else
*target = svn_sqlite__column_text(stmt_info, 12, result_pool);
@@ -8294,7 +8294,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_kind_unknown;
+ *kind = svn_node_unknown;
if (revision)
*revision = SVN_INVALID_REVNUM;
if (repos_relpath)
@@ -8365,7 +8365,7 @@ read_info(svn_wc__db_status_t *status,
svn_error_t *
svn_wc__db_read_info_internal(svn_wc__db_status_t *status,
- svn_kind_t *kind,
+ svn_node_kind_t *kind,
svn_revnum_t *revision,
const char **repos_relpath,
apr_int64_t *repos_id,
@@ -8408,7 +8408,7 @@ svn_wc__db_read_info_internal(svn_wc__db
svn_error_t *
svn_wc__db_read_info(svn_wc__db_status_t *status,
- svn_kind_t *kind,
+ svn_node_kind_t *kind,
svn_revnum_t *revision,
const char **repos_relpath,
const char **repos_root_url,
@@ -8602,7 +8602,7 @@ read_children_info(svn_wc__db_wcroot_t *
child->changed_author = svn_sqlite__column_text(stmt, 10,
result_pool);
- if (child->kind != svn_kind_dir)
+ if (child->kind != svn_node_dir)
child->depth = svn_depth_unknown;
else
{
@@ -8762,7 +8762,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_kind_t *kind,
+ svn_node_kind_t *kind,
svn_revnum_t *changed_rev,
apr_time_t *changed_date,
const char **changed_author,
@@ -8783,7 +8783,7 @@ svn_wc__db_read_pristine_info(svn_wc__db
svn_error_t *err = NULL;
int op_depth;
svn_wc__db_status_t raw_status;
- svn_kind_t node_kind;
+ svn_node_kind_t node_kind;
SVN_ERR_ASSERT(svn_dirent_is_absolute(local_abspath));
@@ -8853,7 +8853,7 @@ svn_wc__db_read_pristine_info(svn_wc__db
}
if (depth)
{
- if (node_kind != svn_kind_dir)
+ if (node_kind != svn_node_dir)
{
*depth = svn_depth_unknown;
}
@@ -8865,7 +8865,7 @@ svn_wc__db_read_pristine_info(svn_wc__db
}
if (checksum)
{
- if (node_kind != svn_kind_file)
+ if (node_kind != svn_node_file)
{
*checksum = NULL;
}
@@ -8891,7 +8891,7 @@ svn_wc__db_read_pristine_info(svn_wc__db
}
if (target)
{
- if (node_kind != svn_kind_symlink)
+ if (node_kind != svn_node_symlink)
*target = NULL;
else
*target = svn_sqlite__column_text(stmt, 12, result_pool);
@@ -9963,7 +9963,7 @@ get_children_with_cached_iprops(apr_hash
{
const char *child_abspath = svn__apr_hash_index_key(hi);
const char *child_relpath;
- svn_kind_t child_kind;
+ svn_node_kind_t child_kind;
svn_pool_clear(iterpool);
@@ -9984,7 +9984,7 @@ get_children_with_cached_iprops(apr_hash
scratch_pool));
/* Filter if not a file */
- if (child_kind != svn_kind_file)
+ if (child_kind != svn_node_file)
{
apr_hash_set(*iprop_paths, child_abspath, APR_HASH_KEY_STRING,
NULL);
@@ -10604,7 +10604,7 @@ commit_node(svn_wc__db_wcroot_t *wcroot,
const char *changelist = NULL;
const char *parent_relpath;
svn_wc__db_status_t new_presence;
- svn_kind_t new_kind;
+ svn_node_kind_t new_kind;
const char *new_depth_str = NULL;
svn_sqlite__stmt_t *stmt;
apr_int64_t repos_id;
@@ -10643,7 +10643,7 @@ commit_node(svn_wc__db_wcroot_t *wcroot,
new_kind = svn_sqlite__column_token(stmt_info, 4, kind_map);
/* What will the new depth be? */
- if (new_kind == svn_kind_dir)
+ if (new_kind == svn_node_dir)
new_depth_str = svn_sqlite__column_text(stmt_info, 11, scratch_pool);
/* Check that the repository information is not being changed. */
@@ -10807,7 +10807,7 @@ commit_node(svn_wc__db_wcroot_t *wcroot,
}
}
- if (new_kind == svn_kind_dir)
+ if (new_kind == svn_node_dir)
{
/* When committing a directory, we should have its new children. */
/* ### one day. just not today. */
@@ -10878,7 +10878,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_kind_t new_kind,
+ svn_node_kind_t new_kind,
const char *new_repos_relpath,
svn_revnum_t new_revision,
const apr_hash_t *new_props,
@@ -11026,7 +11026,7 @@ bump_node_revision(svn_wc__db_wcroot_t *
const apr_array_header_t *children;
int i;
svn_wc__db_status_t status;
- svn_kind_t db_kind;
+ svn_node_kind_t db_kind;
svn_revnum_t revision;
const char *repos_relpath;
apr_int64_t repos_id;
@@ -11048,11 +11048,11 @@ bump_node_revision(svn_wc__db_wcroot_t *
/* Skip file externals */
if (update_root
- && db_kind == svn_kind_file
+ && db_kind == svn_node_file
&& !is_root)
return SVN_NO_ERROR;
- if (skip_when_dir && db_kind == svn_kind_dir)
+ if (skip_when_dir && db_kind == svn_node_dir)
return SVN_NO_ERROR;
/* If the node is still marked 'not-present', then the server did not
@@ -11095,7 +11095,7 @@ bump_node_revision(svn_wc__db_wcroot_t *
/* Early out */
if (depth <= svn_depth_empty
- || db_kind != svn_kind_dir
+ || db_kind != svn_node_dir
|| status == svn_wc__db_status_server_excluded
|| status == svn_wc__db_status_excluded
|| status == svn_wc__db_status_not_present)
@@ -11161,7 +11161,7 @@ bump_revisions_post_update(svn_wc__db_wc
apr_pool_t *scratch_pool)
{
svn_wc__db_status_t status;
- svn_kind_t kind;
+ svn_node_kind_t kind;
svn_error_t *err;
apr_int64_t new_repos_id = INVALID_REPOS_ID;
@@ -12495,7 +12495,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_kind_t kind,
+ svn_node_kind_t kind,
const char *parent_abspath,
const char *def_local_abspath,
const char *repos_relpath,
@@ -13198,7 +13198,7 @@ svn_wc__db_read_conflict_internal(svn_sk
svn_error_t *
-svn_wc__db_read_kind(svn_kind_t *kind,
+svn_wc__db_read_kind(svn_node_kind_t *kind,
svn_wc__db_t *db,
const char *local_abspath,
svn_boolean_t allow_missing,
@@ -13226,7 +13226,7 @@ svn_wc__db_read_kind(svn_kind_t *kind,
{
if (allow_missing)
{
- *kind = svn_kind_unknown;
+ *kind = svn_node_unknown;
SVN_ERR(svn_sqlite__reset(stmt_info));
return SVN_NO_ERROR;
}
@@ -13272,7 +13272,7 @@ svn_wc__db_read_kind(svn_kind_t *kind,
if (report_none)
{
- *kind = svn_kind_none;
+ *kind = svn_node_none;
return svn_error_trace(svn_sqlite__reset(stmt_info));
}
}
@@ -13346,7 +13346,7 @@ svn_wc__db_is_wcroot(svn_boolean_t *is_w
*/
static svn_error_t *
db_is_switched(svn_boolean_t *is_switched,
- svn_kind_t *kind,
+ svn_node_kind_t *kind,
svn_wc__db_wcroot_t *wcroot,
const char *local_relpath,
apr_pool_t *scratch_pool)
@@ -13416,7 +13416,7 @@ db_is_switched(svn_boolean_t *is_switche
svn_error_t *
svn_wc__db_is_switched(svn_boolean_t *is_wcroot,
svn_boolean_t *is_switched,
- svn_kind_t *kind,
+ svn_node_kind_t *kind,
svn_wc__db_t *db,
const char *local_abspath,
apr_pool_t *scratch_pool)
@@ -13440,7 +13440,7 @@ svn_wc__db_is_switched(svn_boolean_t *is
*is_wcroot = TRUE;
if (kind)
- *kind = svn_kind_dir;
+ *kind = svn_node_dir;
return SVN_NO_ERROR;
}
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.h?rev=1455559&r1=1455558&r2=1455559&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.h (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.h Tue Mar 12 14:48:56 2013
@@ -640,7 +640,7 @@ svn_wc__db_base_add_excluded_node(svn_wc
const char *repos_root_url,
const char *repos_uuid,
svn_revnum_t revision,
- svn_kind_t kind,
+ svn_node_kind_t kind,
svn_wc__db_status_t status,
const svn_skel_t *conflict,
const svn_skel_t *work_items,
@@ -671,7 +671,7 @@ svn_wc__db_base_add_not_present_node(svn
const char *repos_root_url,
const char *repos_uuid,
svn_revnum_t revision,
- svn_kind_t kind,
+ svn_node_kind_t kind,
const svn_skel_t *conflict,
const svn_skel_t *work_items,
apr_pool_t *scratch_pool);
@@ -775,7 +775,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_kind_t *kind,
+ svn_node_kind_t *kind,
svn_revnum_t *revision,
const char **repos_relpath,
const char **repos_root_url,
@@ -799,7 +799,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_kind_t kind;
+ svn_node_kind_t kind;
svn_revnum_t revnum;
const char *repos_relpath;
const char *repos_root_url;
@@ -1197,7 +1197,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_kind_t *kind,
+ svn_node_kind_t *kind,
const char **defining_abspath,
const char **repos_root_url,
@@ -1635,7 +1635,7 @@ svn_error_t *
svn_wc__db_revert_list_read(svn_boolean_t *reverted,
const apr_array_header_t **marker_files,
svn_boolean_t *copied_here,
- svn_kind_t *kind,
+ svn_node_kind_t *kind,
svn_wc__db_t *db,
const char *local_abspath,
apr_pool_t *result_pool,
@@ -1645,7 +1645,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_kind_t kind;
+ svn_node_kind_t kind;
} svn_wc__db_revert_list_copied_child_info_t ;
/* Return in *CHILDREN a list of reverted copied nodes at or within
@@ -1712,7 +1712,7 @@ svn_wc__db_revert_list_done(svn_wc__db_t
The OUT parameters, and their "not available" values are:
STATUS n/a (always available)
- KIND svn_kind_unknown (For ACTUAL only nodes)
+ KIND svn_node_unknown (For ACTUAL only nodes)
REVISION SVN_INVALID_REVNUM
REPOS_RELPATH NULL
REPOS_ROOT_URL NULL
@@ -1861,7 +1861,7 @@ svn_wc__db_revert_list_done(svn_wc__db_t
*/
svn_error_t *
svn_wc__db_read_info(svn_wc__db_status_t *status, /* ### derived */
- svn_kind_t *kind,
+ svn_node_kind_t *kind,
svn_revnum_t *revision,
const char **repos_relpath,
const char **repos_root_url,
@@ -1909,7 +1909,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_kind_t kind;
+ svn_node_kind_t kind;
svn_revnum_t revnum;
const char *repos_relpath;
const char *repos_root_url;
@@ -1968,7 +1968,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_kind_t kind;
+ svn_node_kind_t kind;
};
/* When a node is deleted in WORKING, some of its information is no longer
@@ -1992,7 +1992,7 @@ struct svn_wc__db_walker_info_t {
*/
svn_error_t *
svn_wc__db_read_pristine_info(svn_wc__db_status_t *status,
- svn_kind_t *kind,
+ svn_node_kind_t *kind,
svn_revnum_t *changed_rev,
apr_time_t *changed_date,
const char **changed_author,
@@ -2270,7 +2270,7 @@ svn_wc__db_read_conflict(svn_skel_t **co
/* Return the kind of the node in DB at LOCAL_ABSPATH. The WORKING tree will
be examined first, then the BASE tree. If the node is not present in either
- tree and ALLOW_MISSING is TRUE, then svn_kind_unknown is returned.
+ tree and ALLOW_MISSING is TRUE, then svn_node_unknown is returned.
If the node is missing and ALLOW_MISSING is FALSE, then it will return
SVN_ERR_WC_PATH_NOT_FOUND.
@@ -2284,12 +2284,12 @@ svn_wc__db_read_conflict(svn_skel_t **co
svn_wc__db_status_deleted when show_deleted
- In other cases these nodes are reported with *KIND as svn_kind_none.
+ In other cases these nodes are reported with *KIND as svn_node_none.
(See also svn_wc_read_kind2()'s documentation)
Uses SCRATCH_POOL for temporary allocations. */
svn_error_t *
-svn_wc__db_read_kind(svn_kind_t *kind,
+svn_wc__db_read_kind(svn_node_kind_t *kind,
svn_wc__db_t *db,
const char *local_abspath,
svn_boolean_t allow_missing,
@@ -2360,7 +2360,7 @@ svn_wc__db_is_wcroot(svn_boolean_t *is_w
svn_error_t *
svn_wc__db_is_switched(svn_boolean_t *is_wcroot,
svn_boolean_t *is_switched,
- svn_kind_t *kind,
+ svn_node_kind_t *kind,
svn_wc__db_t *db,
const char *local_abspath,
apr_pool_t *scratch_pool);
@@ -2471,7 +2471,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_kind_t new_kind,
+ svn_node_kind_t new_kind,
const char *new_repos_relpath,
svn_revnum_t new_revision,
const apr_hash_t *new_props,
@@ -2875,7 +2875,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_kind_t kind,
+ svn_node_kind_t kind,
const char *parent_abspath,
const char *def_local_abspath,
const char *repos_relpath,
@@ -3058,7 +3058,7 @@ svn_wc__db_op_remove_node(svn_boolean_t
svn_boolean_t destroy_changes,
svn_revnum_t not_present_revision,
svn_wc__db_status_t not_present_status,
- svn_kind_t not_present_kind,
+ svn_node_kind_t not_present_kind,
const svn_skel_t *conflict,
const svn_skel_t *work_items,
svn_cancel_func_t cancel_func,
Modified: subversion/trunk/subversion/libsvn_wc/wc_db_private.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db_private.h?rev=1455559&r1=1455558&r2=1455559&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db_private.h (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db_private.h Tue Mar 12 14:48:56 2013
@@ -57,7 +57,7 @@ struct svn_wc__db_t {
struct
{
svn_stringbuf_t *abspath;
- svn_kind_t kind;
+ svn_node_kind_t kind;
} parse_cache;
/* As we grow the state of this DB, allocate that state here. */
@@ -213,7 +213,7 @@ svn_wc__db_util_open_db(svn_sqlite__db_t
DB+LOCAL_ABSPATH, and outputting repos ids instead of URL+UUID. */
svn_error_t *
svn_wc__db_read_info_internal(svn_wc__db_status_t *status,
- svn_kind_t *kind,
+ svn_node_kind_t *kind,
svn_revnum_t *revision,
const char **repos_relpath,
apr_int64_t *repos_id,
@@ -246,7 +246,7 @@ svn_wc__db_read_info_internal(svn_wc__db
DB+LOCAL_ABSPATH and outputting REPOS_ID instead of URL+UUID. */
svn_error_t *
svn_wc__db_base_get_info_internal(svn_wc__db_status_t *status,
- svn_kind_t *kind,
+ svn_node_kind_t *kind,
svn_revnum_t *revision,
const char **repos_relpath,
apr_int64_t *repos_id,
@@ -281,7 +281,7 @@ svn_wc__db_base_get_info_internal(svn_wc
*/
svn_error_t *
svn_wc__db_depth_get_info(svn_wc__db_status_t *status,
- svn_kind_t *kind,
+ svn_node_kind_t *kind,
svn_revnum_t *revision,
const char **repos_relpath,
apr_int64_t *repos_id,
@@ -358,7 +358,7 @@ svn_wc__db_with_txn(svn_wc__db_wcroot_t
SVN_SQLITE__WITH_LOCK(expr, (wcroot)->sdb)
-/* Return CHILDREN mapping const char * names to svn_kind_t * for the
+/* Return CHILDREN mapping const char * names to svn_node_kind_t * for the
children of LOCAL_RELPATH at OP_DEPTH. */
svn_error_t *
svn_wc__db_get_children_op_depth(apr_hash_t **children,
@@ -410,7 +410,7 @@ svn_wc__db_get_children_op_depth(apr_has
svn_error_t *
svn_wc__db_extend_parent_delete(svn_wc__db_wcroot_t *wcroot,
const char *local_relpath,
- svn_kind_t kind,
+ svn_node_kind_t kind,
int op_depth,
apr_pool_t *scratch_pool);
Modified: subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c?rev=1455559&r1=1455558&r2=1455559&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c Tue Mar 12 14:48:56 2013
@@ -460,7 +460,7 @@ tc_editor_add_directory(void *baton,
struct tc_editor_baton *b = baton;
int op_depth = relpath_depth(b->move_root_dst_relpath);
const char *move_dst_repos_relpath;
- svn_kind_t move_dst_kind;
+ svn_node_kind_t move_dst_kind;
svn_boolean_t is_conflicted;
const char *abspath;
svn_node_kind_t old_kind;
@@ -470,7 +470,7 @@ tc_editor_add_directory(void *baton,
/* Update NODES, only the bits not covered by the later call to
replace_moved_layer. */
- SVN_ERR(svn_wc__db_extend_parent_delete(b->wcroot, relpath, svn_kind_dir,
+ SVN_ERR(svn_wc__db_extend_parent_delete(b->wcroot, relpath, svn_node_dir,
op_depth, scratch_pool));
err = svn_wc__db_depth_get_info(NULL, &move_dst_kind, NULL,
@@ -488,7 +488,7 @@ tc_editor_add_directory(void *baton,
else
{
SVN_ERR(err);
- old_kind = svn__node_kind_from_kind(move_dst_kind);
+ old_kind = move_dst_kind;
}
/* Check for NODES tree-conflict. */
@@ -552,7 +552,7 @@ tc_editor_add_file(void *baton,
struct tc_editor_baton *b = baton;
int op_depth = relpath_depth(b->move_root_dst_relpath);
const char *move_dst_repos_relpath;
- svn_kind_t move_dst_kind;
+ svn_node_kind_t move_dst_kind;
svn_node_kind_t old_kind;
svn_boolean_t is_conflicted;
const char *abspath;
@@ -561,7 +561,7 @@ tc_editor_add_file(void *baton,
/* Update NODES, only the bits not covered by the later call to
replace_moved_layer. */
- SVN_ERR(svn_wc__db_extend_parent_delete(b->wcroot, relpath, svn_kind_file,
+ SVN_ERR(svn_wc__db_extend_parent_delete(b->wcroot, relpath, svn_node_file,
op_depth, scratch_pool));
err = svn_wc__db_depth_get_info(NULL, &move_dst_kind, NULL,
@@ -579,7 +579,7 @@ tc_editor_add_file(void *baton,
else
{
SVN_ERR(err);
- old_kind = svn__node_kind_from_kind(move_dst_kind);
+ old_kind = move_dst_kind;
}
/* Check for NODES tree-conflict. */
@@ -642,7 +642,7 @@ tc_editor_add_symlink(void *baton,
static svn_error_t *
tc_editor_add_absent(void *baton,
const char *relpath,
- svn_kind_t kind,
+ svn_node_kind_t kind,
svn_revnum_t replaces_rev,
apr_pool_t *scratch_pool)
{
@@ -780,7 +780,7 @@ tc_editor_alter_directory(void *baton,
struct tc_editor_baton *b = baton;
const char *move_dst_repos_relpath;
svn_revnum_t move_dst_revision;
- svn_kind_t move_dst_kind;
+ svn_node_kind_t move_dst_kind;
working_node_version_t old_version, new_version;
svn_wc__db_status_t status;
svn_boolean_t is_conflicted;
@@ -795,10 +795,10 @@ tc_editor_alter_directory(void *baton,
relpath_depth(b->move_root_dst_relpath),
scratch_pool, scratch_pool));
SVN_ERR_ASSERT(move_dst_revision == expected_move_dst_revision);
- SVN_ERR_ASSERT(move_dst_kind == svn_kind_dir);
+ SVN_ERR_ASSERT(move_dst_kind == svn_node_dir);
SVN_ERR(check_tree_conflict(&is_conflicted, b, dst_relpath,
- svn__node_kind_from_kind(move_dst_kind),
+ move_dst_kind,
svn_node_dir,
move_dst_repos_relpath,
svn_wc_conflict_action_edit,
@@ -995,7 +995,7 @@ tc_editor_alter_file(void *baton,
struct tc_editor_baton *b = baton;
const char *move_dst_repos_relpath;
svn_revnum_t move_dst_revision;
- svn_kind_t move_dst_kind;
+ svn_node_kind_t move_dst_kind;
working_node_version_t old_version, new_version;
svn_boolean_t is_conflicted;
@@ -1007,10 +1007,10 @@ tc_editor_alter_file(void *baton,
relpath_depth(b->move_root_dst_relpath),
scratch_pool, scratch_pool));
SVN_ERR_ASSERT(move_dst_revision == expected_move_dst_revision);
- SVN_ERR_ASSERT(move_dst_kind == svn_kind_file);
+ SVN_ERR_ASSERT(move_dst_kind == svn_node_file);
SVN_ERR(check_tree_conflict(&is_conflicted, b, dst_relpath,
- svn__node_kind_from_kind(move_dst_kind),
+ move_dst_kind,
svn_node_file,
move_dst_repos_relpath,
svn_wc_conflict_action_edit,
@@ -1058,7 +1058,7 @@ tc_editor_delete(void *baton,
svn_sqlite__stmt_t *stmt;
int op_depth = relpath_depth(b->move_root_dst_relpath);
const char *move_dst_repos_relpath;
- svn_kind_t move_dst_kind;
+ svn_node_kind_t move_dst_kind;
svn_boolean_t is_conflicted;
svn_boolean_t must_delete_working_nodes = FALSE;
const char *local_abspath = svn_dirent_join(b->wcroot->abspath, relpath,
@@ -1075,7 +1075,7 @@ tc_editor_delete(void *baton,
conflicts. This catches conflicts on the node itself; deleted
children are caught as local modifications below.*/
SVN_ERR(check_tree_conflict(&is_conflicted, b, relpath,
- svn__node_kind_from_kind(move_dst_kind),
+ move_dst_kind,
svn_node_unknown,
move_dst_repos_relpath,
svn_wc_conflict_action_delete,
@@ -1120,7 +1120,7 @@ tc_editor_delete(void *baton,
SVN_ERR(mark_tree_conflict(relpath, b->wcroot, b->db, b->old_version,
b->new_version, b->move_root_dst_relpath,
b->operation,
- svn__node_kind_from_kind(move_dst_kind),
+ move_dst_kind,
svn_node_none,
move_dst_repos_relpath, reason,
svn_wc_conflict_action_delete, NULL,
@@ -1134,7 +1134,7 @@ tc_editor_delete(void *baton,
svn_boolean_t have_row;
apr_pool_t *iterpool = svn_pool_create(scratch_pool);
svn_skel_t *work_item;
- svn_kind_t del_kind;
+ svn_node_kind_t del_kind;
const char *del_abspath;
SVN_ERR(svn_sqlite__get_statement(&stmt, b->wcroot->sdb,
@@ -1152,7 +1152,7 @@ tc_editor_delete(void *baton,
del_abspath = svn_dirent_join(b->wcroot->abspath,
svn_sqlite__column_text(stmt, 0, NULL),
iterpool);
- if (del_kind == svn_kind_dir)
+ if (del_kind == svn_node_dir)
err = svn_wc__wq_build_dir_remove(&work_item, b->db,
b->wcroot->abspath, del_abspath,
FALSE /* recursive */,
@@ -1176,7 +1176,7 @@ tc_editor_delete(void *baton,
NULL, NULL,
b->wcroot, relpath, op_depth,
iterpool, iterpool));
- if (del_kind == svn_kind_dir)
+ if (del_kind == svn_node_dir)
SVN_ERR(svn_wc__wq_build_dir_remove(&work_item, b->db,
b->wcroot->abspath, local_abspath,
FALSE /* recursive */,
@@ -1191,7 +1191,7 @@ tc_editor_delete(void *baton,
if (!is_conflicted)
SVN_ERR(update_move_list_add(b->wcroot, relpath,
svn_wc_notify_update_delete,
- svn__node_kind_from_kind(del_kind),
+ del_kind,
svn_wc_notify_state_inapplicable,
svn_wc_notify_state_inapplicable));
svn_pool_destroy(iterpool);
@@ -1355,7 +1355,7 @@ get_tc_info(svn_wc_operation_t *operatio
}
/* Return *PROPS, *CHECKSUM, *CHILDREN and *KIND for LOCAL_RELPATH at
- OP_DEPTH provided the row exists. Return *KIND of svn_kind_none if
+ OP_DEPTH provided the row exists. Return *KIND of svn_node_none if
the row does not exist. *CHILDREN is a sorted array of basenames of
type 'const char *', rather than a hash, to allow the driver to
process children in a defined order. */
@@ -1363,7 +1363,7 @@ static svn_error_t *
get_info(apr_hash_t **props,
const svn_checksum_t **checksum,
apr_array_header_t **children,
- svn_kind_t *kind,
+ svn_node_kind_t *kind,
const char *local_relpath,
int op_depth,
svn_wc__db_wcroot_t *wcroot,
@@ -1382,7 +1382,7 @@ get_info(apr_hash_t **props,
if (err && err->apr_err == SVN_ERR_WC_PATH_NOT_FOUND)
{
svn_error_clear(err);
- *kind = svn_kind_none;
+ *kind = svn_node_none;
}
else
SVN_ERR(err);
@@ -1466,7 +1466,7 @@ update_moved_away_node(svn_editor_t *tc_
svn_wc__db_wcroot_t *wcroot,
apr_pool_t *scratch_pool)
{
- svn_kind_t src_kind, dst_kind;
+ svn_node_kind_t src_kind, dst_kind;
const svn_checksum_t *src_checksum, *dst_checksum;
apr_hash_t *src_props, *dst_props;
apr_array_header_t *src_children, *dst_children;
@@ -1480,16 +1480,16 @@ update_moved_away_node(svn_editor_t *tc_
dst_relpath, dst_op_depth,
wcroot, scratch_pool, scratch_pool));
- if (src_kind == svn_kind_none
- || (dst_kind != svn_kind_none && src_kind != dst_kind))
+ if (src_kind == svn_node_none
+ || (dst_kind != svn_node_none && src_kind != dst_kind))
{
SVN_ERR(svn_editor_delete(tc_editor, dst_relpath,
move_root_dst_revision));
}
- if (src_kind != svn_kind_none && src_kind != dst_kind)
+ if (src_kind != svn_node_none && src_kind != dst_kind)
{
- if (src_kind == svn_kind_file || src_kind == svn_kind_symlink)
+ if (src_kind == svn_node_file || src_kind == svn_node_symlink)
{
svn_stream_t *contents;
@@ -1500,14 +1500,14 @@ update_moved_away_node(svn_editor_t *tc_
src_checksum, contents, src_props,
move_root_dst_revision));
}
- else if (src_kind == svn_kind_dir)
+ else if (src_kind == svn_node_dir)
{
SVN_ERR(svn_editor_add_directory(tc_editor, dst_relpath,
src_children, src_props,
move_root_dst_revision));
}
}
- else if (src_kind != svn_kind_none)
+ else if (src_kind != svn_node_none)
{
svn_boolean_t match;
apr_hash_t *props;
@@ -1516,7 +1516,7 @@ update_moved_away_node(svn_editor_t *tc_
props = match ? NULL: src_props;
- if (src_kind == svn_kind_file || src_kind == svn_kind_symlink)
+ if (src_kind == svn_node_file || src_kind == svn_node_symlink)
{
svn_stream_t *contents;
@@ -1535,7 +1535,7 @@ update_moved_away_node(svn_editor_t *tc_
move_root_dst_revision,
props, src_checksum, contents));
}
- else if (src_kind == svn_kind_dir)
+ else if (src_kind == svn_node_dir)
{
apr_array_header_t *children
= children_match(src_children, dst_children) ? NULL : src_children;
@@ -1547,7 +1547,7 @@ update_moved_away_node(svn_editor_t *tc_
}
}
- if (src_kind == svn_kind_dir)
+ if (src_kind == svn_node_dir)
{
apr_pool_t *iterpool = svn_pool_create(scratch_pool);
int i = 0, j = 0;
@@ -2016,8 +2016,8 @@ bump_mark_tree_conflict(svn_wc__db_wcroo
svn_revnum_t new_rev;
const char *old_repos_url;
const char *new_repos_url;
- svn_kind_t old_kind;
- svn_kind_t new_kind;
+ svn_node_kind_t old_kind;
+ svn_node_kind_t new_kind;
svn_wc_conflict_version_t *old_version;
svn_wc_conflict_version_t *new_version;
@@ -2051,17 +2051,16 @@ bump_mark_tree_conflict(svn_wc__db_wcroo
old_version = svn_wc_conflict_version_create2(
old_repos_url, repos_uuid, old_repos_relpath, old_rev,
- svn__node_kind_from_kind(old_kind), scratch_pool);
+ old_kind, scratch_pool);
new_version = svn_wc_conflict_version_create2(
new_repos_url, repos_uuid, new_repos_relpath, new_rev,
- svn__node_kind_from_kind(new_kind), scratch_pool);
+ new_kind, scratch_pool);
SVN_ERR(mark_tree_conflict(move_src_root_relpath,
wcroot, db, old_version, new_version,
move_dst_op_root_relpath,
svn_wc_operation_update,
- svn__node_kind_from_kind(old_kind),
- svn__node_kind_from_kind(new_kind),
+ old_kind, new_kind,
old_repos_relpath,
svn_wc_conflict_reason_moved_away,
svn_wc_conflict_action_edit,
@@ -2113,7 +2112,7 @@ bump_moved_away(svn_wc__db_wcroot_t *wcr
if (depth != svn_depth_infinity)
{
svn_boolean_t skip_this_src = FALSE;
- svn_kind_t src_kind;
+ svn_node_kind_t src_kind;
if (strcmp(src_relpath, local_relpath))
{
@@ -2124,7 +2123,7 @@ bump_moved_away(svn_wc__db_wcroot_t *wcr
break;
case svn_depth_files:
src_kind = svn_sqlite__column_token(stmt, 3, kind_map);
- if (src_kind != svn_kind_file)
+ if (src_kind != svn_node_file)
{
skip_this_src = TRUE;
break;
Modified: subversion/trunk/subversion/libsvn_wc/wc_db_wcroot.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db_wcroot.c?rev=1455559&r1=1455558&r2=1455559&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db_wcroot.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db_wcroot.c Tue Mar 12 14:48:56 2013
@@ -104,7 +104,7 @@ get_old_version(int *version,
This function may do strange things, but at long as it comes up with the
Right Answer, we should be happy. */
static svn_error_t *
-get_path_kind(svn_kind_t *kind,
+get_path_kind(svn_node_kind_t *kind,
svn_wc__db_t *db,
const char *local_abspath,
apr_pool_t *scratch_pool)
@@ -137,7 +137,7 @@ get_path_kind(svn_kind_t *kind,
SVN_ERR(svn_io_check_special_path(local_abspath, &node_kind,
&special, scratch_pool));
- db->parse_cache.kind = svn__kind_from_node_kind(node_kind, special);
+ db->parse_cache.kind = (special ? svn_node_symlink : node_kind);
*kind = db->parse_cache.kind;
return SVN_NO_ERROR;
@@ -423,7 +423,7 @@ svn_wc__db_wcroot_parse_local_abspath(sv
{
const char *local_dir_abspath;
const char *original_abspath = local_abspath;
- svn_kind_t kind;
+ svn_node_kind_t kind;
const char *build_relpath;
svn_wc__db_wcroot_t *probe_wcroot;
svn_wc__db_wcroot_t *found_wcroot = NULL;
@@ -460,7 +460,7 @@ svn_wc__db_wcroot_parse_local_abspath(sv
### into wc_db which references a file. calls for directories could
### get an early-exit in the hash lookup just above. */
SVN_ERR(get_path_kind(&kind, db, local_abspath, scratch_pool));
- if (kind != svn_kind_dir)
+ if (kind != svn_node_dir)
{
/* If the node specified by the path is NOT present, then it cannot
possibly be a directory containing ".svn/wc.db".
@@ -495,7 +495,7 @@ svn_wc__db_wcroot_parse_local_abspath(sv
many ancestors need to be scanned until we start hitting content
on the disk. Set ALWAYS_CHECK to keep looking for .svn/entries
rather than bailing out after the first check. */
- if (kind == svn_kind_none)
+ if (kind == svn_node_none)
always_check = TRUE;
/* Start the scanning at LOCAL_DIR_ABSPATH. */
@@ -587,7 +587,7 @@ svn_wc__db_wcroot_parse_local_abspath(sv
* (Issue #2557, #3987). If so, try again, this time scanning
* for a db within the directory the symlink points to,
* rather than within the symlink's parent directory. */
- if (kind == svn_kind_symlink)
+ if (kind == svn_node_symlink)
{
svn_node_kind_t resolved_kind;
@@ -607,7 +607,7 @@ svn_wc__db_wcroot_parse_local_abspath(sv
SVN_ERR(read_link_target(&local_abspath, local_abspath,
scratch_pool));
try_symlink_as_dir:
- kind = svn_kind_dir;
+ kind = svn_node_dir;
moved_upwards = FALSE;
local_dir_abspath = local_abspath;
build_relpath = "";
@@ -669,7 +669,7 @@ try_symlink_as_dir:
db->state_pool, scratch_pool);
if (err && (err->apr_err == SVN_ERR_WC_UNSUPPORTED_FORMAT ||
err->apr_err == SVN_ERR_WC_UPGRADE_REQUIRED) &&
- kind == svn_kind_symlink)
+ kind == svn_node_symlink)
{
/* We found an unsupported WC after traversing upwards from a
* symlink. Fall through to code below to check if the symlink
@@ -749,7 +749,7 @@ try_symlink_as_dir:
*local_relpath = svn_relpath_join(dir_relpath, build_relpath, result_pool);
}
- if (kind == svn_kind_symlink)
+ if (kind == svn_node_symlink)
{
svn_boolean_t retry_if_dir = FALSE;
svn_wc__db_status_t status;
Modified: subversion/trunk/subversion/libsvn_wc/wcroot_anchor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wcroot_anchor.c?rev=1455559&r1=1455558&r2=1455559&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wcroot_anchor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wcroot_anchor.c Tue Mar 12 14:48:56 2013
@@ -145,7 +145,7 @@
svn_error_t *
svn_wc_check_root(svn_boolean_t *is_wcroot,
svn_boolean_t *is_switched,
- svn_kind_t *kind,
+ svn_node_kind_t *kind,
svn_wc_context_t *wc_ctx,
const char *local_abspath,
apr_pool_t *scratch_pool)
@@ -191,7 +191,7 @@ svn_wc_get_actual_target2(const char **a
apr_pool_t *scratch_pool)
{
svn_boolean_t is_wc_root, is_switched;
- svn_kind_t kind;
+ svn_node_kind_t kind;
const char *local_abspath;
svn_error_t *err;
@@ -213,7 +213,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_kind_dir))
+ if (!(is_wc_root || is_switched) || (kind != svn_node_dir))
{
svn_dirent_split(anchor, target, path, result_pool);
}
Modified: subversion/trunk/subversion/svnmucc/svnmucc.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnmucc/svnmucc.c?rev=1455559&r1=1455558&r2=1455559&view=diff
==============================================================================
--- subversion/trunk/subversion/svnmucc/svnmucc.c (original)
+++ subversion/trunk/subversion/svnmucc/svnmucc.c Tue Mar 12 14:48:56 2013
@@ -682,23 +682,20 @@ fetch_props_func(apr_hash_t **props,
}
static svn_error_t *
-fetch_kind_func(svn_kind_t *kind,
+fetch_kind_func(svn_node_kind_t *kind,
void *baton,
const char *path,
svn_revnum_t base_revision,
apr_pool_t *scratch_pool)
{
struct fetch_baton *fb = baton;
- svn_node_kind_t node_kind;
if (! SVN_IS_VALID_REVNUM(base_revision))
base_revision = fb->head;
- SVN_ERR(svn_ra_check_path(fb->session, path, base_revision, &node_kind,
+ SVN_ERR(svn_ra_check_path(fb->session, path, base_revision, kind,
scratch_pool));
- *kind = svn__kind_from_node_kind(node_kind, FALSE);
-
return SVN_NO_ERROR;
}
Modified: subversion/trunk/subversion/svnrdump/dump_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnrdump/dump_editor.c?rev=1455559&r1=1455558&r2=1455559&view=diff
==============================================================================
--- subversion/trunk/subversion/svnrdump/dump_editor.c (original)
+++ subversion/trunk/subversion/svnrdump/dump_editor.c Tue Mar 12 14:48:56 2013
@@ -1194,14 +1194,13 @@ fetch_props_func(apr_hash_t **props,
}
static svn_error_t *
-fetch_kind_func(svn_kind_t *kind,
+fetch_kind_func(svn_node_kind_t *kind,
void *baton,
const char *path,
svn_revnum_t base_revision,
apr_pool_t *scratch_pool)
{
struct dump_edit_baton *eb = baton;
- svn_node_kind_t node_kind;
if (path[0] == '/')
path += 1;
@@ -1209,10 +1208,9 @@ fetch_kind_func(svn_kind_t *kind,
if (! SVN_IS_VALID_REVNUM(base_revision))
base_revision = eb->current_revision - 1;
- SVN_ERR(svn_ra_check_path(eb->ra_session, path, base_revision, &node_kind,
+ SVN_ERR(svn_ra_check_path(eb->ra_session, path, base_revision, kind,
scratch_pool));
- *kind = svn__kind_from_node_kind(node_kind, FALSE);
return SVN_NO_ERROR;
}
Modified: subversion/trunk/subversion/svnrdump/load_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnrdump/load_editor.c?rev=1455559&r1=1455558&r2=1455559&view=diff
==============================================================================
--- subversion/trunk/subversion/svnrdump/load_editor.c (original)
+++ subversion/trunk/subversion/svnrdump/load_editor.c Tue Mar 12 14:48:56 2013
@@ -465,22 +465,20 @@ fetch_props_func(apr_hash_t **props,
}
static svn_error_t *
-fetch_kind_func(svn_kind_t *kind,
+fetch_kind_func(svn_node_kind_t *kind,
void *baton,
const char *path,
svn_revnum_t base_revision,
apr_pool_t *scratch_pool)
{
struct revision_baton *rb = baton;
- svn_node_kind_t node_kind;
if (! SVN_IS_VALID_REVNUM(base_revision))
base_revision = rb->rev - 1;
SVN_ERR(svn_ra_check_path(rb->pb->aux_session, path, base_revision,
- &node_kind, scratch_pool));
+ kind, scratch_pool));
- *kind = svn__kind_from_node_kind(node_kind, FALSE);
return SVN_NO_ERROR;
}
Modified: subversion/trunk/subversion/svnserve/serve.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnserve/serve.c?rev=1455559&r1=1455558&r2=1455559&view=diff
==============================================================================
--- subversion/trunk/subversion/svnserve/serve.c (original)
+++ subversion/trunk/subversion/svnserve/serve.c Tue Mar 12 14:48:56 2013
@@ -3425,20 +3425,18 @@ fetch_props_func(apr_hash_t **props,
}
static svn_error_t *
-fetch_kind_func(svn_kind_t *kind,
+fetch_kind_func(svn_node_kind_t *kind,
void *baton,
const char *path,
svn_revnum_t base_revision,
apr_pool_t *scratch_pool)
{
- svn_node_kind_t node_kind;
svn_fs_root_t *fs_root;
path = get_normalized_repo_rel_path(baton, path, scratch_pool);
SVN_ERR(get_revision_root(&fs_root, baton, base_revision, scratch_pool));
- SVN_ERR(svn_fs_check_path(&node_kind, fs_root, path, scratch_pool));
- *kind = svn__kind_from_node_kind(node_kind, FALSE);
+ SVN_ERR(svn_fs_check_path(kind, fs_root, path, scratch_pool));
return SVN_NO_ERROR;
}
Modified: subversion/trunk/subversion/svnsync/svnsync.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnsync/svnsync.c?rev=1455559&r1=1455558&r2=1455559&view=diff
==============================================================================
--- subversion/trunk/subversion/svnsync/svnsync.c (original)
+++ subversion/trunk/subversion/svnsync/svnsync.c Tue Mar 12 14:48:56 2013
@@ -1143,14 +1143,13 @@ fetch_props_func(apr_hash_t **props,
}
static svn_error_t *
-fetch_kind_func(svn_kind_t *kind,
+fetch_kind_func(svn_node_kind_t *kind,
void *baton,
const char *path,
svn_revnum_t base_revision,
apr_pool_t *scratch_pool)
{
struct replay_baton_t *rb = baton;
- svn_node_kind_t node_kind;
if (svn_path_is_url(path))
path = svn_uri_skip_ancestor(rb->to_root, path, scratch_pool);
@@ -1161,9 +1160,8 @@ fetch_kind_func(svn_kind_t *kind,
base_revision = rb->current_revision - 1;
SVN_ERR(svn_ra_check_path(rb->extra_to_session, path, base_revision,
- &node_kind, scratch_pool));
+ kind, scratch_pool));
- *kind = svn__kind_from_node_kind(node_kind, FALSE);
return SVN_NO_ERROR;
}
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=1455559&r1=1455558&r2=1455559&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/db-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/db-test.c Tue Mar 12 14:48:56 2013
@@ -378,7 +378,7 @@ static svn_error_t *
test_getting_info(apr_pool_t *pool)
{
const char *local_abspath;
- svn_kind_t kind;
+ svn_node_kind_t kind;
svn_wc__db_status_t status;
svn_revnum_t revision;
const char *repos_relpath;
@@ -408,7 +408,7 @@ test_getting_info(apr_pool_t *pool)
&update_root,
db, local_abspath,
pool, pool));
- SVN_TEST_ASSERT(kind == svn_kind_dir);
+ SVN_TEST_ASSERT(kind == svn_node_dir);
SVN_TEST_ASSERT(status == svn_wc__db_status_normal);
SVN_TEST_ASSERT(revision == 1);
SVN_TEST_STRING_ASSERT(repos_relpath, "");
@@ -434,7 +434,7 @@ test_getting_info(apr_pool_t *pool)
NULL, NULL, NULL,
db, svn_dirent_join(local_abspath, "A", pool),
pool, pool));
- SVN_TEST_ASSERT(kind == svn_kind_file);
+ SVN_TEST_ASSERT(kind == svn_node_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);
@@ -449,7 +449,7 @@ test_getting_info(apr_pool_t *pool)
NULL, NULL, NULL,
db, svn_dirent_join(local_abspath, "B", pool),
pool, pool));
- SVN_TEST_ASSERT(kind == svn_kind_symlink);
+ SVN_TEST_ASSERT(kind == svn_node_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");
@@ -472,7 +472,7 @@ test_getting_info(apr_pool_t *pool)
NULL, NULL, NULL, NULL,
db, svn_dirent_join(local_abspath, "C", pool),
pool, pool));
- SVN_TEST_ASSERT(kind == svn_kind_unknown);
+ SVN_TEST_ASSERT(kind == svn_node_unknown);
SVN_TEST_ASSERT(status == svn_wc__db_status_server_excluded);
/* Test: not-present presence. */
@@ -556,12 +556,12 @@ static svn_error_t *
validate_node(svn_wc__db_t *db,
const char *local_abspath,
const char *relpath,
- svn_kind_t expected_kind,
+ svn_node_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_kind_t kind;
+ svn_node_kind_t kind;
svn_wc__db_status_t status;
apr_hash_t *props;
const svn_string_t *value;
@@ -691,7 +691,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_kind_file, svn_wc__db_status_server_excluded,
+ svn_node_file, svn_wc__db_status_server_excluded,
NULL, NULL,
pool));
@@ -699,7 +699,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_kind_dir, svn_wc__db_status_excluded,
+ svn_node_dir, svn_wc__db_status_excluded,
NULL, NULL,
pool));
@@ -707,7 +707,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_kind_symlink,
+ svn_node_symlink,
NULL, NULL,
pool));
@@ -715,36 +715,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_kind_unknown, svn_wc__db_status_server_excluded,
+ svn_node_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_kind_dir, svn_wc__db_status_normal,
+ svn_node_dir, svn_wc__db_status_normal,
pool));
SVN_ERR(validate_node(db, local_abspath, "N/N-a",
- svn_kind_file, svn_wc__db_status_normal,
+ svn_node_file, svn_wc__db_status_normal,
pool));
SVN_ERR(validate_node(db, local_abspath, "N/N-b",
- svn_kind_file,
+ svn_node_file,
svn_wc__db_status_server_excluded,
pool));
SVN_ERR(validate_node(db, local_abspath, "N/N-c",
- svn_kind_unknown, svn_wc__db_status_incomplete,
+ svn_node_unknown, svn_wc__db_status_incomplete,
pool));
SVN_ERR(validate_node(db, local_abspath, "O",
- svn_kind_symlink, svn_wc__db_status_normal,
+ svn_node_symlink, svn_wc__db_status_normal,
pool));
SVN_ERR(validate_node(db, local_abspath, "P",
- svn_kind_dir, svn_wc__db_status_excluded,
+ svn_node_dir, svn_wc__db_status_excluded,
pool));
SVN_ERR(validate_node(db, local_abspath, "Q",
- svn_kind_symlink, svn_wc__db_status_not_present,
+ svn_node_symlink, svn_wc__db_status_not_present,
pool));
SVN_ERR(validate_node(db, local_abspath, "R",
- svn_kind_unknown,
+ svn_node_unknown,
svn_wc__db_status_server_excluded,
pool));
@@ -800,7 +800,7 @@ static svn_error_t *
test_working_info(apr_pool_t *pool)
{
const char *local_abspath;
- svn_kind_t kind;
+ svn_node_kind_t kind;
svn_wc__db_status_t status;
svn_revnum_t revision;
const char *repos_relpath;
@@ -844,7 +844,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_kind_dir);
+ SVN_TEST_ASSERT(kind == svn_node_dir);
SVN_TEST_ASSERT(revision == SVN_INVALID_REVNUM);
SVN_TEST_ASSERT(repos_relpath == NULL);
SVN_TEST_ASSERT(repos_root_url == NULL);
@@ -895,14 +895,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_kind_file, svn_wc__db_status_server_excluded,
+ svn_node_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_kind_file, svn_wc__db_status_server_excluded,
+ svn_node_file, svn_wc__db_status_server_excluded,
NULL, NULL,
pool));
@@ -1459,7 +1459,7 @@ test_externals_store(apr_pool_t *pool)
{
svn_wc__db_status_t status;
- svn_kind_t kind;
+ svn_node_kind_t kind;
const char *repos_root_url;
const char *repos_uuid;
const char *defining_abspath;
@@ -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_kind_file);
+ SVN_TEST_ASSERT(kind == svn_node_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);
@@ -1507,7 +1507,7 @@ test_externals_store(apr_pool_t *pool)
pool, pool));
SVN_TEST_ASSERT(status == svn_wc__db_status_normal);
- SVN_TEST_ASSERT(kind == svn_kind_dir);
+ SVN_TEST_ASSERT(kind == svn_node_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);