Author: ivan
Date: Sat Jan 9 22:24:46 2016
New Revision: 1723887
URL: http://svn.apache.org/viewvc?rev=1723887&view=rev
Log:
On 'fs-node-api' branch: Sync with trunk up to r1723886.
Modified:
subversion/branches/fs-node-api/ (props changed)
subversion/branches/fs-node-api/subversion/libsvn_repos/delta.c
subversion/branches/fs-node-api/subversion/libsvn_repos/reporter.c
subversion/branches/fs-node-api/subversion/libsvn_repos/repos.h
subversion/branches/fs-node-api/subversion/tests/libsvn_ra/ra-test.c
Propchange: subversion/branches/fs-node-api/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 9 22:24:46 2016
@@ -95,4 +95,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1723795-1723866
+/subversion/trunk:1723795-1723886
Modified: subversion/branches/fs-node-api/subversion/libsvn_repos/delta.c
URL:
http://svn.apache.org/viewvc/subversion/branches/fs-node-api/subversion/libsvn_repos/delta.c?rev=1723887&r1=1723886&r2=1723887&view=diff
==============================================================================
--- subversion/branches/fs-node-api/subversion/libsvn_repos/delta.c (original)
+++ subversion/branches/fs-node-api/subversion/libsvn_repos/delta.c Sat Jan 9
22:24:46 2016
@@ -603,19 +603,6 @@ send_text_delta(struct context *c,
}
}
-svn_error_t *
-svn_repos__compare_files(svn_boolean_t *changed_p,
- svn_fs_root_t *root1,
- const char *path1,
- svn_fs_root_t *root2,
- const char *path2,
- apr_pool_t *pool)
-{
- return svn_error_trace(svn_fs_contents_different(changed_p, root1, path1,
- root2, path2, pool));
-}
-
-
/* Make the appropriate edits on FILE_BATON to change its contents and
properties from those in SOURCE_PATH to those in TARGET_PATH. */
static svn_error_t *
Modified: subversion/branches/fs-node-api/subversion/libsvn_repos/reporter.c
URL:
http://svn.apache.org/viewvc/subversion/branches/fs-node-api/subversion/libsvn_repos/reporter.c?rev=1723887&r1=1723886&r2=1723887&view=diff
==============================================================================
--- subversion/branches/fs-node-api/subversion/libsvn_repos/reporter.c
(original)
+++ subversion/branches/fs-node-api/subversion/libsvn_repos/reporter.c Sat Jan
9 22:24:46 2016
@@ -671,7 +671,6 @@ delta_files(report_baton_t *b, void *fil
const char *s_path, const char *t_path, const char *lock_token,
apr_pool_t *pool)
{
- svn_boolean_t changed;
svn_fs_root_t *s_root = NULL;
svn_txdelta_stream_t *dstream = NULL;
svn_checksum_t *s_checksum;
@@ -685,14 +684,15 @@ delta_files(report_baton_t *b, void *fil
if (s_path)
{
+ svn_boolean_t changed;
SVN_ERR(get_source_root(b, &s_root, s_rev));
/* We're not interested in the theoretical difference between "has
contents which have not changed with respect to" and "has the same
actual contents as" when sending text-deltas. If we know the
delta is an empty one, we avoiding sending it in either case. */
- SVN_ERR(svn_repos__compare_files(&changed, b->t_root, t_path,
- s_root, s_path, pool));
+ SVN_ERR(svn_fs_contents_different(&changed, b->t_root, t_path,
+ s_root, s_path, pool));
if (!changed)
return SVN_NO_ERROR;
Modified: subversion/branches/fs-node-api/subversion/libsvn_repos/repos.h
URL:
http://svn.apache.org/viewvc/subversion/branches/fs-node-api/subversion/libsvn_repos/repos.h?rev=1723887&r1=1723886&r2=1723887&view=diff
==============================================================================
--- subversion/branches/fs-node-api/subversion/libsvn_repos/repos.h (original)
+++ subversion/branches/fs-node-api/subversion/libsvn_repos/repos.h Sat Jan 9
22:24:46 2016
@@ -390,17 +390,6 @@ svn_repos__authz_validate(svn_authz_t *a
/*** Utility Functions ***/
-/* Set *CHANGED_P to TRUE if ROOT1/PATH1 and ROOT2/PATH2 have
- different contents, FALSE if they have the same contents.
- Use POOL for temporary allocation. */
-svn_error_t *
-svn_repos__compare_files(svn_boolean_t *changed_p,
- svn_fs_root_t *root1,
- const char *path1,
- svn_fs_root_t *root2,
- const char *path2,
- apr_pool_t *pool);
-
/* Set *PREV_PATH and *PREV_REV to the path and revision which
represent the location at which PATH in FS was located immediately
prior to REVISION iff there was a copy operation (to PATH or one of
Modified: subversion/branches/fs-node-api/subversion/tests/libsvn_ra/ra-test.c
URL:
http://svn.apache.org/viewvc/subversion/branches/fs-node-api/subversion/tests/libsvn_ra/ra-test.c?rev=1723887&r1=1723886&r2=1723887&view=diff
==============================================================================
--- subversion/branches/fs-node-api/subversion/tests/libsvn_ra/ra-test.c
(original)
+++ subversion/branches/fs-node-api/subversion/tests/libsvn_ra/ra-test.c Sat
Jan 9 22:24:46 2016
@@ -620,7 +620,12 @@ get_dir_test(const svn_test_opts_t *opts
SVN_TEST_INT_ASSERT(apr_hash_count(dirents), 1);
ent = svn_hash_gets(dirents, "A");
SVN_TEST_ASSERT(ent);
+
+#if 0
+ /* ra_serf has returns SVN_INVALID_SIZE instead of documented zero for
+ * for directories. */
SVN_TEST_INT_ASSERT(ent->size, 0);
+#endif
return SVN_NO_ERROR;
}
