Author: stsp
Date: Thu Aug 14 19:06:18 2014
New Revision: 1618020
URL: http://svn.apache.org/r1618020
Log:
Rename the 'node_kind' field in svn_wc_conflict_description3_t
to 'local_node_kind'.
No functional change.
* subversion/include/svn_wc.h
(svn_wc_conflict_description3_t): Rename 'node_kind' to 'local_node_kind'.
Resolve a question in a comment by explaining where kinds of other nodes
involved in the conflict can be found.
(svn_wc_conflict_description_create_tree3): Rename 'node_kind' parameter
to 'local_node_kind'.
* subversion/libsvn_wc/info.c
(svn_wc__get_info): Track rename.
* subversion/libsvn_wc/tree_conflicts.c
(svn_wc__serialize_conflict): Track rename.
* subversion/libsvn_wc/util.c
(svn_wc_conflict_description_create_text3,
svn_wc_conflict_description_create_prop3,
svn_wc__cd3_to_cd2): Track rename.
(svn_wc_conflict_description_create_tree3): Rename 'node_kind' parameter
to 'local_node_kind'.
* subversion/tests/libsvn_wc/conflict-data-test.c
(compare_conflict, test_deserialize_tree_conflict): Track rename.
Modified:
subversion/trunk/subversion/include/svn_wc.h
subversion/trunk/subversion/libsvn_wc/info.c
subversion/trunk/subversion/libsvn_wc/tree_conflicts.c
subversion/trunk/subversion/libsvn_wc/util.c
subversion/trunk/subversion/tests/libsvn_wc/conflict-data-test.c
Modified: subversion/trunk/subversion/include/svn_wc.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_wc.h?rev=1618020&r1=1618019&r2=1618020&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_wc.h (original)
+++ subversion/trunk/subversion/include/svn_wc.h Thu Aug 14 19:06:18 2014
@@ -1772,9 +1772,11 @@ typedef struct svn_wc_conflict_descripti
/** The path that is in conflict (for a tree conflict, it is the victim) */
const char *local_abspath;
- /** The node type of the path being operated on (for a tree conflict,
- * ### which version?) */
- svn_node_kind_t node_kind;
+ /** The node type of the local node involved in this conflict.
+ * For a tree conflict, this is the node kind of the tree conflict victim.
+ * For the left/right node kinds of the incoming conflicting change see
+ * src_left_version->node_kind and src_right_version->node_kind. */
+ svn_node_kind_t local_node_kind;
/** What sort of conflict are we describing? */
svn_wc_conflict_kind_t kind;
@@ -2149,8 +2151,8 @@ svn_wc_conflict_description_create_prop(
*
* Set the @c local_abspath field of the created struct to @a local_abspath
* (which must be an absolute path), the @c kind field to
- * #svn_wc_conflict_kind_tree, the @c node_kind to @a node_kind, the @c
- * operation to @a operation, the @c src_left_version field to
+ * #svn_wc_conflict_kind_tree, the @c local_node_kind to @a local_node_kind,
+ * the @c operation to @a operation, the @c src_left_version field to
* @a src_left_version, and the @c src_right_version field to
* @a src_right_version.
*
@@ -2162,7 +2164,7 @@ svn_wc_conflict_description_create_prop(
svn_wc_conflict_description3_t *
svn_wc_conflict_description_create_tree3(
const char *local_abspath,
- svn_node_kind_t node_kind,
+ svn_node_kind_t local_node_kind,
svn_wc_operation_t operation,
const svn_wc_conflict_version_t *src_left_version,
const svn_wc_conflict_version_t *src_right_version,
Modified: subversion/trunk/subversion/libsvn_wc/info.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/info.c?rev=1618020&r1=1618019&r2=1618020&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/info.c (original)
+++ subversion/trunk/subversion/libsvn_wc/info.c Thu Aug 14 19:06:18 2014
@@ -575,7 +575,7 @@ svn_wc__get_info(svn_wc_context_t *wc_ct
const svn_wc_conflict_description3_t *);
if (!depth_includes(local_abspath, depth, tree_conflict->local_abspath,
- tree_conflict->node_kind, iterpool))
+ tree_conflict->local_node_kind, iterpool))
continue;
info->wc_info->conflicts = svn_wc__cd3_array_to_cd2_array(conflicts,
Modified: subversion/trunk/subversion/libsvn_wc/tree_conflicts.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/tree_conflicts.c?rev=1618020&r1=1618019&r2=1618020&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/tree_conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_wc/tree_conflicts.c Thu Aug 14 19:06:18
2014
@@ -366,9 +366,10 @@ svn_wc__serialize_conflict(svn_skel_t **
result_pool);
/* node_kind */
- SVN_ERR_ASSERT(conflict->node_kind == svn_node_dir
- || conflict->node_kind == svn_node_file);
- skel_prepend_enum(c_skel, node_kind_map, conflict->node_kind, result_pool);
+ SVN_ERR_ASSERT(conflict->local_node_kind == svn_node_dir
+ || conflict->local_node_kind == svn_node_file);
+ skel_prepend_enum(c_skel, node_kind_map, conflict->local_node_kind,
+ result_pool);
/* Victim path (escaping separator chars). */
victim_basename = svn_dirent_basename(conflict->local_abspath, result_pool);
Modified: subversion/trunk/subversion/libsvn_wc/util.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/util.c?rev=1618020&r1=1618019&r2=1618020&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/util.c (original)
+++ subversion/trunk/subversion/libsvn_wc/util.c Thu Aug 14 19:06:18 2014
@@ -198,7 +198,7 @@ svn_wc_conflict_description_create_text3
conflict = apr_pcalloc(result_pool, sizeof(*conflict));
conflict->local_abspath = apr_pstrdup(result_pool, local_abspath);
- conflict->node_kind = svn_node_file;
+ conflict->local_node_kind = svn_node_file;
conflict->kind = svn_wc_conflict_kind_text;
conflict->incoming_change = svn_wc_conflict_action_edit;
conflict->local_change = svn_wc_conflict_reason_edited;
@@ -217,7 +217,7 @@ svn_wc_conflict_description_create_prop3
conflict = apr_pcalloc(result_pool, sizeof(*conflict));
conflict->local_abspath = apr_pstrdup(result_pool, local_abspath);
- conflict->node_kind = node_kind;
+ conflict->local_node_kind = node_kind;
conflict->kind = svn_wc_conflict_kind_property;
conflict->property_name = apr_pstrdup(result_pool, property_name);
return conflict;
@@ -226,7 +226,7 @@ svn_wc_conflict_description_create_prop3
svn_wc_conflict_description3_t *
svn_wc_conflict_description_create_tree3(
const char *local_abspath,
- svn_node_kind_t node_kind,
+ svn_node_kind_t local_node_kind,
svn_wc_operation_t operation,
const svn_wc_conflict_version_t *src_left_version,
const svn_wc_conflict_version_t *src_right_version,
@@ -238,7 +238,7 @@ svn_wc_conflict_description_create_tree3
conflict = apr_pcalloc(result_pool, sizeof(*conflict));
conflict->local_abspath = apr_pstrdup(result_pool, local_abspath);
- conflict->node_kind = node_kind;
+ conflict->local_node_kind = local_node_kind;
conflict->kind = svn_wc_conflict_kind_tree;
conflict->operation = operation;
conflict->src_left_version = svn_wc_conflict_version_dup(src_left_version,
@@ -376,7 +376,7 @@ svn_wc__cd3_to_cd2(const svn_wc_conflict
if (conflict->local_abspath)
new_conflict->local_abspath = apr_pstrdup(result_pool,
conflict->local_abspath);
- new_conflict->node_kind = conflict->node_kind;
+ new_conflict->node_kind = conflict->local_node_kind;
new_conflict->kind = conflict->kind;
if (conflict->property_name)
new_conflict->property_name = apr_pstrdup(result_pool,
Modified: subversion/trunk/subversion/tests/libsvn_wc/conflict-data-test.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/libsvn_wc/conflict-data-test.c?rev=1618020&r1=1618019&r2=1618020&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/libsvn_wc/conflict-data-test.c (original)
+++ subversion/trunk/subversion/tests/libsvn_wc/conflict-data-test.c Thu Aug 14
19:06:18 2014
@@ -98,7 +98,7 @@ compare_conflict(const svn_wc_conflict_d
ASSERT_INT_EQ(actual->kind, expected->kind);
ASSERT_STR_EQ(actual->local_abspath, expected->local_abspath);
- ASSERT_INT_EQ(actual->node_kind, expected->node_kind);
+ ASSERT_INT_EQ(actual->local_node_kind,expected->local_node_kind);
ASSERT_STR_EQ(actual->property_name, expected->property_name);
ASSERT_INT_EQ(actual->is_binary, expected->is_binary);
ASSERT_STR_EQ(actual->mime_type, expected->mime_type);
@@ -235,7 +235,7 @@ test_deserialize_tree_conflict(apr_pool_
skel = svn_skel__parse(tree_conflict_data, strlen(tree_conflict_data), pool);
SVN_ERR(svn_wc__deserialize_conflict(&conflict, skel, "", pool, pool));
- if ((conflict->node_kind != exp_conflict->node_kind) ||
+ if ((conflict->local_node_kind != exp_conflict->local_node_kind) ||
(conflict->incoming_change != exp_conflict->incoming_change) ||
(conflict->local_change != exp_conflict->local_change) ||
(conflict->operation != exp_conflict->operation) ||
