Author: kotkov
Date: Fri Oct 30 17:16:39 2015
New Revision: 1711512
URL: http://svn.apache.org/viewvc?rev=1711512&view=rev
Log:
On the 1.9.x-r1706428 branch: Merge r1711507, r1711510 (without conflicts).
Modified:
subversion/branches/1.9.x-r1706428/ (props changed)
subversion/branches/1.9.x-r1706428/subversion/include/svn_fs.h
subversion/branches/1.9.x-r1706428/subversion/include/svn_ra.h
subversion/branches/1.9.x-r1706428/subversion/include/svn_repos.h
subversion/branches/1.9.x-r1706428/subversion/libsvn_fs_fs/dag.c
subversion/branches/1.9.x-r1706428/subversion/libsvn_fs_fs/tree.c
subversion/branches/1.9.x-r1706428/subversion/libsvn_repos/delta.c
subversion/branches/1.9.x-r1706428/subversion/libsvn_repos/reporter.c
subversion/branches/1.9.x-r1706428/subversion/libsvn_repos/rev_hunt.c
Propchange: subversion/branches/1.9.x-r1706428/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 30 17:16:39 2015
@@ -94,4 +94,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,1663530,1663671,1663697,1663706,1663738,1663749,1663791,1663991,1664035,1664078,1664080,1664084-1664085,1664187,1664191,1664193,1664200,1664344,1664476,1664480-1664481,1664483,1664489-1664490,1664507,1664520-1664521,1664523,1664526-1664527,1664531-1664532,1664588,1664593-1664594,1664596,1664653,1664664,1664672,1664674,1664684,1664927,1664938-1664940,1664978,1664984,1664997,1665164,1665195,1665213,1665259,1665318,1665437-1665438,1665609,1665611-1665612,1665845,1665850,1665852,1665886,1665894,1665896,1666096,1666258,1666270,1666272,1666379,1666449,1666690,1666832,1666851,1666965,1667101,1667106-1667107,1667120,1667228,1667233-1667235,1667249-1667250,1667258,1667290,1667301,1667471,1667691-1667693,1667699-1667700,1667715,1667941,1667976,1668320,1668598-1668600,1668602-1668603,1668607-1668608,1668618,1669743,1669746,1669749,1669945,1670139,1670149,1670152,1670329,1670337,167
0347,1670353,1671164,1671388,1672295,1672311,1672372,1672404,1672511-1672512,1672578,1672728,1673044,1673062-1673063,1673065,1673153,1673170,1673172,1673197,1673202,1673204,1673228,1673282,1673445,1673691-1673692,1673746,1673785,1673803,1674015,1674032,1674170,1674301,1674305,1674308,1674339-1674340,1674406,1674415,1674455-1674456,1674475,1674487,1674522,1674580,1674626-1674627,1674785,1674891,1675771,1675774,1676526,1676535,1676538,1676555,1676564,1676570,1676665,1676667,1676769,1677003,1677191,1677267,1677440,1678147,1678149,1678494,1678571,1678734,1678742,1678745-1678746,1678755,1678839,1678846,1678894,1678950,1678963,1679166,1679169,1679228,1679230,1679240,1679287,1679864,1679866,1679909,1680242,1680264,1680495,1680705,1680819,1681317,1682714,1682854,1683071,1683126,1683135,1683290,1683303,1683311,1683378,1683387,1684034,1684077,1684322,1684325,1684344,1684412,1684940,1685034,1685085,1686175,1686239,1686478,1686541,1686543,1686554,1686557,1686802,1686888,1686984,1687029,1687304,
1687389,1687769,1687776,1688258,1688273,1688395,1689214,1689216,1689721,1689729,1691712-1691713,1691924,1691928,1692091,1692093,1692098,1692448,1692469-1692470,1692798-1692799,1693135,1693138,1693159,1693886,1694023,1694194,1694481,1694929,1695022,1695600,1695606,1695681,1696222,1696225,1696387,1696695,1697381,1697384,1697387,1697664,1697824,1697835,1697845,1697914,1697967,1698106,1698312,1700215,1700219-1700220,1700740,1700951,1701064,1701206,1701270,1701298,1701598,1701603,1701611,1701633,1701638,1701646,1701736,1701792,1701797,1701838,1701997,1702198,1702200,1702203,1702218,1702231,1702237-1702239,1702247,1702288,1702299-1702300,1702310,1702397,1702407,1702467,1702472,1702474,1702478,1702533,1702549,1702553,1702565,1702891,1702974,1702991,1703675,1703740,1705060,1705062,1705064,1705088,1705328,1705843,1706241,1706323-1706324,1706428,1706437,1709388-1709389,1709562,1710104,1710215,1710290,1710558,1711250
+/subversion/trunk:1660545-1660547,1660549-1662901,1663003,1663183-1663184,1663338,1663347,1663355,1663374,1663450,1663530,1663671,1663697,1663706,1663738,1663749,1663791,1663991,1664035,1664078,1664080,1664084-1664085,1664187,1664191,1664193,1664200,1664344,1664476,1664480-1664481,1664483,1664489-1664490,1664507,1664520-1664521,1664523,1664526-1664527,1664531-1664532,1664588,1664593-1664594,1664596,1664653,1664664,1664672,1664674,1664684,1664927,1664938-1664940,1664978,1664984,1664997,1665164,1665195,1665213,1665259,1665318,1665437-1665438,1665609,1665611-1665612,1665845,1665850,1665852,1665886,1665894,1665896,1666096,1666258,1666270,1666272,1666379,1666449,1666690,1666832,1666851,1666965,1667101,1667106-1667107,1667120,1667228,1667233-1667235,1667249-1667250,1667258,1667290,1667301,1667471,1667691-1667693,1667699-1667700,1667715,1667941,1667976,1668320,1668598-1668600,1668602-1668603,1668607-1668608,1668618,1669743,1669746,1669749,1669945,1670139,1670149,1670152,1670329,1670337,167
0347,1670353,1671164,1671388,1672295,1672311,1672372,1672404,1672511-1672512,1672578,1672728,1673044,1673062-1673063,1673065,1673153,1673170,1673172,1673197,1673202,1673204,1673228,1673282,1673445,1673691-1673692,1673746,1673785,1673803,1674015,1674032,1674170,1674301,1674305,1674308,1674339-1674340,1674406,1674415,1674455-1674456,1674475,1674487,1674522,1674580,1674626-1674627,1674785,1674891,1675771,1675774,1676526,1676535,1676538,1676555,1676564,1676570,1676665,1676667,1676769,1677003,1677191,1677267,1677440,1678147,1678149,1678494,1678571,1678734,1678742,1678745-1678746,1678755,1678839,1678846,1678894,1678950,1678963,1679166,1679169,1679228,1679230,1679240,1679287,1679864,1679866,1679909,1680242,1680264,1680495,1680705,1680819,1681317,1682714,1682854,1683071,1683126,1683135,1683290,1683303,1683311,1683378,1683387,1684034,1684077,1684322,1684325,1684344,1684412,1684940,1685034,1685085,1686175,1686239,1686478,1686541,1686543,1686554,1686557,1686802,1686888,1686984,1687029,1687304,
1687389,1687769,1687776,1688258,1688273,1688395,1689214,1689216,1689721,1689729,1691712-1691713,1691924,1691928,1692091,1692093,1692098,1692448,1692469-1692470,1692798-1692799,1693135,1693138,1693159,1693886,1694023,1694194,1694481,1694929,1695022,1695600,1695606,1695681,1696222,1696225,1696387,1696695,1697381,1697384,1697387,1697664,1697824,1697835,1697845,1697914,1697967,1698106,1698312,1700215,1700219-1700220,1700740,1700951,1701064,1701206,1701270,1701298,1701598,1701603,1701611,1701633,1701638,1701646,1701736,1701792,1701797,1701838,1701997,1702198,1702200,1702203,1702218,1702231,1702237-1702239,1702247,1702288,1702299-1702300,1702310,1702397,1702407,1702467,1702472,1702474,1702478,1702533,1702549,1702553,1702565,1702891,1702974,1702991,1703675,1703740,1705060,1705062,1705064,1705088,1705328,1705843,1706241,1706323-1706324,1706428,1706437,1709388-1709389,1709562,1710104,1710215,1710290,1710558,1711250,1711507,1711510
Modified: subversion/branches/1.9.x-r1706428/subversion/include/svn_fs.h
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x-r1706428/subversion/include/svn_fs.h?rev=1711512&r1=1711511&r2=1711512&view=diff
==============================================================================
--- subversion/branches/1.9.x-r1706428/subversion/include/svn_fs.h (original)
+++ subversion/branches/1.9.x-r1706428/subversion/include/svn_fs.h Fri Oct 30
17:16:39 2015
@@ -1861,6 +1861,15 @@ svn_fs_change_node_prop(svn_fs_root_t *r
* both roots must be in the same filesystem.
* Do any necessary temporary allocation in @a scratch_pool.
*
+ * @note For the purposes of preserving accurate history, certain bits of
+ * code (such as the repository dump code) need to care about the distinction
+ * between situations when the properties are "different" and "have changed
+ * across two points in history". We have a pair of functions that can
+ * answer both of these questions, svn_fs_props_different() and
+ * svn_fs_props_changed(). See issue 4598 for more details.
+ *
+ * @see svn_fs_props_changed
+ *
* @since New in 1.9.
*/
svn_error_t *
@@ -1880,13 +1889,19 @@ svn_fs_props_different(svn_boolean_t *di
* both roots must be in the same filesystem.
* Do any necessary temporary allocation in @a pool.
*
- * Also see #svn_fs_contents_changed and issue 4598 for notes about this
- * pair of functions.
+ * @note For the purposes of preserving accurate history, certain bits of
+ * code (such as the repository dump code) need to care about the distinction
+ * between situations when the properties are "different" and "have changed
+ * across two points in history". We have a pair of functions that can
+ * answer both of these questions, svn_fs_props_different() and
+ * svn_fs_props_changed(). See issue 4598 for more details.
*
* @note This function can currently return false negatives for FSFS:
* If @a root1 and @a root2 were both transaction roots and the proplists
* of both paths had been changed in their respective transactions,
* @a changed_p would be set to #FALSE.
+ *
+ * @see svn_fs_props_different
*/
svn_error_t *
svn_fs_props_changed(svn_boolean_t *changed_p,
@@ -2414,6 +2429,16 @@ svn_fs_apply_text(svn_stream_t **content
* respective roots, and both roots must be in the same filesystem.
* Do any necessary temporary allocation in @a scratch_pool.
*
+ * @note For the purposes of preserving accurate history, certain bits of
+ * code (such as the repository dump code) need to care about the distinction
+ * between situations when two files have "different" content and when the
+ * contents of a given file "have changed" across two points in its history.
+ * We have a pair of functions that can answer both of these questions,
+ * svn_fs_contents_different() and svn_fs_contents_changed(). See issue
+ * 4598 for more details.
+ *
+ * @see svn_fs_contents_changed
+ *
* @since New in 1.9.
*/
svn_error_t *
@@ -2439,10 +2464,11 @@ svn_fs_contents_different(svn_boolean_t
* (such as the repository dump code) need to care about this distinction.
* For example, it's not an error from the FS API point of view to call
* svn_fs_apply_textdelta() and explicitly set a file's contents to exactly
- * what they were before the edit was made. But we try to preserve that fact
- * when dumping rather than claim that the file didn't change at all (despite
- * there being a change of modified parent directories and an associated
- * `changes' table entry which claim otherwise.) Also see issue 4598.
+ * what they were before the edit was made. We have a pair of functions
+ * that can answer both of these questions, svn_fs_contents_changed() and
+ * svn_fs_contents_different(). See issue 4598 for more details.
+ *
+ * @see svn_fs_contents_different
*/
svn_error_t *
svn_fs_contents_changed(svn_boolean_t *changed_p,
Modified: subversion/branches/1.9.x-r1706428/subversion/include/svn_ra.h
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x-r1706428/subversion/include/svn_ra.h?rev=1711512&r1=1711511&r2=1711512&view=diff
==============================================================================
--- subversion/branches/1.9.x-r1706428/subversion/include/svn_ra.h (original)
+++ subversion/branches/1.9.x-r1706428/subversion/include/svn_ra.h Fri Oct 30
17:16:39 2015
@@ -1796,10 +1796,11 @@ svn_ra_get_location_segments(svn_ra_sess
* to support reversion of the revision range for @a include_merged_revision
* @c FALSE reporting by switching @a end with @a start.
*
- * @note In Subversion 1.9.0-1.9.2, the delta handler / baton return
- * arguments passed to @a handler were set to #NULL in case of an empty
- * text delta. All other versions may request delta handlers from
- * @a handler even for empty text deltas.
+ * @note Prior to Subversion 1.9, this function may request delta handlers
+ * from @a handler even for empty text deltas. Starting with 1.9, the
+ * delta handler / baton return arguments passed to @a handler will be
+ * #NULL unless there is an actual difference in the file contents between
+ * the current and the previous call.
*
* @since New in 1.5.
*/
Modified: subversion/branches/1.9.x-r1706428/subversion/include/svn_repos.h
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x-r1706428/subversion/include/svn_repos.h?rev=1711512&r1=1711511&r2=1711512&view=diff
==============================================================================
--- subversion/branches/1.9.x-r1706428/subversion/include/svn_repos.h (original)
+++ subversion/branches/1.9.x-r1706428/subversion/include/svn_repos.h Fri Oct
30 17:16:39 2015
@@ -2087,10 +2087,11 @@ svn_repos_fs_get_mergeinfo(svn_mergeinfo
* the revision range for @a include_merged_revision @c FALSE reporting by
* switching @a start with @a end.
*
- * @note In Subversion 1.9.0-1.9.2, the delta handler / baton return
- * arguments passed to @a handler were set to #NULL in case of an empty
- * text delta. All other versions may request delta handlers from
- * @a handler even for empty text deltas.
+ * @note Prior to Subversion 1.9, this function may request delta handlers
+ * from @a handler even for empty text deltas. Starting with 1.9, the
+ * delta handler / baton return arguments passed to @a handler will be
+ * #NULL unless there is an actual difference in the file contents between
+ * the current and the previous call.
*
* @since New in 1.5.
*/
Modified: subversion/branches/1.9.x-r1706428/subversion/libsvn_fs_fs/dag.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x-r1706428/subversion/libsvn_fs_fs/dag.c?rev=1711512&r1=1711511&r2=1711512&view=diff
==============================================================================
--- subversion/branches/1.9.x-r1706428/subversion/libsvn_fs_fs/dag.c (original)
+++ subversion/branches/1.9.x-r1706428/subversion/libsvn_fs_fs/dag.c Fri Oct 30
17:16:39 2015
@@ -1321,9 +1321,6 @@ svn_fs_fs__dag_things_different(svn_bool
{
/* In strict mode, compare text and property representations in the
svn_fs_contents_different() / svn_fs_props_different() manner.
- These functions are currently not being used in our codebase, but
- we released them as a part of 1.9, and keep them for compatibility
- reasons.
See the "No-op changes no longer dumped by 'svnadmin dump' in 1.9"
discussion (http://svn.haxx.se/dev/archive-2015-09/0269.shtml) and
Modified: subversion/branches/1.9.x-r1706428/subversion/libsvn_fs_fs/tree.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x-r1706428/subversion/libsvn_fs_fs/tree.c?rev=1711512&r1=1711511&r2=1711512&view=diff
==============================================================================
--- subversion/branches/1.9.x-r1706428/subversion/libsvn_fs_fs/tree.c (original)
+++ subversion/branches/1.9.x-r1706428/subversion/libsvn_fs_fs/tree.c Fri Oct
30 17:16:39 2015
@@ -1882,6 +1882,7 @@ merge(svn_stringbuf_t *conflict_p,
*/
{
node_revision_t *tgt_nr, *anc_nr, *src_nr;
+ svn_boolean_t same;
apr_pool_t *scratch_pool;
/* Get node revisions for our id's. */
@@ -1898,16 +1899,15 @@ merge(svn_stringbuf_t *conflict_p,
/* Now compare the prop-keys of the skels. Note that just because
the keys are different -doesn't- mean the proplists have
- different contents. But merge() isn't concerned with contents;
- it doesn't do a brute-force comparison on textual contents, so
- it won't do that here either. Checking to see if the propkey
- atoms are `equal' is enough. */
- if (! svn_fs_fs__noderev_same_rep_key(src_nr->prop_rep, anc_nr->prop_rep))
+ different contents. */
+ SVN_ERR(svn_fs_fs__prop_rep_equal(&same, fs, src_nr, anc_nr, pool));
+ if (! same)
return conflict_err(conflict_p, target_path);
/* The directory entries got changed in the repository but the directory
properties did not. */
- if (! svn_fs_fs__noderev_same_rep_key(tgt_nr->prop_rep, anc_nr->prop_rep))
+ SVN_ERR(svn_fs_fs__prop_rep_equal(&same, fs, tgt_nr, anc_nr, pool));
+ if (! same)
{
/* There is an incoming prop change for this directory.
We will accept it only if the directory changes were mere updates
Modified: subversion/branches/1.9.x-r1706428/subversion/libsvn_repos/delta.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x-r1706428/subversion/libsvn_repos/delta.c?rev=1711512&r1=1711511&r2=1711512&view=diff
==============================================================================
--- subversion/branches/1.9.x-r1706428/subversion/libsvn_repos/delta.c
(original)
+++ subversion/branches/1.9.x-r1706428/subversion/libsvn_repos/delta.c Fri Oct
30 17:16:39 2015
@@ -523,8 +523,8 @@ delta_proplists(struct context *c,
svn_boolean_t changed;
/* Is this deltification worth our time? */
- SVN_ERR(svn_fs_props_changed(&changed, c->target_root, target_path,
- c->source_root, source_path, subpool));
+ SVN_ERR(svn_fs_props_different(&changed, c->target_root, target_path,
+ c->source_root, source_path, subpool));
if (! changed)
goto cleanup;
@@ -604,62 +604,8 @@ svn_repos__compare_files(svn_boolean_t *
const char *path2,
apr_pool_t *pool)
{
- svn_filesize_t size1, size2;
- svn_checksum_t *checksum1, *checksum2;
- svn_stream_t *stream1, *stream2;
- svn_boolean_t same;
-
- /* If the filesystem claims the things haven't changed, then they
- haven't changed. */
- SVN_ERR(svn_fs_contents_changed(changed_p, root1, path1,
- root2, path2, pool));
- if (!*changed_p)
- return SVN_NO_ERROR;
-
- /* If the SHA1 checksums match for these things, we'll claim they
- have the same contents. (We don't give quite as much weight to
- MD5 checksums.) */
- SVN_ERR(svn_fs_file_checksum(&checksum1, svn_checksum_sha1,
- root1, path1, FALSE, pool));
- SVN_ERR(svn_fs_file_checksum(&checksum2, svn_checksum_sha1,
- root2, path2, FALSE, pool));
- if (checksum1 && checksum2)
- {
- *changed_p = !svn_checksum_match(checksum1, checksum2);
- return SVN_NO_ERROR;
- }
-
- /* From this point on, our default answer is "Nothing's changed". */
- *changed_p = FALSE;
-
- /* Different filesizes means the contents are different. */
- SVN_ERR(svn_fs_file_length(&size1, root1, path1, pool));
- SVN_ERR(svn_fs_file_length(&size2, root2, path2, pool));
- if (size1 != size2)
- {
- *changed_p = TRUE;
- return SVN_NO_ERROR;
- }
-
- /* Different MD5 checksums means the contents are different. */
- SVN_ERR(svn_fs_file_checksum(&checksum1, svn_checksum_md5, root1, path1,
- FALSE, pool));
- SVN_ERR(svn_fs_file_checksum(&checksum2, svn_checksum_md5, root2, path2,
- FALSE, pool));
- if (!svn_checksum_match(checksum1, checksum2))
- {
- *changed_p = TRUE;
- return SVN_NO_ERROR;
- }
-
- /* And finally, different contents means the ... uh ... contents are
- different. */
- SVN_ERR(svn_fs_file_contents(&stream1, root1, path1, pool));
- SVN_ERR(svn_fs_file_contents(&stream2, root2, path2, pool));
- SVN_ERR(svn_stream_contents_same2(&same, stream1, stream2, pool));
- *changed_p = !same;
-
- return SVN_NO_ERROR;
+ return svn_error_trace(svn_fs_contents_different(changed_p, root1, path1,
+ root2, path2, pool));
}
@@ -686,19 +632,7 @@ delta_files(struct context *c,
if (source_path)
{
- /* Is this delta calculation worth our time? If we are ignoring
- ancestry, then our editor implementor isn't concerned by the
- theoretical differences between "has contents which have not
- changed with respect to" and "has the same actual contents
- as". We'll do everything we can to avoid transmitting even
- an empty text-delta in that case. */
- if (c->ignore_ancestry)
- SVN_ERR(svn_repos__compare_files(&changed,
- c->target_root, target_path,
- c->source_root, source_path,
- subpool));
- else
- SVN_ERR(svn_fs_contents_changed(&changed,
+ SVN_ERR(svn_fs_contents_different(&changed,
c->target_root, target_path,
c->source_root, source_path,
subpool));
Modified: subversion/branches/1.9.x-r1706428/subversion/libsvn_repos/reporter.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x-r1706428/subversion/libsvn_repos/reporter.c?rev=1711512&r1=1711511&r2=1711512&view=diff
==============================================================================
--- subversion/branches/1.9.x-r1706428/subversion/libsvn_repos/reporter.c
(original)
+++ subversion/branches/1.9.x-r1706428/subversion/libsvn_repos/reporter.c Fri
Oct 30 17:16:39 2015
@@ -576,8 +576,8 @@ delta_proplists(report_baton_t *b, svn_r
SVN_ERR(get_source_root(b, &s_root, s_rev));
/* Is this deltification worth our time? */
- SVN_ERR(svn_fs_props_changed(&changed, b->t_root, t_path, s_root,
- s_path, pool));
+ SVN_ERR(svn_fs_props_different(&changed, b->t_root, t_path, s_root,
+ s_path, pool));
if (! changed)
return SVN_NO_ERROR;
Modified: subversion/branches/1.9.x-r1706428/subversion/libsvn_repos/rev_hunt.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.9.x-r1706428/subversion/libsvn_repos/rev_hunt.c?rev=1711512&r1=1711511&r2=1711512&view=diff
==============================================================================
--- subversion/branches/1.9.x-r1706428/subversion/libsvn_repos/rev_hunt.c
(original)
+++ subversion/branches/1.9.x-r1706428/subversion/libsvn_repos/rev_hunt.c Fri
Oct 30 17:16:39 2015
@@ -1367,17 +1367,31 @@ send_path_revision(struct path_revision
SVN_ERR(svn_prop_diffs(&prop_diffs, props, sb->last_props,
sb->iterpool));
- /* Check if the contents changed. */
+ /* Check if the contents *may* have changed. */
if (! sb->last_root)
{
/* Special case: In the first revision, we always provide a delta. */
contents_changed = TRUE;
}
+ else if (sb->include_merged_revisions
+ && strcmp(sb->last_path, path_rev->path))
+ {
+ /* ### This is a HACK!!!
+ * Blame -g, in older clients anyways, relies on getting a notification
+ * whenever the path changes - even if there was no content change.
+ *
+ * TODO: A future release should take an extra parameter and depending
+ * on that either always send a text delta or only send it if there
+ * is a difference. */
+ contents_changed = TRUE;
+ }
else
{
- SVN_ERR(svn_fs_contents_changed(&contents_changed, sb->last_root,
- sb->last_path, root, path_rev->path,
- sb->iterpool));
+ /* Did the file contents actually change?
+ * It could e.g. be a property-only change. */
+ SVN_ERR(svn_fs_contents_different(&contents_changed, sb->last_root,
+ sb->last_path, root, path_rev->path,
+ sb->iterpool));
}
/* We have all we need, give to the handler. */
