You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sv...@apache.org on 2015/04/15 06:01:16 UTC
svn commit: r1673637 - in /subversion/branches/1.9.x: ./ subversion/include/
subversion/libsvn_fs/ subversion/libsvn_fs_base/ subversion/libsvn_fs_fs/
subversion/libsvn_fs_x/ subversion/libsvn_repos/ subversion/mod_dav_svn/
subversion/tests/libsvn_fs/
Author: svn-role
Date: Wed Apr 15 04:01:15 2015
New Revision: 1673637
URL: http://svn.apache.org/r1673637
Log:
Merge r1669746 from trunk:
* r1669746
Rename svn_fs_node_same to svn_fs_node_unchanged in FS API.
Justification:
This clarifies the new "node relationship" concept introduced in 1.9.
Neither calling it "same" (too strict) nor "equal" (too loose) would
imply the intended semantics. The sloppy and easily misinterpreted
semantics of the similar svn_fs_compare_ids lead to false and fragile
code (e.g. issue #4542). Let's not repeat this.
Votes:
+1: stefan2, philip, stsp
Modified:
subversion/branches/1.9.x/ (props changed)
subversion/branches/1.9.x/STATUS
subversion/branches/1.9.x/subversion/include/svn_fs.h
subversion/branches/1.9.x/subversion/libsvn_fs/editor.c
subversion/branches/1.9.x/subversion/libsvn_fs/fs-loader.c
subversion/branches/1.9.x/subversion/libsvn_fs_base/id.c
subversion/branches/1.9.x/subversion/libsvn_fs_base/tree.c
subversion/branches/1.9.x/subversion/libsvn_fs_fs/id.c
subversion/branches/1.9.x/subversion/libsvn_fs_fs/tree.c
subversion/branches/1.9.x/subversion/libsvn_fs_x/ (props changed)
subversion/branches/1.9.x/subversion/libsvn_fs_x/fs_id.c
subversion/branches/1.9.x/subversion/libsvn_fs_x/tree.c
subversion/branches/1.9.x/subversion/libsvn_repos/delta.c
subversion/branches/1.9.x/subversion/mod_dav_svn/repos.c
subversion/branches/1.9.x/subversion/mod_dav_svn/util.c
subversion/branches/1.9.x/subversion/mod_dav_svn/version.c
subversion/branches/1.9.x/subversion/tests/libsvn_fs/fs-test.c
Propchange: subversion/branches/1.9.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 15 04:01:15 2015
@@ -89,4 +89,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1660545-1660547,1660549-1662901,1663003,1663183-1663184,1663338,1663347,1663355,1663374,1663450,1663697,1663706,1663738,1663749,1663791,1664078,1664080,1664084-1664085,1664187,1664191,1664193,1664200,1664344,1664476,1664480-1664481,1664483,1664489-1664490,1664507,1664520-1664521,1664523,1664526-1664527,1664531-1664532,1664588,1664653,1664684,1664927,1664938-1664940,1664978,1664984,1664997,1665164,1665195,1665318,1665437-1665438,1665611-1665612,1665845,1665850,1665852,1665886,1665894,1665896,1666096,1666270,1666272,1666379,1666449,1666690,1666851,1667101,1667106-1667107,1667235,1667941,1667976,1668598-1668600,1668602-1668603,1668607-1668608,1668618,1669749,1670139,1670149,1670152,1670329,1670337,1670347,1670353,1671388,1672311,1672372,1672404,1672511-1672512,1672728,1673445
+/subversion/trunk:1660545-1660547,1660549-1662901,1663003,1663183-1663184,1663338,1663347,1663355,1663374,1663450,1663697,1663706,1663738,1663749,1663791,1664078,1664080,1664084-1664085,1664187,1664191,1664193,1664200,1664344,1664476,1664480-1664481,1664483,1664489-1664490,1664507,1664520-1664521,1664523,1664526-1664527,1664531-1664532,1664588,1664653,1664684,1664927,1664938-1664940,1664978,1664984,1664997,1665164,1665195,1665318,1665437-1665438,1665611-1665612,1665845,1665850,1665852,1665886,1665894,1665896,1666096,1666270,1666272,1666379,1666449,1666690,1666851,1667101,1667106-1667107,1667235,1667941,1667976,1668598-1668600,1668602-1668603,1668607-1668608,1668618,1669746,1669749,1670139,1670149,1670152,1670329,1670337,1670347,1670353,1671388,1672311,1672372,1672404,1672511-1672512,1672728,1673445
Modified: subversion/branches/1.9.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/STATUS?rev=1673637&r1=1673636&r2=1673637&view=diff
==============================================================================
--- subversion/branches/1.9.x/STATUS (original)
+++ subversion/branches/1.9.x/STATUS Wed Apr 15 04:01:15 2015
@@ -235,17 +235,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1669746
- Rename svn_fs_node_same to svn_fs_node_unchanged in FS API.
- Justification:
- This clarifies the new "node relationship" concept introduced in 1.9.
- Neither calling it "same" (too strict) nor "equal" (too loose) would
- imply the intended semantics. The sloppy and easily misinterpreted
- semantics of the similar svn_fs_compare_ids lead to false and fragile
- code (e.g. issue #4542). Let's not repeat this.
- Votes:
- +1: stefan2, philip, stsp
-
* r1673282
Rename svn_relpath_limit to svn_relpath_prefix in the public API.
Justification:
Modified: subversion/branches/1.9.x/subversion/include/svn_fs.h
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/include/svn_fs.h?rev=1673637&r1=1673636&r2=1673637&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/include/svn_fs.h (original)
+++ subversion/branches/1.9.x/subversion/include/svn_fs.h Wed Apr 15 04:01:15 2015
@@ -888,27 +888,39 @@ svn_fs_access_add_lock_token(svn_fs_acce
* @{
*/
-/** Defines the possible ways two arbitrary node-revisions may be related.
+/** Defines the possible ways two arbitrary (root, path)-pairs may be
+ * related.
*
* @since New in 1.9.
*/
typedef enum svn_fs_node_relation_t
{
- /** The node-revisions are not related.
- * Node-revisions from different repositories are always unrelated.
- * #svn_fs_compare_ids would return the value -1 in this case.
+ /** The (root, path)-pairs are not related, i.e. none of the other cases
+ * apply. If the roots refer to different @c svn_fs_t instances, then
+ * they are always considered unrelated - even if the underlying
+ * repository is the same.
*/
svn_fs_node_unrelated = 0,
- /** They are the same node-revision, 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.
+ /** No changes have been made between the (root, path)-pairs, i.e. they
+ * have the same (relative) nodes in their sub-trees, corresponding sub-
+ * tree nodes have the same contents as well as properties and report the
+ * same "created-path" and "created-rev" data. This implies having a
+ * common ancestor.
+ *
+ * However, due to efficiency considerations, the FS implementation may
+ * report some combinations as merely having a common ancestor
+ * (@a svn_fs_node_common_ancestor) instead of actually being unchanged.
*/
- svn_fs_node_same,
+ svn_fs_node_unchanged,
- /** The node-revisions have a common ancestor (which may be one of them)
- * but are not the same.
- * #svn_fs_compare_ids would return the value 1 in this case.
+ /** The (root, path)-pairs have a common ancestor (which may be one of
+ * them) but there are changes between them, i.e. they don't fall into
+ * the @c svn_fs_node_unchanged category.
+ *
+ * Due to efficiency considerations, the FS implementation may falsely
+ * classify some combinations as merely having a common ancestor that
+ * are, in fact, unchanged (@a svn_fs_node_unchanged).
*/
svn_fs_node_common_ancestor
Modified: subversion/branches/1.9.x/subversion/libsvn_fs/editor.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/libsvn_fs/editor.c?rev=1673637&r1=1673636&r2=1673637&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/libsvn_fs/editor.c (original)
+++ subversion/branches/1.9.x/subversion/libsvn_fs/editor.c Wed Apr 15 04:01:15 2015
@@ -249,7 +249,7 @@ can_modify(svn_fs_root_t *txn_root,
svn_fs_close_root(rev_root);
/* Has the target node changed in the future? */
- if (relation != svn_fs_node_same)
+ if (relation != svn_fs_node_unchanged)
{
/* Restarting the commit will base the txn on the future/new
revision, allowing the modification at REVISION. */
Modified: subversion/branches/1.9.x/subversion/libsvn_fs/fs-loader.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/libsvn_fs/fs-loader.c?rev=1673637&r1=1673636&r2=1673637&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/libsvn_fs/fs-loader.c (original)
+++ subversion/branches/1.9.x/subversion/libsvn_fs/fs-loader.c Wed Apr 15 04:01:15 2015
@@ -1899,7 +1899,7 @@ svn_fs_compare_ids(const svn_fs_id_t *a,
{
switch (a->vtable->compare(a, b))
{
- case svn_fs_node_same:
+ case svn_fs_node_unchanged:
return 0;
case svn_fs_node_common_ancestor:
return 1;
Modified: subversion/branches/1.9.x/subversion/libsvn_fs_base/id.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/libsvn_fs_base/id.c?rev=1673637&r1=1673636&r2=1673637&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/libsvn_fs_base/id.c (original)
+++ subversion/branches/1.9.x/subversion/libsvn_fs_base/id.c Wed Apr 15 04:01:15 2015
@@ -113,7 +113,7 @@ svn_fs_base__id_compare(const svn_fs_id_
const svn_fs_id_t *b)
{
if (svn_fs_base__id_eq(a, b))
- return svn_fs_node_same;
+ return svn_fs_node_unchanged;
return (svn_fs_base__id_check_related(a, b) ? svn_fs_node_common_ancestor
: svn_fs_node_unrelated);
}
Modified: subversion/branches/1.9.x/subversion/libsvn_fs_base/tree.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/libsvn_fs_base/tree.c?rev=1673637&r1=1673636&r2=1673637&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/libsvn_fs_base/tree.c (original)
+++ subversion/branches/1.9.x/subversion/libsvn_fs_base/tree.c Wed Apr 15 04:01:15 2015
@@ -3166,7 +3166,8 @@ txn_body_copy(void *baton,
if ((to_parent_path->node)
&& (svn_fs_base__id_compare(svn_fs_base__dag_get_id(from_node),
svn_fs_base__dag_get_id
- (to_parent_path->node)) == svn_fs_node_same))
+ (to_parent_path->node))
+ == svn_fs_node_unchanged))
return SVN_NO_ERROR;
if (! from_root->is_txn_root)
Modified: subversion/branches/1.9.x/subversion/libsvn_fs_fs/id.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/libsvn_fs_fs/id.c?rev=1673637&r1=1673636&r2=1673637&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/libsvn_fs_fs/id.c (original)
+++ subversion/branches/1.9.x/subversion/libsvn_fs_fs/id.c Wed Apr 15 04:01:15 2015
@@ -392,7 +392,7 @@ svn_fs_fs__id_compare(const svn_fs_id_t
const svn_fs_id_t *b)
{
if (svn_fs_fs__id_eq(a, b))
- return svn_fs_node_same;
+ return svn_fs_node_unchanged;
return (svn_fs_fs__id_check_related(a, b) ? svn_fs_node_common_ancestor
: svn_fs_node_unrelated);
}
Modified: subversion/branches/1.9.x/subversion/libsvn_fs_fs/tree.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/libsvn_fs_fs/tree.c?rev=1673637&r1=1673636&r2=1673637&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/libsvn_fs_fs/tree.c (original)
+++ subversion/branches/1.9.x/subversion/libsvn_fs_fs/tree.c Wed Apr 15 04:01:15 2015
@@ -1357,7 +1357,7 @@ fs_node_relation(svn_fs_node_relation_t
*relation = ( (root_a->rev == root_b->rev)
&& (root_a->is_txn_root == root_b->is_txn_root)
&& !different_txn)
- ? svn_fs_node_same
+ ? svn_fs_node_unchanged
: svn_fs_node_common_ancestor;
return SVN_NO_ERROR;
}
@@ -1391,7 +1391,7 @@ fs_node_relation(svn_fs_node_relation_t
/* The noderevs are actually related. Are they the same? */
if (svn_fs_fs__id_eq(id_a, id_b))
- *relation = svn_fs_node_same;
+ *relation = svn_fs_node_unchanged;
else
*relation = svn_fs_node_common_ancestor;
Propchange: subversion/branches/1.9.x/subversion/libsvn_fs_x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 15 04:01:15 2015
@@ -90,4 +90,4 @@
/subversion/branches/verify-keep-going/subversion/libsvn_fs_x:1439280-1492639,1546002-1546110
/subversion/branches/wc-collate-path/subversion/libsvn_fs_x:1402685-1480384
/subversion/trunk/subversion/libsvn_fs_fs:1415133-1596500,1596567,1597414,1597989,1598273,1599140,1600872,1601633,1603485-1603487,1603499,1603605,1604128,1604188,1604413-1604414,1604416-1604417,1604421,1604442,1604700,1604717,1604720,1604726,1604755,1604794,1604802,1604824,1604836,1604844,1604902-1604903,1604911,1604925,1604933,1604947,1605059-1605060,1605064-1605065,1605068,1605071-1605073,1605075,1605123,1605188-1605189,1605191,1605197,1605444,1605633,1606132,1606142,1606144,1606514,1606526,1606528,1606551,1606554,1606564,1606598-1606599,1606656,1606658,1606662,1606744,1606840,1607085,1607572,1612407,1612810,1613339,1613872,1614611,1615348,1615351-1615352,1615356,1616338-1616339,1616613,1617586,1617688,1618138,1618151,1618153,1618226,1618641,1618653,1618662,1619068,1619358,1619413,1619769,1619774,1620602,1620909,1620912,1620928,1620930,1621275,1621635,1622931,1622937,1622942,1622946,1622959-1622960,1622963,1622987,1623007,1623368,1623373,1623377,1623379,1623381,1623398,1623402,162
4011,1624265,1624512,1626246,1626871,1626873,1626886,1627497-1627498,1627502,1627947-1627949,1627966,1628083,1628093,1628158-1628159,1628161,1628392-1628393,1628415,1628427,1628676,1628738,1628762,1628764,1629854-1629855,1629857,1629865,1629873,1629875,1629879,1630067,1630070,1631049-1631051,1631075,1631115,1631171,1631180,1631185-1631186,1631196-1631197,1631239-1631240,1631548,1631550,1631563,1631567,1631588,1631598,1632646,1632776,1632849,1632851-1632853,1632856-1632857,1632868,1632908,1632926,1633232,1633617-1633618,1634872,1634875,1634879-1634880,1634920,1636478,1636483,1636629,1636644,1637184,1637186,1637330,1637358,1637363,1637393,1639319,1639322,1639335,1639348,1639352,1639355,1639358,1639414,1639419,1639426,1639430,1639436,1639440,1639549,1640061-1640062,1640197,1640915,1640966,1641013,1643139,1643233,1645567,1646021,1646712,1646716,1647537,1647540-1647541,1647820,1647905,1648230,1648238,1648241-1648243,1648253,1648272,1648532,1648537-1648539,1648542,1648591,1648612,1653608,
1658482
-/subversion/trunk/subversion/libsvn_fs_x:1414756-1509914,1665318,1665894,1667101,1669749,1670139,1670149,1670152,1670347
+/subversion/trunk/subversion/libsvn_fs_x:1414756-1509914,1665318,1665894,1667101,1669746,1669749,1670139,1670149,1670152,1670347
Modified: subversion/branches/1.9.x/subversion/libsvn_fs_x/fs_id.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/libsvn_fs_x/fs_id.c?rev=1673637&r1=1673636&r2=1673637&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/libsvn_fs_x/fs_id.c (original)
+++ subversion/branches/1.9.x/subversion/libsvn_fs_x/fs_id.c Wed Apr 15 04:01:15 2015
@@ -217,7 +217,7 @@ id_compare(const svn_fs_id_t *a,
/* Quick check: same IDs? */
if (svn_fs_x__id_eq(&id_a->noderev_id, &id_b->noderev_id))
- return svn_fs_node_same;
+ return svn_fs_node_unchanged;
/* Fetch the nodesrevs, compare the IDs of the nodes they belong to and
clean up any temporaries. If we can't find one of the noderevs, don't
Modified: subversion/branches/1.9.x/subversion/libsvn_fs_x/tree.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/libsvn_fs_x/tree.c?rev=1673637&r1=1673636&r2=1673637&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/libsvn_fs_x/tree.c (original)
+++ subversion/branches/1.9.x/subversion/libsvn_fs_x/tree.c Wed Apr 15 04:01:15 2015
@@ -1354,7 +1354,7 @@ x_node_relation(svn_fs_node_relation_t *
*relation = ( (root_a->rev == root_b->rev)
&& (root_a->is_txn_root == root_b->is_txn_root)
&& !different_txn)
- ? svn_fs_node_same
+ ? svn_fs_node_unchanged
: svn_fs_node_common_ancestor;
return SVN_NO_ERROR;
}
@@ -1372,7 +1372,7 @@ x_node_relation(svn_fs_node_relation_t *
/* In FSX, even in-txn IDs are globally unique.
* So, we can simply compare them. */
if (svn_fs_x__id_eq(&noderev_id_a, &noderev_id_b))
- *relation = svn_fs_node_same;
+ *relation = svn_fs_node_unchanged;
else if (svn_fs_x__id_eq(&node_id_a, &node_id_b))
*relation = svn_fs_node_common_ancestor;
else
Modified: subversion/branches/1.9.x/subversion/libsvn_repos/delta.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/libsvn_repos/delta.c?rev=1673637&r1=1673636&r2=1673637&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/libsvn_repos/delta.c (original)
+++ subversion/branches/1.9.x/subversion/libsvn_repos/delta.c Wed Apr 15 04:01:15 2015
@@ -321,7 +321,7 @@ svn_repos_dir_delta2(svn_fs_root_t *src_
SVN_ERR(svn_fs_node_relation(&relation, tgt_root, tgt_fullpath,
src_root, src_fullpath, pool));
- if (relation == svn_fs_node_same)
+ if (relation == svn_fs_node_unchanged)
{
/* They are the same node! No-op (you gotta love those). */
goto cleanup;
Modified: subversion/branches/1.9.x/subversion/mod_dav_svn/repos.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/mod_dav_svn/repos.c?rev=1673637&r1=1673636&r2=1673637&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/mod_dav_svn/repos.c (original)
+++ subversion/branches/1.9.x/subversion/mod_dav_svn/repos.c Wed Apr 15 04:01:15 2015
@@ -1932,7 +1932,7 @@ do_out_of_date_check(dav_resource_combin
r->pool);
}
- if (node_relation != svn_fs_node_same)
+ if (node_relation != svn_fs_node_unchanged)
{
serr = svn_error_createf(SVN_ERR_RA_OUT_OF_DATE, NULL,
"Directory '%s' is out of date",
Modified: subversion/branches/1.9.x/subversion/mod_dav_svn/util.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/mod_dav_svn/util.c?rev=1673637&r1=1673636&r2=1673637&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/mod_dav_svn/util.c (original)
+++ subversion/branches/1.9.x/subversion/mod_dav_svn/util.c Wed Apr 15 04:01:15 2015
@@ -217,7 +217,7 @@ dav_svn__get_safe_cr(svn_fs_root_t *root
return revision;
}
- if (node_relation == svn_fs_node_same)
+ if (node_relation == svn_fs_node_unchanged)
return history_rev; /* the history rev is safe! the same node
exists at the same path in both revisions. */
Modified: subversion/branches/1.9.x/subversion/mod_dav_svn/version.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/mod_dav_svn/version.c?rev=1673637&r1=1673636&r2=1673637&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/mod_dav_svn/version.c (original)
+++ subversion/branches/1.9.x/subversion/mod_dav_svn/version.c Wed Apr 15 04:01:15 2015
@@ -751,7 +751,7 @@ dav_svn__checkout(dav_resource *resource
svn_error_clear(serr);
return err;
}
- if (node_relation != svn_fs_node_same)
+ if (node_relation != svn_fs_node_unchanged)
{
return dav_svn__new_error_svn
(resource->pool, HTTP_CONFLICT, SVN_ERR_FS_CONFLICT,
Modified: subversion/branches/1.9.x/subversion/tests/libsvn_fs/fs-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.9.x/subversion/tests/libsvn_fs/fs-test.c?rev=1673637&r1=1673636&r2=1673637&view=diff
==============================================================================
--- subversion/branches/1.9.x/subversion/tests/libsvn_fs/fs-test.c (original)
+++ subversion/branches/1.9.x/subversion/tests/libsvn_fs/fs-test.c Wed Apr 15 04:01:15 2015
@@ -4268,7 +4268,7 @@ check_related(const svn_test_opts_t *opt
if (i == j)
{
/* Identical note. */
- if (!related || relation != svn_fs_node_same)
+ if (!related || relation != svn_fs_node_unchanged)
{
return svn_error_createf
(SVN_ERR_TEST_FAILED, NULL,
@@ -4319,7 +4319,7 @@ check_related(const svn_test_opts_t *opt
rev_root, path, subpool));
/* They shall use the same noderevs */
- if (relation != svn_fs_node_same)
+ if (relation != svn_fs_node_unchanged)
{
return svn_error_createf
(SVN_ERR_TEST_FAILED, NULL,
@@ -4472,7 +4472,7 @@ check_txn_related(const svn_test_opts_t
if (i == j)
{
/* Identical note. */
- if (!related || relation != svn_fs_node_same)
+ if (!related || relation != svn_fs_node_unchanged)
{
return svn_error_createf
(SVN_ERR_TEST_FAILED, NULL,
@@ -4511,7 +4511,7 @@ check_txn_related(const svn_test_opts_t
root[0], "D", subpool));
/* They shall use the same noderevs */
- if (relation != svn_fs_node_same)
+ if (relation != svn_fs_node_unchanged)
{
return svn_error_createf
(SVN_ERR_TEST_FAILED, NULL,