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 [1/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...
Author: brane
Date: Tue Mar 12 14:48:56 2013
New Revision: 1455559
URL: http://svn.apache.org/r1455559
Log:
Merge svn_kind_t into svn_node_kind_t, leaving only one public enumeration
that describes node kinds.
* subversion/include/svn_types.h (svn_kind_t): Removed.
All uses of svn_kind_t were replaced with svn_node_kind_t.
(svn_node_kind_t): New enumeration constant, svn_node_symlink.
Replaces all previous uses of svn_kind_symlink.
(svn__node_kind_from_kind): Removed. All call sites updated.
(svn__kind_from_node_kind): Removed. All call sites updated.
* subversion/libsvn_wc/tree_conflicts.c (node_kind_map):
Added comment about incompatible representation of svn_node_unknown.
* subversion/libsvn_wc/node.c (convert_db_kind_to_node_kind):
May be redundant, and comment is out of date. Added a note about that.
There are also a zillion changes in dependent files, and they all result
from the following renames:
svn_kind_t to svn_node_kind_t
svn_kind_none to svn_node_none
svn_kind_file to svn_node_file
svn_kind_dir to svn_node_dir
svn_kind_unknown to svn_node_unknown
svn_kind_symlink to svn_node_symlink
Modified:
subversion/trunk/notes/ev2-callbacks-template.c
subversion/trunk/subversion/include/private/svn_debug.h
subversion/trunk/subversion/include/private/svn_editor.h
subversion/trunk/subversion/include/private/svn_ra_private.h
subversion/trunk/subversion/include/private/svn_wc_private.h
subversion/trunk/subversion/include/svn_delta.h
subversion/trunk/subversion/include/svn_types.h
subversion/trunk/subversion/include/svn_wc.h
subversion/trunk/subversion/libsvn_client/client.h
subversion/trunk/subversion/libsvn_client/commit.c
subversion/trunk/subversion/libsvn_client/ra.c
subversion/trunk/subversion/libsvn_client/repos_diff.c
subversion/trunk/subversion/libsvn_client/util.c
subversion/trunk/subversion/libsvn_delta/compat.c
subversion/trunk/subversion/libsvn_delta/editor.c
subversion/trunk/subversion/libsvn_fs/editor.c
subversion/trunk/subversion/libsvn_ra_serf/property.c
subversion/trunk/subversion/libsvn_ra_serf/ra_serf.h
subversion/trunk/subversion/libsvn_ra_serf/serf.c
subversion/trunk/subversion/libsvn_ra_serf/update.c
subversion/trunk/subversion/libsvn_repos/commit.c
subversion/trunk/subversion/libsvn_repos/dump.c
subversion/trunk/subversion/libsvn_repos/replay.c
subversion/trunk/subversion/libsvn_subr/types.c
subversion/trunk/subversion/libsvn_wc/adm_crawler.c
subversion/trunk/subversion/libsvn_wc/adm_files.c
subversion/trunk/subversion/libsvn_wc/adm_ops.c
subversion/trunk/subversion/libsvn_wc/ambient_depth_filter_editor.c
subversion/trunk/subversion/libsvn_wc/cleanup.c
subversion/trunk/subversion/libsvn_wc/conflicts.c
subversion/trunk/subversion/libsvn_wc/copy.c
subversion/trunk/subversion/libsvn_wc/crop.c
subversion/trunk/subversion/libsvn_wc/delete.c
subversion/trunk/subversion/libsvn_wc/deprecated.c
subversion/trunk/subversion/libsvn_wc/diff_editor.c
subversion/trunk/subversion/libsvn_wc/diff_local.c
subversion/trunk/subversion/libsvn_wc/entries.c
subversion/trunk/subversion/libsvn_wc/externals.c
subversion/trunk/subversion/libsvn_wc/info.c
subversion/trunk/subversion/libsvn_wc/lock.c
subversion/trunk/subversion/libsvn_wc/merge.c
subversion/trunk/subversion/libsvn_wc/node.c
subversion/trunk/subversion/libsvn_wc/props.c
subversion/trunk/subversion/libsvn_wc/questions.c
subversion/trunk/subversion/libsvn_wc/relocate.c
subversion/trunk/subversion/libsvn_wc/revert.c
subversion/trunk/subversion/libsvn_wc/status.c
subversion/trunk/subversion/libsvn_wc/token-map.h
subversion/trunk/subversion/libsvn_wc/translate.c
subversion/trunk/subversion/libsvn_wc/tree_conflicts.c
subversion/trunk/subversion/libsvn_wc/update_editor.c
subversion/trunk/subversion/libsvn_wc/upgrade.c
subversion/trunk/subversion/libsvn_wc/util.c
subversion/trunk/subversion/libsvn_wc/wc.h
subversion/trunk/subversion/libsvn_wc/wc_db.c
subversion/trunk/subversion/libsvn_wc/wc_db.h
subversion/trunk/subversion/libsvn_wc/wc_db_private.h
subversion/trunk/subversion/libsvn_wc/wc_db_update_move.c
subversion/trunk/subversion/libsvn_wc/wc_db_wcroot.c
subversion/trunk/subversion/libsvn_wc/wcroot_anchor.c
subversion/trunk/subversion/svnmucc/svnmucc.c
subversion/trunk/subversion/svnrdump/dump_editor.c
subversion/trunk/subversion/svnrdump/load_editor.c
subversion/trunk/subversion/svnserve/serve.c
subversion/trunk/subversion/svnsync/svnsync.c
subversion/trunk/subversion/tests/libsvn_wc/db-test.c
Modified: subversion/trunk/notes/ev2-callbacks-template.c
URL: http://svn.apache.org/viewvc/subversion/trunk/notes/ev2-callbacks-template.c?rev=1455559&r1=1455558&r2=1455559&view=diff
==============================================================================
--- subversion/trunk/notes/ev2-callbacks-template.c (original)
+++ subversion/trunk/notes/ev2-callbacks-template.c Tue Mar 12 14:48:56 2013
@@ -56,7 +56,7 @@ add_symlink_cb(void *baton,
static svn_error_t *
add_absent_cb(void *baton,
const char *relpath,
- svn_kind_t kind,
+ svn_node_kind_t kind,
svn_revnum_t replaces_rev,
apr_pool_t *scratch_pool)
{
Modified: subversion/trunk/subversion/include/private/svn_debug.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_debug.h?rev=1455559&r1=1455558&r2=1455559&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_debug.h (original)
+++ subversion/trunk/subversion/include/private/svn_debug.h Tue Mar 12 14:48:56 2013
@@ -70,7 +70,7 @@ svn_dbg__print_props(apr_hash_t *props,
* usage:
*
* <pre>
- * SVN_DBG(("rev=%ld kind=%s\n", revnum, svn_kind_to_word(kind)));
+ * SVN_DBG(("rev=%ld kind=%s\n", revnum, svn_node_kind_to_word(kind)));
* </pre>
*
* outputs:
Modified: subversion/trunk/subversion/include/private/svn_editor.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_editor.h?rev=1455559&r1=1455558&r2=1455559&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_editor.h (original)
+++ subversion/trunk/subversion/include/private/svn_editor.h Tue Mar 12 14:48:56 2013
@@ -473,7 +473,7 @@ typedef svn_error_t *(*svn_editor_cb_add
typedef svn_error_t *(*svn_editor_cb_add_absent_t)(
void *baton,
const char *relpath,
- svn_kind_t kind,
+ svn_node_kind_t kind,
svn_revnum_t replaces_rev,
apr_pool_t *scratch_pool);
@@ -878,7 +878,7 @@ svn_editor_add_symlink(svn_editor_t *edi
svn_error_t *
svn_editor_add_absent(svn_editor_t *editor,
const char *relpath,
- svn_kind_t kind,
+ svn_node_kind_t kind,
svn_revnum_t replaces_rev);
/** Drive @a editor's #svn_editor_cb_alter_directory_t callback.
Modified: subversion/trunk/subversion/include/private/svn_ra_private.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_ra_private.h?rev=1455559&r1=1455558&r2=1455559&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_ra_private.h (original)
+++ subversion/trunk/subversion/include/private/svn_ra_private.h Tue Mar 12 14:48:56 2013
@@ -161,11 +161,11 @@ typedef svn_error_t *(*svn_ra__provide_p
/* Using information from BATON, fetch the kind of REPOS_RELPATH at revision
SRC_REVISION, returning it in *KIND.
- If the kind cannot be determined, then set *KIND to svn_kind_unknown.
+ If the kind cannot be determined, then set *KIND to svn_node_unknown.
Temporary allocations can be made in SCRATCH_POOL. */
typedef svn_error_t *(*svn_ra__get_copysrc_kind_cb_t)(
- svn_kind_t *kind,
+ svn_node_kind_t *kind,
void *baton,
const char *repos_relpath,
svn_revnum_t src_revision,
Modified: subversion/trunk/subversion/include/private/svn_wc_private.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/private/svn_wc_private.h?rev=1455559&r1=1455558&r2=1455559&view=diff
==============================================================================
--- subversion/trunk/subversion/include/private/svn_wc_private.h (original)
+++ subversion/trunk/subversion/include/private/svn_wc_private.h Tue Mar 12 14:48:56 2013
@@ -154,8 +154,8 @@ typedef struct svn_wc__committable_exter
* from. */
const char *repos_root_url;
- /* Set to either svn_kind_file or svn_kind_dir. */
- svn_kind_t kind;
+ /* Set to either svn_node_file or svn_node_dir. */
+ svn_node_kind_t kind;
} svn_wc__committable_external_info_t;
@@ -1647,7 +1647,7 @@ typedef svn_error_t *
svn_wc_notify_state_t *state,
svn_wc_notify_state_t *prop_state,
const char *relpath,
- svn_kind_t kind,
+ svn_node_kind_t kind,
svn_boolean_t before_op,
svn_boolean_t for_add,
svn_boolean_t for_delete,
@@ -1661,7 +1661,7 @@ typedef svn_error_t *
*/
typedef svn_error_t *
(*svn_wc__diff_state_close_t)(const char *relpath,
- svn_kind_t kind,
+ svn_node_kind_t kind,
void *state_baton,
apr_pool_t *scratch_pool);
Modified: subversion/trunk/subversion/include/svn_delta.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_delta.h?rev=1455559&r1=1455558&r2=1455559&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_delta.h (original)
+++ subversion/trunk/subversion/include/svn_delta.h Tue Mar 12 14:48:56 2013
@@ -1139,7 +1139,7 @@ typedef svn_error_t *(*svn_delta_fetch_p
* @since New in 1.8.
*/
typedef svn_error_t *(*svn_delta_fetch_kind_func_t)(
- svn_kind_t *kind,
+ svn_node_kind_t *kind,
void *baton,
const char *path,
svn_revnum_t base_revision,
Modified: subversion/trunk/subversion/include/svn_types.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_types.h?rev=1455559&r1=1455558&r2=1455559&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_types.h (original)
+++ subversion/trunk/subversion/include/svn_types.h Tue Mar 12 14:48:56 2013
@@ -216,33 +216,7 @@ svn__apr_hash_index_val(const apr_hash_i
-/** A node kind.
- *
- * @since New in 1.8. Replaces svn_node_kind_t.
- */
-typedef enum svn_kind_t
-{
- /** something's here, but we don't know what */
- svn_kind_unknown,
-
- /** absent */
- svn_kind_none,
-
- /** regular file */
- svn_kind_file,
-
- /** directory */
- svn_kind_dir,
-
- /** symbolic link */
- svn_kind_symlink
-
-} svn_kind_t;
-
-/** The various types of nodes in the Subversion filesystem.
- *
- * This type is superseded by #svn_kind_t and will be deprecated when
- * transition to the new type is complete. */
+/** The various types of nodes in the Subversion filesystem. */
typedef enum svn_node_kind_t
{
/** absent */
@@ -255,7 +229,14 @@ typedef enum svn_node_kind_t
svn_node_dir,
/** something's here, but we don't know what */
- svn_node_unknown
+ svn_node_unknown,
+
+ /**
+ * symbolic link
+ * @note This value is not currently used by the public API.
+ * @since New in 1.8.
+ */
+ svn_node_symlink
} svn_node_kind_t;
/** Return a constant string expressing @a kind as an English word, e.g.,
@@ -277,24 +258,6 @@ svn_node_kind_to_word(svn_node_kind_t ki
svn_node_kind_t
svn_node_kind_from_word(const char *word);
-/** Return the #svn_node_kind_t corresponding to the given #svn_kind_t;
- * #svn_kind_symlink will become #svn_node_file.
- *
- * @since New in 1.8.
- */
-svn_node_kind_t
-svn__node_kind_from_kind(svn_kind_t kind);
-
-/** Return the #svn_kind_t corresponding to the given #svn_node_kind_t,
- * or #svn_kind_symlink if @a is_symlink is true.
- *
- * @since New in 1.8.
- */
-svn_kind_t
-svn__kind_from_node_kind(svn_node_kind_t kind,
- svn_boolean_t is_symlink);
-
-
/** Generic three-state property to represent an unknown value for values
* that are just like booleans. The values have been set deliberately to
Modified: subversion/trunk/subversion/include/svn_wc.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_wc.h?rev=1455559&r1=1455558&r2=1455559&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_wc.h (original)
+++ subversion/trunk/subversion/include/svn_wc.h Tue Mar 12 14:48:56 2013
@@ -5457,7 +5457,7 @@ svn_wc_crawl_revisions(const char *path,
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);
@@ -8113,7 +8113,7 @@ svn_wc_exclude(svn_wc_context_t *wc_ctx,
* Set @a kind to the #svn_node_kind_t of @a abspath. Use @a wc_ctx to access
* the working copy, and @a scratch_pool for all temporary allocations.
*
- * If @a abspath is not under version control, set @a kind to #svn_kind_none.
+ * If @a abspath is not under version control, set @a kind to #svn_node_none.
*
* If @a show_hidden and @a show_deleted are both @c FALSE, the kind of
* scheduled for delete, administrative only 'not present' and excluded
Modified: subversion/trunk/subversion/libsvn_client/client.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/client.h?rev=1455559&r1=1455558&r2=1455559&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/client.h (original)
+++ subversion/trunk/subversion/libsvn_client/client.h Tue Mar 12 14:48:56 2013
@@ -315,7 +315,7 @@ svn_client__ra_provide_props(apr_hash_t
svn_error_t *
-svn_client__ra_get_copysrc_kind(svn_kind_t *kind,
+svn_client__ra_get_copysrc_kind(svn_node_kind_t *kind,
void *baton,
const char *repos_relpath,
svn_revnum_t src_revision,
Modified: subversion/trunk/subversion/libsvn_client/commit.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/commit.c?rev=1455559&r1=1455558&r2=1455559&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/commit.c (original)
+++ subversion/trunk/subversion/libsvn_client/commit.c Tue Mar 12 14:48:56 2013
@@ -533,8 +533,8 @@ append_externals_as_explicit_targets(apr
APR_ARRAY_IDX(externals, j,
svn_wc__committable_external_info_t *);
- if ((xinfo->kind == svn_kind_file && ! include_file_externals)
- || (xinfo->kind == svn_kind_dir && ! include_dir_externals))
+ if ((xinfo->kind == svn_node_file && ! include_file_externals)
+ || (xinfo->kind == svn_node_dir && ! include_dir_externals))
continue;
rel_target = svn_dirent_skip_ancestor(base_abspath,
Modified: subversion/trunk/subversion/libsvn_client/ra.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/ra.c?rev=1455559&r1=1455558&r2=1455559&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/ra.c (original)
+++ subversion/trunk/subversion/libsvn_client/ra.c Tue Mar 12 14:48:56 2013
@@ -1131,29 +1131,27 @@ svn_client__ra_provide_props(apr_hash_t
svn_error_t *
-svn_client__ra_get_copysrc_kind(svn_kind_t *kind,
+svn_client__ra_get_copysrc_kind(svn_node_kind_t *kind,
void *baton,
const char *repos_relpath,
svn_revnum_t src_revision,
apr_pool_t *scratch_pool)
{
struct ra_ev2_baton *reb = baton;
- svn_node_kind_t node_kind;
const char *local_abspath;
local_abspath = apr_hash_get(reb->relpath_map, repos_relpath,
APR_HASH_KEY_STRING);
if (!local_abspath)
{
- *kind = svn_kind_unknown;
+ *kind = svn_node_unknown;
return SVN_NO_ERROR;
}
/* ### what to do with SRC_REVISION? */
- SVN_ERR(svn_wc_read_kind2(&node_kind, reb->wc_ctx, local_abspath,
+ SVN_ERR(svn_wc_read_kind2(kind, reb->wc_ctx, local_abspath,
FALSE, FALSE, scratch_pool));
- *kind = svn__kind_from_node_kind(node_kind, FALSE);
return SVN_NO_ERROR;
}
Modified: subversion/trunk/subversion/libsvn_client/repos_diff.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/repos_diff.c?rev=1455559&r1=1455558&r2=1455559&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/repos_diff.c (original)
+++ subversion/trunk/subversion/libsvn_client/repos_diff.c Tue Mar 12 14:48:56 2013
@@ -1213,22 +1213,20 @@ absent_file(const char *path,
}
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 edit_baton *eb = baton;
- svn_node_kind_t node_kind;
if (!SVN_IS_VALID_REVNUM(base_revision))
base_revision = eb->revision;
- 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/libsvn_client/util.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/util.c?rev=1455559&r1=1455558&r2=1455559&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/util.c (original)
+++ subversion/trunk/subversion/libsvn_client/util.c Tue Mar 12 14:48:56 2013
@@ -367,26 +367,24 @@ 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 shim_callbacks_baton *scb = baton;
- svn_node_kind_t node_kind;
const char *local_abspath;
local_abspath = apr_hash_get(scb->relpath_map, path, APR_HASH_KEY_STRING);
if (!local_abspath)
{
- *kind = svn_kind_unknown;
+ *kind = svn_node_unknown;
return SVN_NO_ERROR;
}
/* Reads the WORKING kind. Not the BASE kind */
- SVN_ERR(svn_wc_read_kind2(&node_kind, scb->wc_ctx, local_abspath,
+ SVN_ERR(svn_wc_read_kind2(kind, scb->wc_ctx, local_abspath,
TRUE, FALSE, scratch_pool));
- *kind = svn__kind_from_node_kind(node_kind, FALSE);
return SVN_NO_ERROR;
}
Modified: subversion/trunk/subversion/libsvn_delta/compat.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_delta/compat.c?rev=1455559&r1=1455558&r2=1455559&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_delta/compat.c (original)
+++ subversion/trunk/subversion/libsvn_delta/compat.c Tue Mar 12 14:48:56 2013
@@ -172,7 +172,7 @@ struct change_node
/* what kind of (tree) restructure is occurring at this node? */
enum restructure_action_t action;
- svn_kind_t kind; /* the NEW kind of this node */
+ svn_node_kind_t kind; /* the NEW kind of this node */
/* We need two revisions: one to specify the revision we are altering,
and a second to specify the revision to delete/replace. These are
@@ -229,7 +229,7 @@ locate_change(struct ev2_edit_baton *eb,
static svn_error_t *
apply_propedit(struct ev2_edit_baton *eb,
const char *relpath,
- svn_kind_t kind,
+ svn_node_kind_t kind,
svn_revnum_t base_revision,
const char *name,
const svn_string_t *value,
@@ -237,7 +237,7 @@ apply_propedit(struct ev2_edit_baton *eb
{
struct change_node *change = locate_change(eb, relpath);
- SVN_ERR_ASSERT(change->kind == svn_kind_unknown || change->kind == kind);
+ SVN_ERR_ASSERT(change->kind == svn_node_unknown || change->kind == kind);
change->kind = kind;
/* We're now changing the node. Record the revision. */
@@ -321,7 +321,7 @@ process_actions(struct ev2_edit_baton *e
apr_hash_t *props = NULL;
svn_stream_t *contents = NULL;
svn_checksum_t *checksum = NULL;
- svn_kind_t kind = svn_kind_unknown;
+ svn_node_kind_t kind = svn_node_unknown;
SVN_ERR_ASSERT(change != NULL);
@@ -351,7 +351,7 @@ process_actions(struct ev2_edit_baton *e
{
/* We can only set text on files. */
/* ### validate we aren't overwriting KIND? */
- kind = svn_kind_file;
+ kind = svn_node_file;
/* ### the checksum might be in CHANGE->CHECKSUM */
SVN_ERR(svn_io_file_checksum2(&checksum, change->contents_abspath,
@@ -387,7 +387,7 @@ process_actions(struct ev2_edit_baton *e
if (props == NULL)
props = apr_hash_make(scratch_pool);
- if (kind == svn_kind_dir)
+ if (kind == svn_node_dir)
{
const apr_array_header_t *children;
@@ -435,7 +435,7 @@ process_actions(struct ev2_edit_baton *e
/* ### we need to gather up the target set of children */
- if (kind == svn_kind_dir)
+ if (kind == svn_node_dir)
SVN_ERR(svn_editor_alter_directory(eb->editor, repos_relpath,
change->changing, NULL, props));
else
@@ -573,7 +573,7 @@ ev2_add_directory(const char *path,
/* ### assert that RESTRUCTURE is NONE or DELETE? */
change->action = RESTRUCTURE_ADD;
- change->kind = svn_kind_dir;
+ change->kind = svn_node_dir;
cb->eb = pb->eb;
cb->path = apr_pstrdup(result_pool, relpath);
@@ -644,7 +644,7 @@ ev2_change_dir_prop(void *dir_baton,
{
struct ev2_dir_baton *db = dir_baton;
- SVN_ERR(apply_propedit(db->eb, db->path, svn_kind_dir, db->base_revision,
+ SVN_ERR(apply_propedit(db->eb, db->path, svn_node_dir, db->base_revision,
name, value, scratch_pool));
return SVN_NO_ERROR;
@@ -668,7 +668,7 @@ ev2_absent_directory(const char *path,
/* ### assert that RESTRUCTURE is NONE or DELETE? */
change->action = RESTRUCTURE_ADD_ABSENT;
- change->kind = svn_kind_dir;
+ change->kind = svn_node_dir;
return SVN_NO_ERROR;
}
@@ -690,7 +690,7 @@ ev2_add_file(const char *path,
/* ### assert that RESTRUCTURE is NONE or DELETE? */
change->action = RESTRUCTURE_ADD;
- change->kind = svn_kind_file;
+ change->kind = svn_node_file;
fb->eb = pb->eb;
fb->path = apr_pstrdup(result_pool, relpath);
@@ -856,7 +856,7 @@ ev2_change_file_prop(void *file_baton,
change->unlock = TRUE;
}
- SVN_ERR(apply_propedit(fb->eb, fb->path, svn_kind_file, fb->base_revision,
+ SVN_ERR(apply_propedit(fb->eb, fb->path, svn_node_file, fb->base_revision,
name, value, scratch_pool));
return SVN_NO_ERROR;
@@ -881,7 +881,7 @@ ev2_absent_file(const char *path,
/* ### assert that RESTRUCTURE is NONE or DELETE? */
change->action = RESTRUCTURE_ADD_ABSENT;
- change->kind = svn_kind_file;
+ change->kind = svn_node_file;
return SVN_NO_ERROR;
}
@@ -1069,7 +1069,7 @@ add_directory_cb(void *baton,
struct change_node *change = insert_change(relpath, eb->changes);
change->action = RESTRUCTURE_ADD;
- change->kind = svn_kind_dir;
+ change->kind = svn_node_dir;
change->deleting = replaces_rev;
change->props = svn_prop_hash_dup(props, eb->edit_pool);
@@ -1106,7 +1106,7 @@ add_file_cb(void *baton,
SVN_ERR(svn_stream_copy3(contents, tmp_stream, NULL, NULL, scratch_pool));
change->action = RESTRUCTURE_ADD;
- change->kind = svn_kind_file;
+ change->kind = svn_node_file;
change->deleting = replaces_rev;
change->props = svn_prop_hash_dup(props, eb->edit_pool);
change->contents_abspath = tmp_filename;
@@ -1129,7 +1129,7 @@ add_symlink_cb(void *baton,
struct change_node *change = insert_change(relpath, eb->changes);
change->action = RESTRUCTURE_ADD;
- change->kind = svn_kind_symlink;
+ change->kind = svn_node_symlink;
change->deleting = replaces_rev;
change->props = svn_prop_hash_dup(props, eb->edit_pool);
/* ### target */
@@ -1142,7 +1142,7 @@ add_symlink_cb(void *baton,
static svn_error_t *
add_absent_cb(void *baton,
const char *relpath,
- svn_kind_t kind,
+ svn_node_kind_t kind,
svn_revnum_t replaces_rev,
apr_pool_t *scratch_pool)
{
@@ -1174,7 +1174,7 @@ alter_directory_cb(void *baton,
/* Note: this node may already have information in CHANGE as a result
of an earlier copy/move operation. */
- change->kind = svn_kind_dir;
+ change->kind = svn_node_dir;
change->changing = revision;
change->props = svn_prop_hash_dup(props, eb->edit_pool);
@@ -1220,7 +1220,7 @@ alter_file_cb(void *baton,
/* Note: this node may already have information in CHANGE as a result
of an earlier copy/move operation. */
- change->kind = svn_kind_file;
+ change->kind = svn_node_file;
change->changing = revision;
if (props != NULL)
change->props = svn_prop_hash_dup(props, eb->edit_pool);
@@ -1260,7 +1260,7 @@ delete_cb(void *baton,
struct change_node *change = insert_change(relpath, eb->changes);
change->action = RESTRUCTURE_DELETE;
- /* change->kind = svn_kind_unknown; */
+ /* change->kind = svn_node_unknown; */
change->deleting = revision;
return SVN_NO_ERROR;
@@ -1279,7 +1279,7 @@ copy_cb(void *baton,
struct change_node *change = insert_change(dst_relpath, eb->changes);
change->action = RESTRUCTURE_ADD;
- /* change->kind = svn_kind_unknown; */
+ /* change->kind = svn_node_unknown; */
change->deleting = replaces_rev;
change->copyfrom_path = apr_pstrdup(eb->edit_pool, src_relpath);
change->copyfrom_rev = src_revision;
@@ -1312,12 +1312,12 @@ move_cb(void *baton,
change = insert_change(src_relpath, eb->changes);
change->action = RESTRUCTURE_DELETE;
- /* change->kind = svn_kind_unknown; */
+ /* change->kind = svn_node_unknown; */
change->deleting = src_revision;
change = insert_change(dst_relpath, eb->changes);
change->action = RESTRUCTURE_ADD;
- /* change->kind = svn_kind_unknown; */
+ /* change->kind = svn_node_unknown; */
change->deleting = replaces_rev;
change->copyfrom_path = apr_pstrdup(eb->edit_pool, src_relpath);
change->copyfrom_rev = src_revision;
@@ -1531,7 +1531,7 @@ drive_ev1_props(const struct editor_bato
svn_pool_clear(iterpool);
- if (change->kind == svn_kind_dir)
+ if (change->kind == svn_node_dir)
SVN_ERR(eb->deditor->change_dir_prop(node_baton,
prop->name, prop->value,
iterpool));
@@ -1544,7 +1544,7 @@ drive_ev1_props(const struct editor_bato
/* Handle the funky unlock protocol. Note: only possibly on files. */
if (change->unlock)
{
- SVN_ERR_ASSERT(change->kind == svn_kind_file);
+ SVN_ERR_ASSERT(change->kind == svn_node_file);
SVN_ERR(eb->deditor->change_file_prop(node_baton,
SVN_PROP_ENTRY_LOCK_TOKEN, NULL,
iterpool));
@@ -1603,11 +1603,11 @@ apply_change(void **dir_baton,
}
/* If we're not deleting this node, then we should know its kind. */
- SVN_ERR_ASSERT(change->kind != svn_kind_unknown);
+ SVN_ERR_ASSERT(change->kind != svn_node_unknown);
if (change->action == RESTRUCTURE_ADD_ABSENT)
{
- if (change->kind == svn_kind_dir)
+ if (change->kind == svn_node_dir)
SVN_ERR(eb->deditor->absent_directory(ev1_relpath, parent_baton,
scratch_pool));
else
@@ -1646,7 +1646,7 @@ apply_change(void **dir_baton,
copyfrom_rev = change->copyfrom_rev;
}
- if (change->kind == svn_kind_dir)
+ if (change->kind == svn_node_dir)
SVN_ERR(eb->deditor->add_directory(ev1_relpath, parent_baton,
copyfrom_url, copyfrom_rev,
result_pool, dir_baton));
@@ -1657,7 +1657,7 @@ apply_change(void **dir_baton,
}
else
{
- if (change->kind == svn_kind_dir)
+ if (change->kind == svn_node_dir)
SVN_ERR(eb->deditor->open_directory(ev1_relpath, parent_baton,
change->changing,
result_pool, dir_baton));
@@ -1668,7 +1668,7 @@ apply_change(void **dir_baton,
}
/* Apply any properties in CHANGE to the node. */
- if (change->kind == svn_kind_dir)
+ if (change->kind == svn_node_dir)
SVN_ERR(drive_ev1_props(eb, relpath, change, *dir_baton, scratch_pool));
else
SVN_ERR(drive_ev1_props(eb, relpath, change, file_baton, scratch_pool));
@@ -1720,7 +1720,7 @@ drive_changes(const struct editor_baton
did in start_edit_func(). We can forge up a change record, if one
does not already exist. */
change = insert_change(eb->base_relpath, eb->changes);
- change->kind = svn_kind_dir;
+ change->kind = svn_node_dir;
/* No property changes (tho they might exist from a real change). */
/* Get a sorted list of Ev1-relative paths. */
Modified: subversion/trunk/subversion/libsvn_delta/editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_delta/editor.c?rev=1455559&r1=1455558&r2=1455559&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_delta/editor.c (original)
+++ subversion/trunk/subversion/libsvn_delta/editor.c Tue Mar 12 14:48:56 2013
@@ -600,7 +600,7 @@ svn_editor_add_symlink(svn_editor_t *edi
svn_error_t *
svn_editor_add_absent(svn_editor_t *editor,
const char *relpath,
- svn_kind_t kind,
+ svn_node_kind_t kind,
svn_revnum_t replaces_rev)
{
svn_error_t *err = SVN_NO_ERROR;
Modified: subversion/trunk/subversion/libsvn_fs/editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs/editor.c?rev=1455559&r1=1455558&r2=1455559&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs/editor.c (original)
+++ subversion/trunk/subversion/libsvn_fs/editor.c Tue Mar 12 14:48:56 2013
@@ -443,7 +443,7 @@ add_symlink_cb(void *baton,
static svn_error_t *
add_absent_cb(void *baton,
const char *relpath,
- svn_kind_t kind,
+ svn_node_kind_t kind,
svn_revnum_t replaces_rev,
apr_pool_t *scratch_pool)
{
Modified: subversion/trunk/subversion/libsvn_ra_serf/property.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/property.c?rev=1455559&r1=1455558&r2=1455559&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/property.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/property.c Tue Mar 12 14:48:56 2013
@@ -1203,7 +1203,7 @@ svn_ra_serf__get_stable_url(const char *
svn_error_t *
-svn_ra_serf__get_resource_type(svn_kind_t *kind,
+svn_ra_serf__get_resource_type(svn_node_kind_t *kind,
apr_hash_t *props)
{
apr_hash_t *dav_props;
@@ -1221,11 +1221,11 @@ svn_ra_serf__get_resource_type(svn_kind_
if (strcmp(res_type, "collection") == 0)
{
- *kind = svn_kind_dir;
+ *kind = svn_node_dir;
}
else
{
- *kind = svn_kind_file;
+ *kind = svn_node_file;
}
return SVN_NO_ERROR;
Modified: subversion/trunk/subversion/libsvn_ra_serf/ra_serf.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/ra_serf.h?rev=1455559&r1=1455558&r2=1455559&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/ra_serf.h (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/ra_serf.h Tue Mar 12 14:48:56 2013
@@ -1301,7 +1301,7 @@ svn_ra_serf__set_prop(apr_hash_t *props,
const svn_string_t *val, apr_pool_t *pool);
svn_error_t *
-svn_ra_serf__get_resource_type(svn_kind_t *kind,
+svn_ra_serf__get_resource_type(svn_node_kind_t *kind,
apr_hash_t *props);
Modified: subversion/trunk/subversion/libsvn_ra_serf/serf.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/serf.c?rev=1455559&r1=1455558&r2=1455559&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/serf.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/serf.c Tue Mar 12 14:48:56 2013
@@ -673,14 +673,11 @@ svn_ra_serf__check_path(svn_ra_session_t
}
else
{
- svn_kind_t res_kind;
-
/* Any other error, raise to caller. */
if (err)
return svn_error_trace(err);
- SVN_ERR(svn_ra_serf__get_resource_type(&res_kind, props));
- *kind = svn__node_kind_from_kind(res_kind);
+ SVN_ERR(svn_ra_serf__get_resource_type(kind, props));
}
return SVN_NO_ERROR;
@@ -956,11 +953,11 @@ svn_ra_serf__stat(svn_ra_session_t *ra_s
static svn_error_t *
resource_is_directory(apr_hash_t *props)
{
- svn_kind_t kind;
+ svn_node_kind_t kind;
SVN_ERR(svn_ra_serf__get_resource_type(&kind, props));
- if (kind != svn_kind_dir)
+ if (kind != svn_node_dir)
{
return svn_error_create(SVN_ERR_FS_NOT_DIRECTORY, NULL,
_("Can't get entries of non-directory"));
Modified: subversion/trunk/subversion/libsvn_ra_serf/update.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/update.c?rev=1455559&r1=1455558&r2=1455559&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/update.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/update.c Tue Mar 12 14:48:56 2013
@@ -3507,7 +3507,7 @@ svn_ra_serf__get_file(svn_ra_session_t *
svn_ra_serf__connection_t *conn;
const char *fetch_url;
apr_hash_t *fetch_props;
- svn_kind_t res_kind;
+ svn_node_kind_t res_kind;
const svn_ra_serf__dav_props_t *which_props;
/* What connection should we go on? */
@@ -3553,7 +3553,7 @@ svn_ra_serf__get_file(svn_ra_session_t *
/* Verify that resource type is not collection. */
SVN_ERR(svn_ra_serf__get_resource_type(&res_kind, fetch_props));
- if (res_kind != svn_kind_file)
+ if (res_kind != svn_node_file)
{
return svn_error_create(SVN_ERR_FS_NOT_FILE, NULL,
_("Can't get text contents of a directory"));
Modified: subversion/trunk/subversion/libsvn_repos/commit.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/commit.c?rev=1455559&r1=1455558&r2=1455559&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_repos/commit.c (original)
+++ subversion/trunk/subversion/libsvn_repos/commit.c Tue Mar 12 14:48:56 2013
@@ -850,14 +850,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 edit_baton *eb = baton;
- svn_node_kind_t node_kind;
svn_fs_root_t *fs_root;
if (!SVN_IS_VALID_REVNUM(base_revision))
@@ -865,8 +864,7 @@ fetch_kind_func(svn_kind_t *kind,
SVN_ERR(svn_fs_revision_root(&fs_root, eb->fs, 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;
}
@@ -1085,7 +1083,7 @@ add_symlink_cb(void *baton,
static svn_error_t *
add_absent_cb(void *baton,
const char *relpath,
- svn_kind_t kind,
+ svn_node_kind_t kind,
svn_revnum_t replaces_rev,
apr_pool_t *scratch_pool)
{
Modified: subversion/trunk/subversion/libsvn_repos/dump.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/dump.c?rev=1455559&r1=1455558&r2=1455559&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_repos/dump.c (original)
+++ subversion/trunk/subversion/libsvn_repos/dump.c Tue Mar 12 14:48:56 2013
@@ -886,14 +886,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 edit_baton *eb = baton;
- svn_node_kind_t node_kind;
svn_fs_root_t *fs_root;
if (!SVN_IS_VALID_REVNUM(base_revision))
@@ -901,8 +900,7 @@ fetch_kind_func(svn_kind_t *kind,
SVN_ERR(svn_fs_revision_root(&fs_root, eb->fs, 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/libsvn_repos/replay.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/replay.c?rev=1455559&r1=1455558&r2=1455559&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_repos/replay.c (original)
+++ subversion/trunk/subversion/libsvn_repos/replay.c Tue Mar 12 14:48:56 2013
@@ -783,14 +783,13 @@ path_driver_cb_func(void **dir_baton,
#ifdef USE_EV2_IMPL
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_fs_root_t *root = baton;
- svn_node_kind_t node_kind;
svn_fs_root_t *prev_root;
svn_fs_t *fs = svn_fs_root_fs(root);
@@ -798,9 +797,8 @@ fetch_kind_func(svn_kind_t *kind,
base_revision = svn_fs_revision_root_revision(root) - 1;
SVN_ERR(svn_fs_revision_root(&prev_root, fs, base_revision, scratch_pool));
- SVN_ERR(svn_fs_check_path(&node_kind, prev_root, path, scratch_pool));
+ SVN_ERR(svn_fs_check_path(kind, prev_root, path, scratch_pool));
- *kind = svn__kind_from_node_kind(node_kind, FALSE);
return SVN_NO_ERROR;
}
Modified: subversion/trunk/subversion/libsvn_subr/types.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/types.c?rev=1455559&r1=1455558&r2=1455559&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/types.c (original)
+++ subversion/trunk/subversion/libsvn_subr/types.c Tue Mar 12 14:48:56 2013
@@ -121,37 +121,6 @@ svn_depth_from_word(const char *word)
return svn_depth_unknown;
}
-svn_node_kind_t
-svn__node_kind_from_kind(svn_kind_t kind)
-{
- switch (kind)
- {
- case svn_kind_unknown: return svn_node_unknown;
- case svn_kind_none: return svn_node_none;
- case svn_kind_file: return svn_node_file;
- case svn_kind_dir: return svn_node_dir;
- case svn_kind_symlink: return svn_node_file;
- default: SVN_ERR_MALFUNCTION_NO_RETURN();
- }
-}
-
-svn_kind_t
-svn__kind_from_node_kind(svn_node_kind_t kind,
- svn_boolean_t is_symlink)
-{
- if (is_symlink)
- return svn_kind_symlink;
-
- switch (kind)
- {
- case svn_node_unknown: return svn_kind_unknown;
- case svn_node_none: return svn_kind_none;
- case svn_node_file: return svn_kind_file;
- case svn_node_dir: return svn_kind_dir;
- default: SVN_ERR_MALFUNCTION_NO_RETURN();
- }
-}
-
const char *
svn_node_kind_to_word(svn_node_kind_t kind)
{
@@ -163,6 +132,8 @@ svn_node_kind_to_word(svn_node_kind_t ki
return "file";
case svn_node_dir:
return "dir";
+ case svn_node_symlink:
+ return "symlink";
case svn_node_unknown:
default:
return "unknown";
@@ -182,6 +153,8 @@ svn_node_kind_from_word(const char *word
return svn_node_file;
else if (strcmp(word, "dir") == 0)
return svn_node_dir;
+ else if (strcmp(word, "symlink") == 0)
+ return svn_node_symlink;
else
/* This also handles word == "unknown" */
return svn_node_unknown;
Modified: subversion/trunk/subversion/libsvn_wc/adm_crawler.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_crawler.c?rev=1455559&r1=1455558&r2=1455559&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_crawler.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_crawler.c Tue Mar 12 14:48:56 2013
@@ -102,7 +102,7 @@ svn_wc_restore(svn_wc_context_t *wc_ctx,
apr_pool_t *scratch_pool)
{
svn_wc__db_status_t status;
- svn_kind_t kind;
+ svn_node_kind_t kind;
svn_node_kind_t disk_kind;
const svn_checksum_t *checksum;
@@ -124,9 +124,9 @@ svn_wc_restore(svn_wc_context_t *wc_ctx,
if (status != svn_wc__db_status_normal
&& !((status == svn_wc__db_status_added
|| status == svn_wc__db_status_incomplete)
- && (kind == svn_kind_dir
- || (kind == svn_kind_file && checksum != NULL)
- /* || (kind == svn_kind_symlink && target)*/)))
+ && (kind == svn_node_dir
+ || (kind == svn_node_file && checksum != NULL)
+ /* || (kind == svn_node_symlink && target)*/)))
{
return svn_error_createf(SVN_ERR_WC_PATH_UNEXPECTED_STATUS, NULL,
_("The node '%s' can not be restored."),
@@ -134,7 +134,7 @@ svn_wc_restore(svn_wc_context_t *wc_ctx,
scratch_pool));
}
- if (kind == svn_kind_file || kind == svn_kind_symlink)
+ if (kind == svn_node_file || kind == svn_node_symlink)
SVN_ERR(restore_file(wc_ctx->db, local_abspath, use_commit_times,
FALSE /*mark_resolved_text_conflict*/,
scratch_pool));
@@ -154,20 +154,20 @@ svn_wc_restore(svn_wc_context_t *wc_ctx,
static svn_error_t *
restore_node(svn_wc__db_t *db,
const char *local_abspath,
- svn_kind_t kind,
+ svn_node_kind_t kind,
svn_boolean_t use_commit_times,
svn_wc_notify_func2_t notify_func,
void *notify_baton,
apr_pool_t *scratch_pool)
{
- if (kind == svn_kind_file || kind == svn_kind_symlink)
+ if (kind == svn_node_file || kind == svn_node_symlink)
{
/* Recreate file from text-base; mark any text conflict as resolved */
SVN_ERR(restore_file(db, local_abspath, use_commit_times,
TRUE /*mark_resolved_text_conflict*/,
scratch_pool));
}
- else if (kind == svn_kind_dir)
+ else if (kind == svn_node_dir)
{
/* Recreating a directory is just a mkdir */
SVN_ERR(svn_io_dir_make(local_abspath, APR_OS_DEFAULT, scratch_pool));
@@ -372,7 +372,7 @@ report_revisions_and_depths(svn_wc__db_t
&& apr_hash_get(dirents, child, APR_HASH_KEY_STRING) == NULL)
{
svn_wc__db_status_t wrk_status;
- svn_kind_t wrk_kind;
+ svn_node_kind_t wrk_kind;
const svn_checksum_t *checksum;
SVN_ERR(svn_wc__db_read_info(&wrk_status, &wrk_kind, NULL, NULL,
@@ -385,7 +385,7 @@ report_revisions_and_depths(svn_wc__db_t
if ((wrk_status == svn_wc__db_status_normal
|| wrk_status == svn_wc__db_status_added
|| wrk_status == svn_wc__db_status_incomplete)
- && (wrk_kind == svn_kind_dir || checksum))
+ && (wrk_kind == svn_node_dir || checksum))
{
svn_node_kind_t dirent_kind;
@@ -426,8 +426,8 @@ report_revisions_and_depths(svn_wc__db_t
ths->depth = svn_depth_infinity;
/*** Files ***/
- if (ths->kind == svn_kind_file ||
- ths->kind == svn_kind_symlink)
+ if (ths->kind == svn_node_file
+ || ths->kind == svn_node_symlink)
{
if (report_everything)
{
@@ -480,7 +480,7 @@ report_revisions_and_depths(svn_wc__db_t
} /* end file case */
/*** Directories (in recursive mode) ***/
- else if (ths->kind == svn_kind_dir
+ else if (ths->kind == svn_node_dir
&& (depth > svn_depth_files
|| depth == svn_depth_unknown))
{
@@ -637,7 +637,7 @@ svn_wc_crawl_revisions5(svn_wc_context_t
svn_revnum_t target_rev = SVN_INVALID_REVNUM;
svn_boolean_t start_empty;
svn_wc__db_status_t status;
- svn_kind_t target_kind;
+ svn_node_kind_t target_kind;
const char *repos_relpath, *repos_root_url;
svn_depth_t target_depth;
svn_wc__db_lock_t *target_lock;
@@ -705,7 +705,7 @@ svn_wc_crawl_revisions5(svn_wc_context_t
&& disk_kind == svn_node_none)
{
svn_wc__db_status_t wrk_status;
- svn_kind_t wrk_kind;
+ svn_node_kind_t wrk_kind;
const svn_checksum_t *checksum;
err = svn_wc__db_read_info(&wrk_status, &wrk_kind, NULL, NULL, NULL,
@@ -721,7 +721,7 @@ svn_wc_crawl_revisions5(svn_wc_context_t
{
svn_error_clear(err);
wrk_status = svn_wc__db_status_not_present;
- wrk_kind = svn_kind_file;
+ wrk_kind = svn_node_file;
}
else
SVN_ERR(err);
@@ -729,7 +729,7 @@ svn_wc_crawl_revisions5(svn_wc_context_t
if ((wrk_status == svn_wc__db_status_normal
|| wrk_status == svn_wc__db_status_added
|| wrk_status == svn_wc__db_status_incomplete)
- && (wrk_kind == svn_kind_dir || checksum))
+ && (wrk_kind == svn_node_dir || checksum))
{
SVN_ERR(restore_node(wc_ctx->db, local_abspath,
wrk_kind, use_commit_times,
@@ -752,7 +752,7 @@ svn_wc_crawl_revisions5(svn_wc_context_t
SVN_ERR(reporter->set_path(report_baton, "", target_rev, report_depth,
start_empty, NULL, scratch_pool));
}
- if (target_kind == svn_kind_dir)
+ if (target_kind == svn_node_dir)
{
if (depth != svn_depth_empty)
{
@@ -779,7 +779,7 @@ svn_wc_crawl_revisions5(svn_wc_context_t
}
}
- else if (target_kind == svn_kind_file || target_kind == svn_kind_symlink)
+ else if (target_kind == svn_node_file || target_kind == svn_node_symlink)
{
const char *parent_abspath, *base;
svn_wc__db_status_t parent_status;
@@ -1190,7 +1190,7 @@ svn_wc__internal_transmit_prop_deltas(sv
apr_pool_t *iterpool = svn_pool_create(scratch_pool);
int i;
apr_array_header_t *propmods;
- svn_kind_t kind;
+ svn_node_kind_t kind;
SVN_ERR(svn_wc__db_read_kind(&kind, db, local_abspath,
FALSE /* allow_missing */,
@@ -1198,7 +1198,7 @@ svn_wc__internal_transmit_prop_deltas(sv
FALSE /* show_hidden */,
iterpool));
- if (kind == svn_kind_none)
+ if (kind == svn_node_none)
return svn_error_createf(SVN_ERR_WC_PATH_NOT_FOUND, NULL,
_("The node '%s' was not found."),
svn_dirent_local_style(local_abspath, iterpool));
@@ -1214,7 +1214,7 @@ svn_wc__internal_transmit_prop_deltas(sv
svn_pool_clear(iterpool);
- if (kind == svn_kind_file)
+ if (kind == svn_node_file)
SVN_ERR(editor->change_file_prop(baton, p->name, p->value,
iterpool));
else
Modified: subversion/trunk/subversion/libsvn_wc/adm_files.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_files.c?rev=1455559&r1=1455558&r2=1455559&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_files.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_files.c Tue Mar 12 14:48:56 2013
@@ -171,7 +171,7 @@ svn_wc__text_base_path_to_read(const cha
apr_pool_t *scratch_pool)
{
svn_wc__db_status_t status;
- svn_kind_t kind;
+ svn_node_kind_t kind;
const svn_checksum_t *checksum;
SVN_ERR(svn_wc__db_read_pristine_info(&status, &kind, NULL, NULL, NULL, NULL,
@@ -180,7 +180,7 @@ svn_wc__text_base_path_to_read(const cha
scratch_pool, scratch_pool));
/* Sanity */
- if (kind != svn_kind_file)
+ if (kind != svn_node_file)
return svn_error_createf(SVN_ERR_NODE_UNEXPECTED_KIND, NULL,
_("Can only get the pristine contents of files; "
"'%s' is not a file"),
@@ -224,7 +224,7 @@ svn_wc__get_pristine_contents(svn_stream
apr_pool_t *scratch_pool)
{
svn_wc__db_status_t status;
- svn_kind_t kind;
+ svn_node_kind_t kind;
const svn_checksum_t *sha1_checksum;
if (size)
@@ -236,7 +236,7 @@ svn_wc__get_pristine_contents(svn_stream
scratch_pool, scratch_pool));
/* Sanity */
- if (kind != svn_kind_file)
+ if (kind != svn_node_file)
return svn_error_createf(SVN_ERR_NODE_UNEXPECTED_KIND, NULL,
_("Can only get the pristine contents of files; "
"'%s' is not a file"),
Modified: subversion/trunk/subversion/libsvn_wc/adm_ops.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/adm_ops.c?rev=1455559&r1=1455558&r2=1455559&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/trunk/subversion/libsvn_wc/adm_ops.c Tue Mar 12 14:48:56 2013
@@ -113,7 +113,7 @@ process_committed_leaf(svn_wc__db_t *db,
const char *local_abspath,
svn_boolean_t via_recurse,
svn_wc__db_status_t status,
- svn_kind_t kind,
+ svn_node_kind_t kind,
svn_boolean_t prop_mods,
const svn_checksum_t *old_checksum,
svn_revnum_t new_revnum,
@@ -133,7 +133,7 @@ process_committed_leaf(svn_wc__db_t *db,
{
const char *adm_abspath;
- if (kind == svn_kind_dir)
+ if (kind == svn_node_dir)
adm_abspath = local_abspath;
else
adm_abspath = svn_dirent_dirname(local_abspath, scratch_pool);
@@ -167,7 +167,7 @@ process_committed_leaf(svn_wc__db_t *db,
|| status == svn_wc__db_status_incomplete
|| status == svn_wc__db_status_added);
- if (kind != svn_kind_dir)
+ if (kind != svn_node_dir)
{
/* If we sent a delta (meaning: post-copy modification),
then this file will appear in the queue and so we should have
@@ -241,7 +241,7 @@ svn_wc__process_committed_internal(svn_w
apr_pool_t *scratch_pool)
{
svn_wc__db_status_t status;
- svn_kind_t kind;
+ svn_node_kind_t kind;
const svn_checksum_t *old_checksum;
svn_boolean_t prop_mods;
@@ -264,7 +264,7 @@ svn_wc__process_committed_internal(svn_w
scratch_pool));
/* Only check for recursion on nodes that have children */
- if (kind != svn_kind_file
+ if (kind != svn_node_file
|| status == svn_wc__db_status_not_present
|| status == svn_wc__db_status_excluded
|| status == svn_wc__db_status_server_excluded
@@ -579,7 +579,7 @@ check_can_add_to_parent(const char **rep
{
const char *parent_abspath = svn_dirent_dirname(local_abspath, scratch_pool);
svn_wc__db_status_t parent_status;
- svn_kind_t parent_kind;
+ svn_node_kind_t parent_kind;
svn_error_t *err;
SVN_ERR(svn_wc__write_check(db, parent_abspath, scratch_pool));
@@ -612,7 +612,7 @@ check_can_add_to_parent(const char **rep
svn_dirent_local_style(local_abspath,
scratch_pool));
}
- else if (parent_kind != svn_kind_dir)
+ else if (parent_kind != svn_node_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/ambient_depth_filter_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/ambient_depth_filter_editor.c?rev=1455559&r1=1455558&r2=1455559&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/ambient_depth_filter_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/ambient_depth_filter_editor.c Tue Mar 12 14:48:56 2013
@@ -121,7 +121,7 @@ struct dir_baton
*/
static svn_error_t *
ambient_read_info(svn_wc__db_status_t *status,
- svn_kind_t *kind,
+ svn_node_kind_t *kind,
svn_depth_t *depth,
svn_wc__db_t *db,
const char *local_abspath,
@@ -140,7 +140,7 @@ ambient_read_info(svn_wc__db_status_t *s
{
svn_error_clear(err);
- *kind = svn_kind_unknown;
+ *kind = svn_node_unknown;
if (status)
*status = svn_wc__db_status_normal;
if (depth)
@@ -190,7 +190,7 @@ make_dir_baton(struct dir_baton **d_p,
{
svn_boolean_t exclude;
svn_wc__db_status_t status;
- svn_kind_t kind;
+ svn_node_kind_t kind;
svn_boolean_t exists = TRUE;
if (!added)
@@ -201,10 +201,10 @@ make_dir_baton(struct dir_baton **d_p,
else
{
status = svn_wc__db_status_not_present;
- kind = svn_kind_unknown;
+ kind = svn_node_unknown;
}
- exists = (kind != svn_kind_unknown);
+ exists = (kind != svn_node_unknown);
if (pb->ambient_depth == svn_depth_empty
|| pb->ambient_depth == svn_depth_files)
@@ -250,7 +250,7 @@ make_file_baton(struct file_baton **f_p,
struct file_baton *f = apr_pcalloc(pool, sizeof(*f));
struct edit_baton *eb = pb->edit_baton;
svn_wc__db_status_t status;
- svn_kind_t kind;
+ svn_node_kind_t kind;
const char *abspath;
SVN_ERR_ASSERT(path);
@@ -272,7 +272,7 @@ make_file_baton(struct file_baton **f_p,
else
{
status = svn_wc__db_status_not_present;
- kind = svn_kind_unknown;
+ kind = svn_node_unknown;
}
if (pb->ambient_depth == svn_depth_empty)
@@ -285,7 +285,7 @@ make_file_baton(struct file_baton **f_p,
if (status == svn_wc__db_status_not_present
|| status == svn_wc__db_status_server_excluded
|| status == svn_wc__db_status_excluded
- || kind == svn_kind_unknown)
+ || kind == svn_node_unknown)
{
f->ambiently_excluded = TRUE;
*f_p = f;
@@ -344,7 +344,7 @@ open_root(void *edit_baton,
if (! *eb->target)
{
/* For an update with a NULL target, this is equivalent to open_dir(): */
- svn_kind_t kind;
+ svn_node_kind_t kind;
svn_wc__db_status_t status;
svn_depth_t depth;
@@ -353,7 +353,7 @@ open_root(void *edit_baton,
eb->db, eb->anchor_abspath,
pool));
- if (kind != svn_kind_unknown
+ if (kind != svn_node_unknown
&& status != svn_wc__db_status_not_present
&& status != svn_wc__db_status_excluded
&& status != svn_wc__db_status_server_excluded)
@@ -384,7 +384,7 @@ delete_entry(const char *path,
/* If the entry we want to delete doesn't exist, that's OK.
It's probably an old server that doesn't understand
depths. */
- svn_kind_t kind;
+ svn_node_kind_t kind;
svn_wc__db_status_t status;
const char *abspath;
@@ -393,7 +393,7 @@ delete_entry(const char *path,
SVN_ERR(ambient_read_info(&status, &kind, NULL,
eb->db, abspath, pool));
- if (kind == svn_kind_unknown
+ if (kind == svn_node_unknown
|| status == svn_wc__db_status_not_present
|| status == svn_wc__db_status_excluded
|| status == svn_wc__db_status_server_excluded)
@@ -462,7 +462,7 @@ open_directory(const char *path,
struct edit_baton *eb = pb->edit_baton;
struct dir_baton *b;
const char *local_abspath;
- svn_kind_t kind;
+ svn_node_kind_t kind;
svn_wc__db_status_t status;
svn_depth_t depth;
@@ -484,7 +484,7 @@ open_directory(const char *path,
SVN_ERR(ambient_read_info(&status, &kind, &depth,
eb->db, local_abspath, pool));
- if (kind != svn_kind_unknown
+ if (kind != svn_node_unknown
&& status != svn_wc__db_status_not_present
&& status != svn_wc__db_status_excluded
&& status != svn_wc__db_status_server_excluded)
Modified: subversion/trunk/subversion/libsvn_wc/cleanup.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/cleanup.c?rev=1455559&r1=1455558&r2=1455559&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/cleanup.c (original)
+++ subversion/trunk/subversion/libsvn_wc/cleanup.c Tue Mar 12 14:48:56 2013
@@ -76,7 +76,7 @@ repair_timestamps(svn_wc__db_t *db,
void *cancel_baton,
apr_pool_t *scratch_pool)
{
- svn_kind_t kind;
+ svn_node_kind_t kind;
svn_wc__db_status_t status;
if (cancel_func)
@@ -95,15 +95,15 @@ repair_timestamps(svn_wc__db_t *db,
|| status == svn_wc__db_status_not_present)
return SVN_NO_ERROR;
- if (kind == svn_kind_file
- || kind == svn_kind_symlink)
+ if (kind == svn_node_file
+ || kind == svn_node_symlink)
{
svn_boolean_t modified;
SVN_ERR(svn_wc__internal_file_modified_p(&modified,
db, local_abspath, FALSE,
scratch_pool));
}
- else if (kind == svn_kind_dir)
+ else if (kind == svn_node_dir)
{
apr_pool_t *iterpool = svn_pool_create(scratch_pool);
const apr_array_header_t *children;
Modified: subversion/trunk/subversion/libsvn_wc/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/conflicts.c?rev=1455559&r1=1455558&r2=1455559&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/conflicts.c Tue Mar 12 14:48:56 2013
@@ -1283,7 +1283,7 @@ generate_propconflict(svn_boolean_t *con
svn_wc_conflict_result_t *result = NULL;
svn_wc_conflict_description2_t *cdesc;
const char *dirpath = svn_dirent_dirname(local_abspath, scratch_pool);
- svn_kind_t kind;
+ svn_node_kind_t kind;
const svn_string_t *new_value = NULL;
SVN_ERR(svn_wc__db_read_kind(&kind, db, local_abspath,
@@ -1292,7 +1292,7 @@ generate_propconflict(svn_boolean_t *con
FALSE /* show_hidden */,
scratch_pool));
- if (kind == svn_kind_none)
+ if (kind == svn_node_none)
return svn_error_createf(SVN_ERR_WC_PATH_NOT_FOUND, NULL,
_("The node '%s' was not found."),
svn_dirent_local_style(local_abspath,
@@ -1300,7 +1300,7 @@ generate_propconflict(svn_boolean_t *con
cdesc = svn_wc_conflict_description_create_prop2(
local_abspath,
- (kind == svn_kind_dir) ? svn_node_dir : svn_node_file,
+ (kind == svn_node_dir) ? svn_node_dir : svn_node_file,
propname, scratch_pool);
cdesc->operation = operation;
@@ -3075,7 +3075,7 @@ svn_wc__resolve_conflicts(svn_wc_context
void *notify_baton,
apr_pool_t *scratch_pool)
{
- svn_kind_t kind;
+ svn_node_kind_t kind;
svn_boolean_t conflicted;
struct conflict_status_walker_baton cswb;
@@ -3097,7 +3097,7 @@ svn_wc__resolve_conflicts(svn_wc_context
/* When the implementation still used the entry walker, depth
unknown was translated to infinity. */
- if (kind != svn_kind_dir)
+ if (kind != svn_node_dir)
depth = svn_depth_empty;
else if (depth == svn_depth_unknown)
depth = svn_depth_infinity;
Modified: subversion/trunk/subversion/libsvn_wc/copy.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/copy.c?rev=1455559&r1=1455558&r2=1455559&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/copy.c (original)
+++ subversion/trunk/subversion/libsvn_wc/copy.c Tue Mar 12 14:48:56 2013
@@ -171,7 +171,7 @@ copy_to_tmpdir(svn_skel_t **work_item,
versioned file itself.
This also works for versioned symlinks that are stored in the db as
- svn_kind_file with svn:special set. */
+ svn_node_file with svn:special set. */
static svn_error_t *
copy_versioned_file(svn_wc__db_t *db,
const char *src_abspath,
@@ -381,7 +381,7 @@ copy_versioned_dir(svn_wc__db_t *db,
|| info->status == svn_wc__db_status_added)
{
/* We have more work to do than just changing the DB */
- if (info->kind == svn_kind_file)
+ if (info->kind == svn_node_file)
{
/* We should skip this node if this child is a file external
(issues #3589, #4000) */
@@ -397,7 +397,7 @@ copy_versioned_dir(svn_wc__db_t *db,
NULL, NULL,
iterpool));
}
- else if (info->kind == svn_kind_dir)
+ else if (info->kind == svn_node_dir)
SVN_ERR(copy_versioned_dir(db,
child_src_abspath, child_dst_abspath,
dst_op_root_abspath, tmpdir_abspath,
@@ -524,7 +524,7 @@ copy_or_move(svn_boolean_t *move_degrade
apr_pool_t *scratch_pool)
{
svn_wc__db_t *db = wc_ctx->db;
- svn_kind_t src_db_kind;
+ svn_node_kind_t src_db_kind;
const char *dstdir_abspath;
svn_boolean_t conflicted;
const char *tmpdir_abspath;
@@ -762,8 +762,8 @@ copy_or_move(svn_boolean_t *move_degrade
cancel_func, cancel_baton,
scratch_pool));
- if (src_db_kind == svn_kind_file
- || src_db_kind == svn_kind_symlink)
+ if (src_db_kind == svn_node_file
+ || src_db_kind == svn_node_symlink)
{
err = copy_versioned_file(db, src_abspath, dst_abspath, dst_abspath,
tmpdir_abspath,
@@ -954,7 +954,7 @@ remove_all_conflict_markers(svn_wc__db_t
svn_dirent_join(wc_dir_abspath, name, iterpool),
iterpool));
}
- if (info->kind == svn_kind_dir)
+ if (info->kind == svn_node_dir)
{
svn_pool_clear(iterpool);
SVN_ERR(remove_all_conflict_markers(
@@ -983,7 +983,7 @@ svn_wc__move2(svn_wc_context_t *wc_ctx,
{
svn_wc__db_t *db = wc_ctx->db;
svn_boolean_t move_degraded_to_copy = FALSE;
- svn_kind_t kind;
+ svn_node_kind_t kind;
svn_boolean_t conflicted;
/* Verify that we have the required write locks. */
@@ -1028,7 +1028,7 @@ svn_wc__move2(svn_wc_context_t *wc_ctx,
db, src_abspath,
scratch_pool, scratch_pool));
- if (kind == svn_kind_dir)
+ if (kind == svn_node_dir)
SVN_ERR(remove_all_conflict_markers(db, src_abspath, dst_abspath,
scratch_pool));
Modified: subversion/trunk/subversion/libsvn_wc/crop.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/crop.c?rev=1455559&r1=1455558&r2=1455559&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/crop.c (original)
+++ subversion/trunk/subversion/libsvn_wc/crop.c Tue Mar 12 14:48:56 2013
@@ -84,7 +84,7 @@ crop_children(svn_wc__db_t *db,
const char *child_name = APR_ARRAY_IDX(children, i, const char *);
const char *child_abspath;
svn_wc__db_status_t child_status;
- svn_kind_t kind;
+ svn_node_kind_t kind;
svn_depth_t child_depth;
svn_pool_clear(iterpool);
@@ -103,7 +103,7 @@ crop_children(svn_wc__db_t *db,
child_status == svn_wc__db_status_excluded ||
child_status == svn_wc__db_status_not_present)
{
- svn_depth_t remove_below = (kind == svn_kind_dir)
+ svn_depth_t remove_below = (kind == svn_node_dir)
? svn_depth_immediates
: svn_depth_files;
if (new_depth < remove_below)
@@ -115,7 +115,7 @@ crop_children(svn_wc__db_t *db,
continue;
}
- else if (kind == svn_kind_file)
+ else if (kind == svn_node_file)
{
if (new_depth == svn_depth_empty)
SVN_ERR(svn_wc__db_op_remove_node(NULL,
@@ -124,7 +124,7 @@ crop_children(svn_wc__db_t *db,
FALSE /* destroy_changes */,
SVN_INVALID_REVNUM,
svn_wc__db_status_not_present,
- svn_kind_none,
+ svn_node_none,
NULL, NULL,
cancel_func, cancel_baton,
iterpool));
@@ -132,7 +132,7 @@ crop_children(svn_wc__db_t *db,
continue;
}
- else if (kind == svn_kind_dir)
+ else if (kind == svn_node_dir)
{
if (new_depth < svn_depth_immediates)
{
@@ -142,7 +142,7 @@ crop_children(svn_wc__db_t *db,
FALSE /* destroy_changes */,
SVN_INVALID_REVNUM,
svn_wc__db_status_not_present,
- svn_kind_none,
+ svn_node_none,
NULL, NULL,
cancel_func, cancel_baton,
iterpool));
@@ -194,7 +194,7 @@ svn_wc_exclude(svn_wc_context_t *wc_ctx,
{
svn_boolean_t is_root, is_switched;
svn_wc__db_status_t status;
- svn_kind_t kind;
+ svn_node_kind_t kind;
svn_revnum_t revision;
const char *repos_relpath, *repos_root, *repos_uuid;
@@ -297,7 +297,7 @@ svn_wc_crop_tree2(svn_wc_context_t *wc_c
{
svn_wc__db_t *db = wc_ctx->db;
svn_wc__db_status_t status;
- svn_kind_t kind;
+ svn_node_kind_t kind;
svn_depth_t dir_depth;
/* Only makes sense when the depth is restrictive. */
@@ -314,7 +314,7 @@ svn_wc_crop_tree2(svn_wc_context_t *wc_c
db, local_abspath,
scratch_pool, scratch_pool));
- if (kind != svn_kind_dir)
+ if (kind != svn_node_dir)
return svn_error_create(SVN_ERR_UNSUPPORTED_FEATURE, NULL,
_("Can only crop directories"));
Modified: subversion/trunk/subversion/libsvn_wc/delete.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/delete.c?rev=1455559&r1=1455558&r2=1455559&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/delete.c (original)
+++ subversion/trunk/subversion/libsvn_wc/delete.c Tue Mar 12 14:48:56 2013
@@ -110,7 +110,7 @@ static svn_error_t *
create_delete_wq_items(svn_skel_t **work_items,
svn_wc__db_t *db,
const char *local_abspath,
- svn_kind_t kind,
+ svn_node_kind_t kind,
svn_boolean_t conflicted,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
@@ -118,7 +118,7 @@ create_delete_wq_items(svn_skel_t **work
*work_items = NULL;
/* Schedule the on-disk delete */
- if (kind == svn_kind_dir)
+ if (kind == svn_node_dir)
SVN_ERR(svn_wc__wq_build_dir_remove(work_items, db, local_abspath,
local_abspath,
TRUE /* recursive */,
@@ -185,7 +185,7 @@ svn_wc__delete_many(svn_wc_context_t *wc
svn_wc__db_t *db = wc_ctx->db;
svn_error_t *err;
svn_wc__db_status_t status;
- svn_kind_t kind;
+ svn_node_kind_t kind;
svn_skel_t *work_items = NULL;
apr_array_header_t *versioned_targets;
const char *local_abspath;
@@ -244,7 +244,7 @@ svn_wc__delete_many(svn_wc_context_t *wc
}
if (status == svn_wc__db_status_normal
- && kind == svn_kind_dir)
+ && kind == svn_node_dir)
{
svn_boolean_t is_wcroot;
SVN_ERR(svn_wc__db_is_wcroot(&is_wcroot, db, local_abspath,
@@ -323,7 +323,7 @@ svn_wc_delete4(svn_wc_context_t *wc_ctx,
svn_wc__db_t *db = wc_ctx->db;
svn_error_t *err;
svn_wc__db_status_t status;
- svn_kind_t kind;
+ svn_node_kind_t kind;
svn_boolean_t conflicted;
svn_skel_t *work_items = NULL;
const char *repos_relpath;
@@ -363,7 +363,7 @@ svn_wc_delete4(svn_wc_context_t *wc_ctx,
}
if (status == svn_wc__db_status_normal
- && kind == svn_kind_dir)
+ && kind == svn_node_dir)
{
svn_boolean_t is_wcroot;
SVN_ERR(svn_wc__db_is_wcroot(&is_wcroot, db, local_abspath, pool));
@@ -433,7 +433,7 @@ svn_wc__internal_remove_from_revision_co
destroy_wf /* destroy_changes */,
SVN_INVALID_REVNUM,
svn_wc__db_status_not_present,
- svn_kind_none,
+ svn_node_none,
NULL, NULL,
cancel_func, cancel_baton,
scratch_pool));
Modified: subversion/trunk/subversion/libsvn_wc/deprecated.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/deprecated.c?rev=1455559&r1=1455558&r2=1455559&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/deprecated.c (original)
+++ subversion/trunk/subversion/libsvn_wc/deprecated.c Tue Mar 12 14:48:56 2013
@@ -970,13 +970,13 @@ svn_wc_add3(const char *path,
/* Make sure the caller gets the new access baton in the set. */
if (svn_wc__adm_retrieve_internal2(wc_db, local_abspath, pool) == NULL)
{
- svn_kind_t kind;
+ svn_node_kind_t kind;
SVN_ERR(svn_wc__db_read_kind(&kind, wc_db, local_abspath,
FALSE /* allow_missing */,
TRUE /* show_deleted */,
FALSE /* show_hidden */, pool));
- if (kind == svn_kind_dir)
+ if (kind == svn_node_dir)
{
svn_wc_adm_access_t *adm_access;
@@ -3259,7 +3259,7 @@ svn_wc_is_wc_root2(svn_boolean_t *wc_roo
{
svn_boolean_t is_root;
svn_boolean_t is_switched;
- svn_kind_t kind;
+ svn_node_kind_t kind;
svn_error_t *err;
SVN_ERR_ASSERT(svn_dirent_is_absolute(local_abspath));
@@ -3275,7 +3275,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_kind_dir && is_switched);
+ *wc_root = is_root || (kind == svn_node_dir && is_switched);
return SVN_NO_ERROR;
}
@@ -4581,9 +4581,9 @@ svn_wc_read_kind(svn_node_kind_t *kind,
show_hidden,
scratch_pool));
- /*if (db_kind == svn_kind_dir)
+ /*if (db_kind == svn_node_dir)
*kind = svn_node_dir;
- else if (db_kind == svn_kind_file || db_kind == svn_kind_symlink)
+ else if (db_kind == svn_node_file || db_kind == svn_node_symlink)
*kind = svn_node_file;
else
*kind = svn_node_none;*/
Modified: subversion/trunk/subversion/libsvn_wc/diff_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/diff_editor.c?rev=1455559&r1=1455558&r2=1455559&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/diff_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/diff_editor.c Tue Mar 12 14:48:56 2013
@@ -696,7 +696,7 @@ walk_local_nodes_diff(struct edit_baton_
const char *child_relpath;
svn_boolean_t repos_only;
svn_boolean_t local_only;
- svn_kind_t base_kind;
+ svn_node_kind_t base_kind;
if (eb->cancel_func)
SVN_ERR(eb->cancel_func(eb->cancel_baton));
@@ -772,7 +772,7 @@ walk_local_nodes_diff(struct edit_baton_
if (eb->local_before_remote && local_only)
{
- if (info->kind == svn_kind_file && diff_files)
+ if (info->kind == svn_node_file && diff_files)
SVN_ERR(svn_wc__diff_local_only_file(db, child_abspath,
child_relpath,
eb->processor, dir_baton,
@@ -781,7 +781,7 @@ walk_local_nodes_diff(struct edit_baton_
eb->cancel_func,
eb->cancel_baton,
iterpool));
- else if (info->kind == svn_kind_dir && diff_dirs)
+ else if (info->kind == svn_node_dir && diff_dirs)
SVN_ERR(svn_wc__diff_local_only_dir(db, child_abspath,
child_relpath,
depth_below_here,
@@ -796,12 +796,12 @@ walk_local_nodes_diff(struct edit_baton_
if (repos_only)
{
/* Report repository form deleted */
- if (base_kind == svn_kind_file && diff_files)
+ if (base_kind == svn_node_file && diff_files)
SVN_ERR(svn_wc__diff_base_only_file(db, child_abspath,
child_relpath, eb->revnum,
eb->processor, dir_baton,
iterpool));
- else if (base_kind == svn_kind_dir && diff_dirs)
+ else if (base_kind == svn_node_dir && diff_dirs)
SVN_ERR(svn_wc__diff_base_only_dir(db, child_abspath,
child_relpath, eb->revnum,
depth_below_here,
@@ -813,7 +813,7 @@ walk_local_nodes_diff(struct edit_baton_
else if (!local_only) /* Not local only nor remote only */
{
/* Diff base against actual */
- if (info->kind == svn_kind_file && diff_files)
+ if (info->kind == svn_node_file && diff_files)
{
if (info->status != svn_wc__db_status_normal
|| !eb->diff_pristine)
@@ -830,7 +830,7 @@ walk_local_nodes_diff(struct edit_baton_
scratch_pool));
}
}
- else if (info->kind == svn_kind_dir && diff_dirs)
+ else if (info->kind == svn_node_dir && diff_dirs)
SVN_ERR(walk_local_nodes_diff(eb, child_abspath,
child_relpath,
depth_below_here,
@@ -841,7 +841,7 @@ walk_local_nodes_diff(struct edit_baton_
if (!eb->local_before_remote && local_only)
{
- if (info->kind == svn_kind_file && diff_files)
+ if (info->kind == svn_node_file && diff_files)
SVN_ERR(svn_wc__diff_local_only_file(db, child_abspath,
child_relpath,
eb->processor, dir_baton,
@@ -850,7 +850,7 @@ walk_local_nodes_diff(struct edit_baton_
eb->cancel_func,
eb->cancel_baton,
iterpool));
- else if (info->kind == svn_kind_dir && diff_dirs)
+ else if (info->kind == svn_node_dir && diff_dirs)
SVN_ERR(svn_wc__diff_local_only_dir(db, child_abspath,
child_relpath, depth_below_here,
eb->processor, dir_baton,
@@ -924,7 +924,7 @@ svn_wc__diff_local_only_file(svn_wc__db_
svn_diff_source_t *right_src;
svn_diff_source_t *copyfrom_src = NULL;
svn_wc__db_status_t status;
- svn_kind_t kind;
+ svn_node_kind_t kind;
const svn_checksum_t *checksum;
const char *original_repos_relpath;
svn_revnum_t original_revision;
@@ -949,7 +949,7 @@ svn_wc__diff_local_only_file(svn_wc__db_
db, local_abspath,
scratch_pool, scratch_pool));
- assert(kind == svn_kind_file
+ assert(kind == svn_node_file
&& (status == svn_wc__db_status_normal
|| status == svn_wc__db_status_added
|| (status == svn_wc__db_status_deleted && diff_pristine)));
@@ -1129,8 +1129,8 @@ svn_wc__diff_local_only_dir(svn_wc__db_t
switch (info->kind)
{
- case svn_kind_file:
- case svn_kind_symlink:
+ case svn_node_file:
+ case svn_node_symlink:
SVN_ERR(svn_wc__diff_local_only_file(db, child_abspath,
child_relpath,
processor, pdb,
@@ -1140,7 +1140,7 @@ svn_wc__diff_local_only_dir(svn_wc__db_t
scratch_pool));
break;
- case svn_kind_dir:
+ case svn_node_dir:
if (depth > svn_depth_files || depth == svn_depth_unknown)
{
SVN_ERR(svn_wc__diff_local_only_dir(db, child_abspath,
@@ -1227,7 +1227,7 @@ handle_local_only(struct dir_baton_t *pb
break;
}
- if (info->kind == svn_kind_dir)
+ if (info->kind == svn_node_dir)
{
svn_depth_t depth ;
@@ -1272,7 +1272,7 @@ svn_wc__diff_base_only_file(svn_wc__db_t
apr_pool_t *scratch_pool)
{
svn_wc__db_status_t status;
- svn_kind_t kind;
+ svn_node_kind_t kind;
const svn_checksum_t *checksum;
apr_hash_t *props;
void *file_baton = NULL;
@@ -1289,7 +1289,7 @@ svn_wc__diff_base_only_file(svn_wc__db_t
scratch_pool, scratch_pool));
SVN_ERR_ASSERT(status == svn_wc__db_status_normal
- && kind == svn_kind_file
+ && kind == svn_node_file
&& checksum);
left_src = svn_diff__source_create(revision, scratch_pool);
@@ -1392,15 +1392,15 @@ svn_wc__diff_base_only_dir(svn_wc__db_t
switch (info->kind)
{
- case svn_kind_file:
- case svn_kind_symlink:
+ case svn_node_file:
+ case svn_node_symlink:
SVN_ERR(svn_wc__diff_base_only_file(db, child_abspath,
child_relpath,
revision,
processor, dir_baton,
iterpool));
break;
- case svn_kind_dir:
+ case svn_node_dir:
if (depth > svn_depth_files || depth == svn_depth_unknown)
{
svn_depth_t depth_below_here = depth;
@@ -1534,7 +1534,7 @@ add_directory(const char *path,
info = svn_hash_gets(pb->local_info, db->name);
- if (!info || info->kind != svn_kind_dir || NOT_PRESENT(info->status))
+ if (!info || info->kind != svn_node_dir || NOT_PRESENT(info->status))
db->repos_only = TRUE;
if (!db->repos_only && info->status != svn_wc__db_status_added)
@@ -1594,7 +1594,7 @@ open_directory(const char *path,
info = svn_hash_gets(pb->local_info, db->name);
- if (!info || info->kind != svn_kind_dir || NOT_PRESENT(info->status))
+ if (!info || info->kind != svn_node_dir || NOT_PRESENT(info->status))
db->repos_only = TRUE;
if (!db->repos_only)
@@ -1817,7 +1817,7 @@ add_file(const char *path,
info = svn_hash_gets(pb->local_info, fb->name);
- if (!info || info->kind != svn_kind_file || NOT_PRESENT(info->status))
+ if (!info || info->kind != svn_node_file || NOT_PRESENT(info->status))
fb->repos_only = TRUE;
if (!fb->repos_only && info->status != svn_wc__db_status_added)
@@ -1874,7 +1874,7 @@ open_file(const char *path,
info = svn_hash_gets(pb->local_info, fb->name);
- if (!info || info->kind != svn_kind_file || NOT_PRESENT(info->status))
+ if (!info || info->kind != svn_node_file || NOT_PRESENT(info->status))
fb->repos_only = TRUE;
if (!fb->repos_only)
Modified: subversion/trunk/subversion/libsvn_wc/diff_local.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/diff_local.c?rev=1455559&r1=1455558&r2=1455559&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/diff_local.c (original)
+++ subversion/trunk/subversion/libsvn_wc/diff_local.c Tue Mar 12 14:48:56 2013
@@ -260,8 +260,8 @@ diff_status_callback(void *baton,
svn_boolean_t local_only;
svn_wc__db_status_t db_status;
svn_boolean_t have_base;
- svn_kind_t base_kind;
- svn_kind_t db_kind = svn__kind_from_node_kind(status->kind, FALSE);
+ svn_node_kind_t base_kind;
+ svn_node_kind_t db_kind = status->kind;
svn_depth_t depth_below_here = svn_depth_unknown;
const char *child_abspath = local_abspath;
@@ -328,14 +328,14 @@ diff_status_callback(void *baton,
if (repos_only)
{
/* Report repository form deleted */
- if (base_kind == svn_kind_file)
+ if (base_kind == svn_node_file)
SVN_ERR(svn_wc__diff_base_only_file(db, child_abspath,
child_relpath,
SVN_INVALID_REVNUM,
eb->processor,
eb->cur ? eb->cur->baton : NULL,
scratch_pool));
- else if (base_kind == svn_kind_dir)
+ else if (base_kind == svn_node_dir)
SVN_ERR(svn_wc__diff_base_only_dir(db, child_abspath,
child_relpath,
SVN_INVALID_REVNUM,
@@ -349,7 +349,7 @@ diff_status_callback(void *baton,
else if (!local_only)
{
/* Diff base against actual */
- if (db_kind == svn_kind_file)
+ if (db_kind == svn_node_file)
{
SVN_ERR(svn_wc__diff_base_working_diff(db, child_abspath,
child_relpath,
@@ -364,7 +364,7 @@ diff_status_callback(void *baton,
eb->cancel_baton,
scratch_pool));
}
- else if (db_kind == svn_kind_dir)
+ else if (db_kind == svn_node_dir)
{
SVN_ERR(ensure_state(eb, local_abspath, FALSE, scratch_pool));
@@ -393,7 +393,7 @@ diff_status_callback(void *baton,
if (local_only)
{
- if (db_kind == svn_kind_file)
+ if (db_kind == svn_node_file)
SVN_ERR(svn_wc__diff_local_only_file(db, child_abspath,
child_relpath,
eb->processor,
@@ -403,7 +403,7 @@ diff_status_callback(void *baton,
eb->cancel_func,
eb->cancel_baton,
scratch_pool));
- else if (db_kind == svn_kind_dir)
+ else if (db_kind == svn_node_dir)
SVN_ERR(svn_wc__diff_local_only_dir(db, child_abspath,
child_relpath, depth_below_here,
eb->processor,
@@ -415,7 +415,7 @@ diff_status_callback(void *baton,
scratch_pool));
}
- if (db_kind == svn_kind_dir && (local_only || repos_only))
+ if (db_kind == svn_node_dir && (local_only || repos_only))
SVN_ERR(ensure_state(eb, local_abspath, TRUE /* skip */, scratch_pool));
}
@@ -439,7 +439,7 @@ svn_wc_diff6(svn_wc_context_t *wc_ctx,
apr_pool_t *scratch_pool)
{
struct diff_baton eb = { 0 };
- svn_kind_t kind;
+ svn_node_kind_t kind;
svn_boolean_t get_all;
const svn_diff_tree_processor_t *processor;
@@ -450,7 +450,7 @@ svn_wc_diff6(svn_wc_context_t *wc_ctx,
FALSE /* show_hidden */,
scratch_pool));
- if (kind == svn_kind_dir)
+ if (kind == svn_node_dir)
eb.anchor_abspath = local_abspath;
else
eb.anchor_abspath = svn_dirent_dirname(local_abspath, scratch_pool);