You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2015/05/11 10:53:22 UTC
svn commit: r1678695 - in /subversion/branches/move-tracking-2: ./
subversion/ subversion/libsvn_fs_fs/ subversion/libsvn_subr/
subversion/svn/ subversion/tests/libsvn_fs/
Author: julianfoad
Date: Mon May 11 08:53:21 2015
New Revision: 1678695
URL: http://svn.apache.org/r1678695
Log:
On the 'move-tracking-2' branch: catch up to trunk@1678693.
Added:
subversion/branches/move-tracking-2/subversion/tests/libsvn_fs/fs-sequential-test.c
- copied unchanged from r1678693, subversion/trunk/subversion/tests/libsvn_fs/fs-sequential-test.c
Modified:
subversion/branches/move-tracking-2/ (props changed)
subversion/branches/move-tracking-2/build.conf (contents, props changed)
subversion/branches/move-tracking-2/subversion/ (props changed)
subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/cached_data.c
subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/fs_fs.c
subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/recovery.c
subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/transaction.c
subversion/branches/move-tracking-2/subversion/libsvn_subr/cmdline.c
subversion/branches/move-tracking-2/subversion/libsvn_subr/hash.c
subversion/branches/move-tracking-2/subversion/svn/svn.c
subversion/branches/move-tracking-2/subversion/tests/libsvn_fs/fs-test.c
Propchange: subversion/branches/move-tracking-2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 11 08:53:21 2015
@@ -88,4 +88,4 @@
/subversion/branches/verify-at-commit:1462039-1462408
/subversion/branches/verify-keep-going:1439280-1546110
/subversion/branches/wc-collate-path:1402685-1480384
-/subversion/trunk:1606692-1677758
+/subversion/trunk:1606692-1678693
Modified: subversion/branches/move-tracking-2/build.conf
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/build.conf?rev=1678695&r1=1678694&r2=1678695&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/build.conf (original)
+++ subversion/branches/move-tracking-2/build.conf Mon May 11 08:53:21 2015
@@ -877,7 +877,7 @@ libs = libsvn_test libsvn_fs libsvn_delt
msvc-force-static = yes
[fs-test]
-description = Test locks in libsvn_fs
+description = Tests in libsvn_fs
type = exe
path = subversion/tests/libsvn_fs
sources = fs-test.c
@@ -885,6 +885,15 @@ install = test
libs = libsvn_test libsvn_fs libsvn_delta
libsvn_fs_util libsvn_subr aprutil apriconv apr
+[fs-sequential-test]
+description = Tests in libsvn_fs run sequentially
+type = exe
+path = subversion/tests/libsvn_fs
+sources = fs-sequential-test.c
+install = test
+libs = libsvn_test libsvn_fs libsvn_delta
+ libsvn_fs_util libsvn_subr aprutil apriconv apr
+
# ----------------------------------------------------------------------------
# Tests for libsvn_repos
@@ -1502,7 +1511,7 @@ type = project
path = build/win32
libs = __ALL__
fs-test fs-base-test fs-fsfs-test fs-fs-pack-test fs-fs-fuzzy-test
- fs-fs-private-test fs-x-pack-test string-table-test
+ fs-fs-private-test fs-x-pack-test string-table-test fs-sequential-test
skel-test strings-reps-test changes-test locks-test
repos-test dump-load-test
checksum-test compat-test config-test hashdump-test mergeinfo-test
Propchange: subversion/branches/move-tracking-2/build.conf
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 11 08:53:21 2015
@@ -82,4 +82,4 @@
/subversion/branches/verify-at-commit/build.conf:1462039-1462408
/subversion/branches/verify-keep-going/build.conf:1439280-1546110
/subversion/branches/wc-collate-path/build.conf:1402685-1480384
-/subversion/trunk/build.conf:1606692-1665165
+/subversion/trunk/build.conf:1606692-1678693
Propchange: subversion/branches/move-tracking-2/subversion/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon May 11 08:53:21 2015
@@ -82,4 +82,4 @@
/subversion/branches/verify-at-commit/subversion:1462039-1462408
/subversion/branches/verify-keep-going/subversion:1439280-1546110
/subversion/branches/wc-collate-path/subversion:1402685-1480384
-/subversion/trunk/subversion:1606692-1677758
+/subversion/trunk/subversion:1606692-1678693
Modified: subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/cached_data.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/cached_data.c?rev=1678695&r1=1678694&r2=1678695&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/cached_data.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/cached_data.c Mon May 11 08:53:21 2015
@@ -2724,16 +2724,27 @@ svn_fs_fs__get_proplist(apr_hash_t **pro
if (noderev->prop_rep && svn_fs_fs__id_txn_used(&noderev->prop_rep->txn_id))
{
+ svn_error_t *err;
const char *filename
= svn_fs_fs__path_txn_node_props(fs, noderev->id, pool);
proplist = apr_hash_make(pool);
SVN_ERR(svn_stream_open_readonly(&stream, filename, pool, pool));
- SVN_ERR(svn_hash_read2(proplist, stream, SVN_HASH_TERMINATOR, pool));
+ err = svn_hash_read2(proplist, stream, SVN_HASH_TERMINATOR, pool);
+ if (err)
+ {
+ svn_string_t *id_str = svn_fs_fs__id_unparse(noderev->id, pool);
+
+ svn_error_clear(svn_stream_close(stream));
+ return svn_error_createf(SVN_ERR_FS_CORRUPT, err,
+ _("malformed property list for node-revision '%s' in '%s'"),
+ id_str->data, filename);
+ }
SVN_ERR(svn_stream_close(stream));
}
else if (noderev->prop_rep)
{
+ svn_error_t *err;
fs_fs_data_t *ffd = fs->fsap_data;
representation_t *rep = noderev->prop_rep;
pair_cache_key_t key = { 0 };
@@ -2752,7 +2763,16 @@ svn_fs_fs__get_proplist(apr_hash_t **pro
proplist = apr_hash_make(pool);
SVN_ERR(svn_fs_fs__get_contents(&stream, fs, noderev->prop_rep, FALSE,
pool));
- SVN_ERR(svn_hash_read2(proplist, stream, SVN_HASH_TERMINATOR, pool));
+ err = svn_hash_read2(proplist, stream, SVN_HASH_TERMINATOR, pool);
+ if (err)
+ {
+ svn_string_t *id_str = svn_fs_fs__id_unparse(noderev->id, pool);
+
+ svn_error_clear(svn_stream_close(stream));
+ return svn_error_createf(SVN_ERR_FS_CORRUPT, err,
+ _("malformed property list for node-revision '%s'"),
+ id_str->data);
+ }
SVN_ERR(svn_stream_close(stream));
if (ffd->properties_cache && SVN_IS_VALID_REVNUM(rep->revision))
Modified: subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/fs_fs.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/fs_fs.c?rev=1678695&r1=1678694&r2=1678695&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/fs_fs.c Mon May 11 08:53:21 2015
@@ -1915,7 +1915,11 @@ get_node_origins_from_file(svn_fs_t *fs,
stream = svn_stream_from_aprfile2(fd, FALSE, pool);
*node_origins = apr_hash_make(pool);
- SVN_ERR(svn_hash_read2(*node_origins, stream, SVN_HASH_TERMINATOR, pool));
+ err = svn_hash_read2(*node_origins, stream, SVN_HASH_TERMINATOR, pool);
+ if (err)
+ return svn_error_createf(SVN_ERR_FS_CORRUPT, err,
+ _("malformed node origin data in '%s'"),
+ node_origins_file);
return svn_stream_close(stream);
}
Modified: subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/recovery.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/recovery.c?rev=1678695&r1=1678694&r2=1678695&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/recovery.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/recovery.c Mon May 11 08:53:21 2015
@@ -160,6 +160,7 @@ recover_find_max_ids(svn_fs_t *fs,
apr_hash_index_t *hi;
apr_pool_t *iterpool;
node_revision_t *noderev;
+ svn_error_t *err;
baton.stream = rev_file->stream;
SVN_ERR(svn_io_file_seek(rev_file->file, APR_SET, &offset, pool));
@@ -203,7 +204,16 @@ recover_find_max_ids(svn_fs_t *fs,
/* Now read the entries from that stream. */
entries = apr_hash_make(pool);
- SVN_ERR(svn_hash_read2(entries, stream, SVN_HASH_TERMINATOR, pool));
+ err = svn_hash_read2(entries, stream, SVN_HASH_TERMINATOR, pool);
+ if (err)
+ {
+ svn_string_t *id_str = svn_fs_fs__id_unparse(noderev->id, pool);
+
+ svn_error_clear(svn_stream_close(stream));
+ return svn_error_createf(SVN_ERR_FS_CORRUPT, err,
+ _("malformed representation for node-revision '%s'"),
+ id_str->data);
+ }
SVN_ERR(svn_stream_close(stream));
/* Now check each of the entries in our directory to find new node and
Modified: subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/transaction.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/transaction.c?rev=1678695&r1=1678694&r2=1678695&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/transaction.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_fs_fs/transaction.c Mon May 11 08:53:21 2015
@@ -1128,6 +1128,7 @@ get_txn_proplist(apr_hash_t *proplist,
apr_pool_t *pool)
{
svn_stream_t *stream;
+ svn_error_t *err;
/* Check for issue #3696. (When we find and fix the cause, we can change
* this to an assertion.) */
@@ -1141,7 +1142,14 @@ get_txn_proplist(apr_hash_t *proplist,
pool, pool));
/* Read in the property list. */
- SVN_ERR(svn_hash_read2(proplist, stream, SVN_HASH_TERMINATOR, pool));
+ err = svn_hash_read2(proplist, stream, SVN_HASH_TERMINATOR, pool);
+ if (err)
+ {
+ svn_error_clear(svn_stream_close(stream));
+ return svn_error_createf(SVN_ERR_FS_CORRUPT, err,
+ _("malformed transaction property list in '%s'"),
+ path_txn_props(fs, txn_id, pool));
+ }
return svn_stream_close(stream);
}
Modified: subversion/branches/move-tracking-2/subversion/libsvn_subr/cmdline.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_subr/cmdline.c?rev=1678695&r1=1678694&r2=1678695&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_subr/cmdline.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_subr/cmdline.c Mon May 11 08:53:21 2015
@@ -538,19 +538,20 @@ trust_server_cert_non_interactive(svn_au
apr_pool_t *pool)
{
struct trust_server_cert_non_interactive_baton *b = baton;
+ apr_uint32_t non_ignored_failures;
*cred_p = NULL;
- if (failures == 0 ||
- (b->trust_server_cert_unknown_ca &&
- (failures & SVN_AUTH_SSL_UNKNOWNCA)) ||
- (b->trust_server_cert_cn_mismatch &&
- (failures & SVN_AUTH_SSL_CNMISMATCH)) ||
- (b->trust_server_cert_expired &&
- (failures & SVN_AUTH_SSL_EXPIRED)) ||
- (b->trust_server_cert_not_yet_valid &&
- (failures & SVN_AUTH_SSL_NOTYETVALID)) ||
- (b->trust_server_cert_other_failure &&
- (failures & SVN_AUTH_SSL_OTHER)))
+ /* Mask away bits we are instructed to ignore. */
+ non_ignored_failures = failures & ~(
+ (b->trust_server_cert_unknown_ca ? SVN_AUTH_SSL_UNKNOWNCA : 0)
+ | (b->trust_server_cert_cn_mismatch ? SVN_AUTH_SSL_CNMISMATCH : 0)
+ | (b->trust_server_cert_expired ? SVN_AUTH_SSL_EXPIRED : 0)
+ | (b->trust_server_cert_not_yet_valid ? SVN_AUTH_SSL_NOTYETVALID : 0)
+ | (b->trust_server_cert_other_failure ? SVN_AUTH_SSL_OTHER : 0)
+ );
+
+ /* If no failures remain, accept the certificate. */
+ if (non_ignored_failures == 0)
{
*cred_p = apr_pcalloc(pool, sizeof(**cred_p));
(*cred_p)->may_save = FALSE;
@@ -882,7 +883,7 @@ string_in_array(const char *needle,
#include "config_keys.inc"
/* Validate the FILE, SECTION, and OPTION components of CONFIG_OPTION are
- * known. Warn to stderr if not. (An unknown value may be either a typo
+ * known. Return an error if not. (An unknown value may be either a typo
* or added in a newer minor version of Subversion.) */
static svn_error_t *
validate_config_option(svn_cmdline__config_argument_t *config_option,
Modified: subversion/branches/move-tracking-2/subversion/libsvn_subr/hash.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_subr/hash.c?rev=1678695&r1=1678694&r2=1678695&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_subr/hash.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_subr/hash.c Mon May 11 08:53:21 2015
@@ -135,7 +135,7 @@ svn_hash__read_entry(svn_hash__entry_t *
0, APR_SIZE_MAX, 10);
if (err)
return svn_error_create(SVN_ERR_MALFORMED_FILE, err,
- _("Serialized hash malformed"));
+ _("Serialized hash malformed key length"));
entry->keylen = (apr_size_t)ui64;
/* Now read that much into a buffer. */
@@ -148,19 +148,19 @@ svn_hash__read_entry(svn_hash__entry_t *
SVN_ERR(svn_stream_read_full(stream, &c, &len));
if (c != '\n')
return svn_error_create(SVN_ERR_MALFORMED_FILE, NULL,
- _("Serialized hash malformed"));
+ _("Serialized hash malformed key data"));
/* Read a val length line */
SVN_ERR(svn_stream_readline(stream, &buf, "\n", &eof, pool));
if ((buf->data[0] == 'V') && (buf->data[1] == ' '))
{
- /* Get the length of the key */
+ /* Get the length of the val */
err = svn_cstring_strtoui64(&ui64, buf->data + 2,
0, APR_SIZE_MAX, 10);
if (err)
return svn_error_create(SVN_ERR_MALFORMED_FILE, err,
- _("Serialized hash malformed"));
+ _("Serialized hash malformed value length"));
entry->vallen = (apr_size_t)ui64;
entry->val = apr_palloc(pool, entry->vallen + 1);
@@ -172,7 +172,7 @@ svn_hash__read_entry(svn_hash__entry_t *
SVN_ERR(svn_stream_read_full(stream, &c, &len));
if (c != '\n')
return svn_error_create(SVN_ERR_MALFORMED_FILE, NULL,
- _("Serialized hash malformed"));
+ _("Serialized hash malformed value data"));
}
else
return svn_error_create(SVN_ERR_MALFORMED_FILE, NULL,
@@ -186,7 +186,7 @@ svn_hash__read_entry(svn_hash__entry_t *
0, APR_SIZE_MAX, 10);
if (err)
return svn_error_create(SVN_ERR_MALFORMED_FILE, err,
- _("Serialized hash malformed"));
+ _("Serialized hash malformed key length"));
entry->keylen = (apr_size_t)ui64;
/* Now read that much into a buffer. */
@@ -199,7 +199,7 @@ svn_hash__read_entry(svn_hash__entry_t *
SVN_ERR(svn_stream_read_full(stream, &c, &len));
if (c != '\n')
return svn_error_create(SVN_ERR_MALFORMED_FILE, NULL,
- _("Serialized hash malformed"));
+ _("Serialized hash malformed key data"));
/* Remove this hash entry. */
entry->vallen = 0;
Modified: subversion/branches/move-tracking-2/subversion/svn/svn.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/svn/svn.c?rev=1678695&r1=1678694&r2=1678695&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/svn/svn.c (original)
+++ subversion/branches/move-tracking-2/subversion/svn/svn.c Mon May 11 08:53:21 2015
@@ -1457,6 +1457,8 @@ const svn_opt_subcommand_desc2_t svn_cl_
" directory:\n"
" svn:ignore - A list of file glob patterns to ignore, one per line.\n"
" svn:global-ignores - Like svn:ignore, but inheritable.\n"
+ " svn:auto-props - A list of file glob patterns and properties to set\n"
+ " when adding such files; like [auto-props] in the client configuration.\n"
" svn:externals - A list of module specifiers, one per line, in the\n"
" following format similar to the syntax of 'svn checkout':\n"
" [-r REV] URL[@PEG] LOCALPATH\n"
Modified: subversion/branches/move-tracking-2/subversion/tests/libsvn_fs/fs-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/tests/libsvn_fs/fs-test.c?rev=1678695&r1=1678694&r2=1678695&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/tests/libsvn_fs/fs-test.c (original)
+++ subversion/branches/move-tracking-2/subversion/tests/libsvn_fs/fs-test.c Mon May 11 08:53:21 2015
@@ -5610,100 +5610,6 @@ dir_prop_merge(const svn_test_opts_t *op
return SVN_NO_ERROR;
}
-#if APR_HAS_THREADS
-struct reopen_modify_baton_t {
- const char *fs_path;
- const char *txn_name;
- apr_pool_t *pool;
- svn_error_t *err;
-};
-
-static void * APR_THREAD_FUNC
-reopen_modify_child(apr_thread_t *tid, void *data)
-{
- struct reopen_modify_baton_t *baton = data;
- svn_fs_t *fs;
- svn_fs_txn_t *txn;
- svn_fs_root_t *root;
-
- baton->err = svn_fs_open(&fs, baton->fs_path, NULL, baton->pool);
- if (!baton->err)
- baton->err = svn_fs_open_txn(&txn, fs, baton->txn_name, baton->pool);
- if (!baton->err)
- baton->err = svn_fs_txn_root(&root, txn, baton->pool);
- if (!baton->err)
- baton->err = svn_fs_change_node_prop(root, "A", "name",
- svn_string_create("value",
- baton->pool),
- baton->pool);
- svn_pool_destroy(baton->pool);
- apr_thread_exit(tid, 0);
- return NULL;
-}
-#endif
-
-static svn_error_t *
-reopen_modify(const svn_test_opts_t *opts,
- apr_pool_t *pool)
-{
-#if APR_HAS_THREADS
- svn_fs_t *fs;
- svn_revnum_t head_rev = 0;
- svn_fs_root_t *root;
- svn_fs_txn_t *txn;
- const char *fs_path, *txn_name;
- svn_string_t *value;
- struct reopen_modify_baton_t baton;
- apr_status_t status, child_status;
- apr_threadattr_t *tattr;
- apr_thread_t *tid;
-
- /* Create test repository with greek tree. */
- fs_path = "test-reopen-modify";
- SVN_ERR(svn_test__create_fs(&fs, fs_path, opts, pool));
- SVN_ERR(svn_fs_begin_txn(&txn, fs, head_rev, pool));
- SVN_ERR(svn_fs_txn_root(&root, txn, pool));
- SVN_ERR(svn_test__create_greek_tree(root, pool));
- SVN_ERR(test_commit_txn(&head_rev, txn, NULL, pool));
-
- /* Create txn with changes. */
- SVN_ERR(svn_fs_begin_txn(&txn, fs, head_rev, pool));
- SVN_ERR(svn_fs_txn_name(&txn_name, txn, pool));
- SVN_ERR(svn_fs_txn_root(&root, txn, pool));
- SVN_ERR(svn_fs_make_dir(root, "X", pool));
-
- /* In another thread: reopen fs and txn, and add more changes. This
- works in BDB and FSX but in FSFS the txn_dir_cache becomes
- out-of-date and the thread's changes don't reach the revision. */
- baton.fs_path = fs_path;
- baton.txn_name = txn_name;
- baton.pool = svn_pool_create(pool);
- status = apr_threadattr_create(&tattr, pool);
- if (status)
- return svn_error_wrap_apr(status, _("Can't create threadattr"));
- status = apr_thread_create(&tid, tattr, reopen_modify_child, &baton, pool);
- if (status)
- return svn_error_wrap_apr(status, _("Can't create thread"));
- status = apr_thread_join(&child_status, tid);
- if (status)
- return svn_error_wrap_apr(status, _("Can't join thread"));
- if (baton.err)
- return svn_error_trace(baton.err);
-
- /* Commit */
- SVN_ERR(test_commit_txn(&head_rev, txn, NULL, pool));
-
- /* Check for change made by thread. */
- SVN_ERR(svn_fs_revision_root(&root, fs, head_rev, pool));
- SVN_ERR(svn_fs_node_prop(&value, root, "A", "name", pool));
- SVN_TEST_ASSERT(value && !strcmp(value->data, "value"));
-
- return SVN_NO_ERROR;
-#else
- return svn_error_create(SVN_ERR_TEST_SKIPPED, NULL, "no thread support");
-#endif
-}
-
static svn_error_t *
upgrade_while_committing(const svn_test_opts_t *opts,
apr_pool_t *pool)
@@ -7079,9 +6985,6 @@ static struct svn_test_descriptor_t test
"test svn_fs__compatible_version"),
SVN_TEST_OPTS_PASS(dir_prop_merge,
"test merge directory properties"),
- SVN_TEST_OPTS_XFAIL_OTOH(reopen_modify,
- "test reopen and modify txn",
- SVN_TEST_PASS_IF_FS_TYPE_IS_NOT("fsfs")),
SVN_TEST_OPTS_PASS(upgrade_while_committing,
"upgrade while committing"),
SVN_TEST_OPTS_PASS(test_paths_changed,