You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2014/03/04 12:39:40 UTC
svn commit: r1574038 - in /subversion/trunk/subversion: include/svn_fs.h
libsvn_fs_base/tree.c libsvn_fs_fs/tree.c libsvn_fs_x/tree.c
Author: stefan2
Date: Tue Mar 4 11:39:39 2014
New Revision: 1574038
URL: http://svn.apache.org/r1574038
Log:
Incorporate documentation and naming feedback gotten for r1554800.
No functional change.
* subversion/include/svn_fs.h
(svn_fs_node_relation_t): Add references to the values previously
used for these relations. Fix member
spelling and docstring typos.
(svn_fs_node_relation): Just declare the current behavior as the
intended one.
* subversion/libsvn_fs_base/tree.c
(base_node_relation): Adapt to enum member spelling fix.
* subversion/libsvn_fs_fs/tree.c
(fs_node_relation): Ditto.
* subversion/libsvn_fs_x/tree.c
(x_node_relation): Ditto.
Suggested by: julianfoad
Modified:
subversion/trunk/subversion/include/svn_fs.h
subversion/trunk/subversion/libsvn_fs_base/tree.c
subversion/trunk/subversion/libsvn_fs_fs/tree.c
subversion/trunk/subversion/libsvn_fs_x/tree.c
Modified: subversion/trunk/subversion/include/svn_fs.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_fs.h?rev=1574038&r1=1574037&r2=1574038&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_fs.h (original)
+++ subversion/trunk/subversion/include/svn_fs.h Tue Mar 4 11:39:39 2014
@@ -798,19 +798,23 @@ svn_fs_access_add_lock_token(svn_fs_acce
typedef enum svn_fs_node_relation_t
{
/** The nodes are not related.
- * Nodes from different repositories are always unrelated. */
+ * Nodes from different repositories are always unrelated.
+ * #svn_fs_compare_ids would return the value -1 in this case.
+ */
svn_fs_node_unrelated = 0,
- /** They are the same physical node, i.e. there is no intermittent change.
- * However, due to lazy copying, they may be intermittent parent copies.
+ /** They are the same physical node, i.e. there is no intervening change.
+ * However, due to lazy copying, there may be part of different parent
+ * copies. #svn_fs_compare_ids would return the value 0 in this case.
*/
svn_fs_node_same,
/** The nodes have a common ancestor (which may be one of these nodes)
* but are not the same.
+ * #svn_fs_compare_ids would return the value 1 in this case.
*/
- svn_fs_node_common_anchestor
-
+ svn_fs_node_common_ancestor
+
} svn_fs_node_relation_t;
/** An object representing a node-revision id. */
@@ -1573,9 +1577,9 @@ svn_fs_node_id(const svn_fs_id_t **id_p,
* arbitrary revision order and any of them may pertain to a transaction.
* @a pool is used for temporary allocations.
*
- * @note The current implementation considers paths from different svn_fs_t
- * as unrelated even if the underlying physical repository is the same.
- *
+ * @note Paths from different svn_fs_t will be reported as unrelated even
+ * if the underlying physical repository is the same.
+ *
* @since New in 1.9.
*/
svn_error_t *
Modified: subversion/trunk/subversion/libsvn_fs_base/tree.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_base/tree.c?rev=1574038&r1=1574037&r2=1574038&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_base/tree.c (original)
+++ subversion/trunk/subversion/libsvn_fs_base/tree.c Tue Mar 4 11:39:39 2014
@@ -1051,7 +1051,7 @@ base_node_relation(svn_fs_node_relation_
{
case 0: *relation = svn_fs_node_same;
break;
- case 1: *relation = svn_fs_node_common_anchestor;
+ case 1: *relation = svn_fs_node_common_ancestor;
break;
default: *relation = svn_fs_node_unrelated;
break;
Modified: subversion/trunk/subversion/libsvn_fs_fs/tree.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_fs/tree.c?rev=1574038&r1=1574037&r2=1574038&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_fs/tree.c (original)
+++ subversion/trunk/subversion/libsvn_fs_fs/tree.c Tue Mar 4 11:39:39 2014
@@ -1372,7 +1372,7 @@ fs_node_relation(svn_fs_node_relation_t
{
*relation = root_a->rev == root_b->rev
? svn_fs_node_same
- : svn_fs_node_common_anchestor;
+ : svn_fs_node_common_ancestor;
return SVN_NO_ERROR;
}
@@ -1391,7 +1391,7 @@ fs_node_relation(svn_fs_node_relation_t
if (svn_fs_fs__id_part_eq(&rev_item_a, &rev_item_b))
*relation = svn_fs_node_same;
else if (svn_fs_fs__id_part_eq(&node_id_a, &node_id_b))
- *relation = svn_fs_node_common_anchestor;
+ *relation = svn_fs_node_common_ancestor;
else
*relation = svn_fs_node_unrelated;
Modified: subversion/trunk/subversion/libsvn_fs_x/tree.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/tree.c?rev=1574038&r1=1574037&r2=1574038&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/tree.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/tree.c Tue Mar 4 11:39:39 2014
@@ -1349,7 +1349,7 @@ x_node_relation(svn_fs_node_relation_t *
{
*relation = root_a->rev == root_b->rev
? svn_fs_node_same
- : svn_fs_node_common_anchestor;
+ : svn_fs_node_common_ancestor;
return SVN_NO_ERROR;
}
@@ -1368,7 +1368,7 @@ x_node_relation(svn_fs_node_relation_t *
if (svn_fs_x__id_part_eq(&noderev_id_a, &noderev_id_b))
*relation = svn_fs_node_same;
else if (svn_fs_x__id_part_eq(&node_id_a, &node_id_b))
- *relation = svn_fs_node_common_anchestor;
+ *relation = svn_fs_node_common_ancestor;
else
*relation = svn_fs_node_unrelated;