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 2012/06/20 15:28:29 UTC
svn commit: r1352093 - in /subversion/branches/1.7.x-r1352068: ./
subversion/libsvn_client/ subversion/libsvn_diff/ subversion/libsvn_fs_fs/
subversion/libsvn_subr/ subversion/libsvn_wc/ subversion/tests/libsvn_wc/
Author: julianfoad
Date: Wed Jun 20 13:28:29 2012
New Revision: 1352093
URL: http://svn.apache.org/viewvc?rev=1352093&view=rev
Log:
On the 1.7.x-r1352068 branch: merge r1352068 from trunk.
Modified:
subversion/branches/1.7.x-r1352068/ (props changed)
subversion/branches/1.7.x-r1352068/subversion/libsvn_client/deprecated.c
subversion/branches/1.7.x-r1352068/subversion/libsvn_client/info.c
subversion/branches/1.7.x-r1352068/subversion/libsvn_diff/diff_file.c
subversion/branches/1.7.x-r1352068/subversion/libsvn_fs_fs/fs_fs.c
subversion/branches/1.7.x-r1352068/subversion/libsvn_fs_fs/lock.c
subversion/branches/1.7.x-r1352068/subversion/libsvn_subr/auth.c
subversion/branches/1.7.x-r1352068/subversion/libsvn_subr/sqlite.c
subversion/branches/1.7.x-r1352068/subversion/libsvn_wc/adm_ops.c
subversion/branches/1.7.x-r1352068/subversion/libsvn_wc/props.c
subversion/branches/1.7.x-r1352068/subversion/libsvn_wc/upgrade.c
subversion/branches/1.7.x-r1352068/subversion/libsvn_wc/wc_db.c
subversion/branches/1.7.x-r1352068/subversion/libsvn_wc/wc_db_util.c
subversion/branches/1.7.x-r1352068/subversion/tests/libsvn_wc/op-depth-test.c
Propchange: subversion/branches/1.7.x-r1352068/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1352068
Modified: subversion/branches/1.7.x-r1352068/subversion/libsvn_client/deprecated.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1352068/subversion/libsvn_client/deprecated.c?rev=1352093&r1=1352092&r2=1352093&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1352068/subversion/libsvn_client/deprecated.c (original)
+++ subversion/branches/1.7.x-r1352068/subversion/libsvn_client/deprecated.c Wed Jun 20 13:28:29 2012
@@ -1551,7 +1551,9 @@ svn_client_propset3(svn_commit_info_t **
{
if (svn_path_is_url(target))
{
- struct capture_baton_t cb = { commit_info_p, pool };
+ struct capture_baton_t cb;
+ cb.info = commit_info_p;
+ cb.pool = pool;
SVN_ERR(svn_client_propset_remote(propname, propval, target, skip_checks,
base_revision_for_url, revprop_table,
@@ -1864,8 +1866,10 @@ svn_client_status4(svn_revnum_t *result_
svn_client_ctx_t *ctx,
apr_pool_t *pool)
{
- struct status4_wrapper_baton swb = { ctx->wc_ctx, status_func,
- status_baton };
+ struct status4_wrapper_baton swb;
+ swb.wc_ctx = ctx->wc_ctx;
+ swb.old_func = status_func;
+ swb.old_baton = status_baton;
return svn_client_status5(result_rev, ctx, path, revision, depth, get_all,
update, no_ignore, ignore_externals, TRUE,
Modified: subversion/branches/1.7.x-r1352068/subversion/libsvn_client/info.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1352068/subversion/libsvn_client/info.c?rev=1352093&r1=1352092&r2=1352093&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1352068/subversion/libsvn_client/info.c (original)
+++ subversion/branches/1.7.x-r1352068/subversion/libsvn_client/info.c Wed Jun 20 13:28:29 2012
@@ -293,7 +293,9 @@ svn_client_info3(const char *abspath_or_
|| peg_revision->kind == svn_opt_revision_unspecified))
{
/* Do all digging in the working copy. */
- wc_info_receiver_baton_t b = { receiver, receiver_baton };
+ wc_info_receiver_baton_t b;
+ b.client_receiver_func = receiver;
+ b.client_receiver_baton = receiver_baton;
return svn_error_trace(
svn_wc__get_info(ctx->wc_ctx, abspath_or_url, depth,
fetch_excluded, fetch_actual_only, changelists,
Modified: subversion/branches/1.7.x-r1352068/subversion/libsvn_diff/diff_file.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1352068/subversion/libsvn_diff/diff_file.c?rev=1352093&r1=1352092&r2=1352093&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1352068/subversion/libsvn_diff/diff_file.c (original)
+++ subversion/branches/1.7.x-r1352068/subversion/libsvn_diff/diff_file.c Wed Jun 20 13:28:29 2012
@@ -1168,10 +1168,13 @@ svn_diff_file_options_parse(svn_diff_fil
apr_pool_t *pool)
{
apr_getopt_t *os;
- struct opt_parsing_error_baton_t opt_parsing_error_baton = { NULL, pool };
+ struct opt_parsing_error_baton_t opt_parsing_error_baton;
/* Make room for each option (starting at index 1) plus trailing NULL. */
const char **argv = apr_palloc(pool, sizeof(char*) * (args->nelts + 2));
+ opt_parsing_error_baton.err = NULL;
+ opt_parsing_error_baton.pool = pool;
+
argv[0] = "";
memcpy((void *) (argv + 1), args->elts, sizeof(char*) * args->nelts);
argv[args->nelts + 1] = NULL;
Modified: subversion/branches/1.7.x-r1352068/subversion/libsvn_fs_fs/fs_fs.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1352068/subversion/libsvn_fs_fs/fs_fs.c?rev=1352093&r1=1352092&r2=1352093&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1352068/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/branches/1.7.x-r1352068/subversion/libsvn_fs_fs/fs_fs.c Wed Jun 20 13:28:29 2012
@@ -3382,7 +3382,9 @@ set_cached_window(svn_txdelta_window_t *
if (rs->window_cache)
{
/* store the window and the first offset _past_ it */
- svn_fs_fs__txdelta_cached_window_t cached_window = { window, rs->off };
+ svn_fs_fs__txdelta_cached_window_t cached_window;
+ cached_window.window = window;
+ cached_window.end_offset = rs->off;
/* but key it with the start offset because that is the known state
* when we will look it up */
@@ -5254,7 +5256,9 @@ svn_fs_fs__set_entry(svn_fs_t *fs,
/* build parameters: (name, new entry) pair */
const char *key =
svn_fs_fs__id_unparse(parent_noderev->id, subpool)->data;
- replace_baton_t baton = {name, NULL};
+ replace_baton_t baton;
+ baton.name = name;
+ baton.new_entry = NULL;
if (id)
{
Modified: subversion/branches/1.7.x-r1352068/subversion/libsvn_fs_fs/lock.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1352068/subversion/libsvn_fs_fs/lock.c?rev=1352093&r1=1352092&r2=1352093&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1352068/subversion/libsvn_fs_fs/lock.c (original)
+++ subversion/branches/1.7.x-r1352068/subversion/libsvn_fs_fs/lock.c Wed Jun 20 13:28:29 2012
@@ -648,7 +648,11 @@ walk_locks(svn_fs_t *fs,
svn_boolean_t have_write_lock,
apr_pool_t *pool)
{
- struct walk_locks_baton wlb = { get_locks_func, get_locks_baton, fs };
+ struct walk_locks_baton wlb;
+
+ wlb.get_locks_func = get_locks_func;
+ wlb.get_locks_baton = get_locks_baton;
+ wlb.fs = fs;
SVN_ERR(walk_digest_files(fs->path, digest_path, locks_walker, &wlb,
have_write_lock, pool));
return SVN_NO_ERROR;
Modified: subversion/branches/1.7.x-r1352068/subversion/libsvn_subr/auth.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1352068/subversion/libsvn_subr/auth.c?rev=1352093&r1=1352092&r2=1352093&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1352068/subversion/libsvn_subr/auth.c (original)
+++ subversion/branches/1.7.x-r1352068/subversion/libsvn_subr/auth.c Wed Jun 20 13:28:29 2012
@@ -418,11 +418,12 @@ svn_auth_get_platform_specific_provider
{
svn_version_func_t version_function
= version_function_symbol;
- const svn_version_checklist_t check_list[] =
- {
- { library_label, version_function },
- { NULL, NULL }
- };
+ svn_version_checklist_t check_list[2];
+
+ check_list[0].label = library_label;
+ check_list[0].version_query = version_function;
+ check_list[1].label = NULL;
+ check_list[1].version_query = NULL;
SVN_ERR(svn_ver_check_list(svn_subr_version(), check_list));
}
if (apr_dso_sym(&provider_function_symbol,
Modified: subversion/branches/1.7.x-r1352068/subversion/libsvn_subr/sqlite.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1352068/subversion/libsvn_subr/sqlite.c?rev=1352093&r1=1352092&r2=1352093&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1352068/subversion/libsvn_subr/sqlite.c (original)
+++ subversion/branches/1.7.x-r1352068/subversion/libsvn_subr/sqlite.c Wed Jun 20 13:28:29 2012
@@ -1205,13 +1205,15 @@ wrapped_func(sqlite3_context *context,
sqlite3_value *values[])
{
struct function_wrapper_baton_t *fwb = sqlite3_user_data(context);
- svn_sqlite__context_t sctx = { context };
+ svn_sqlite__context_t sctx;
svn_sqlite__value_t **local_vals =
apr_palloc(fwb->scratch_pool,
sizeof(svn_sqlite__value_t *) * argc);
svn_error_t *err;
int i;
+ sctx.context = context;
+
for (i = 0; i < argc; i++)
{
local_vals[i] = apr_palloc(fwb->scratch_pool, sizeof(*local_vals[i]));
Modified: subversion/branches/1.7.x-r1352068/subversion/libsvn_wc/adm_ops.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1352068/subversion/libsvn_wc/adm_ops.c?rev=1352093&r1=1352092&r2=1352093&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1352068/subversion/libsvn_wc/adm_ops.c (original)
+++ subversion/branches/1.7.x-r1352068/subversion/libsvn_wc/adm_ops.c Wed Jun 20 13:28:29 2012
@@ -2447,8 +2447,11 @@ svn_wc_get_changelists(svn_wc_context_t
void *cancel_baton,
apr_pool_t *scratch_pool)
{
- struct get_cl_fn_baton gnb = { wc_ctx->db, NULL,
- callback_func, callback_baton };
+ struct get_cl_fn_baton gnb;
+ gnb.db = wc_ctx->db;
+ gnb.clhash = NULL;
+ gnb.callback_func = callback_func;
+ gnb.callback_baton = callback_baton;
if (changelist_filter)
SVN_ERR(svn_hash_from_cstring_keys(&gnb.clhash, changelist_filter,
Modified: subversion/branches/1.7.x-r1352068/subversion/libsvn_wc/props.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1352068/subversion/libsvn_wc/props.c?rev=1352093&r1=1352092&r2=1352093&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1352068/subversion/libsvn_wc/props.c (original)
+++ subversion/branches/1.7.x-r1352068/subversion/libsvn_wc/props.c Wed Jun 20 13:28:29 2012
@@ -1846,8 +1846,10 @@ svn_wc__prop_list_recursive(svn_wc_conte
{
svn_wc__proplist_receiver_t receiver = receiver_func;
void *baton = receiver_baton;
- struct propname_filter_baton_t pfb = { receiver_func, receiver_baton,
- propname };
+ struct propname_filter_baton_t pfb;
+ pfb.receiver_func = receiver_func;
+ pfb.receiver_baton = receiver_baton;
+ pfb.propname = propname;
SVN_ERR_ASSERT(receiver_func);
@@ -2473,8 +2475,13 @@ svn_wc_prop_set4(svn_wc_context_t *wc_ct
}
else
{
- struct propset_walk_baton wb = { name, value, wc_ctx->db, skip_checks,
- notify_func, notify_baton };
+ struct propset_walk_baton wb;
+ wb.propname = name;
+ wb.propval = value;
+ wb.db = wc_ctx->db;
+ wb.force = skip_checks;
+ wb.notify_func = notify_func;
+ wb.notify_baton = notify_baton;
SVN_ERR(svn_wc__internal_walk_children(wc_ctx->db, local_abspath,
FALSE, changelist_filter,
Modified: subversion/branches/1.7.x-r1352068/subversion/libsvn_wc/upgrade.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1352068/subversion/libsvn_wc/upgrade.c?rev=1352093&r1=1352092&r2=1352093&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1352068/subversion/libsvn_wc/upgrade.c (original)
+++ subversion/branches/1.7.x-r1352068/subversion/libsvn_wc/upgrade.c Wed Jun 20 13:28:29 2012
@@ -1545,7 +1545,8 @@ svn_wc__upgrade_sdb(int *result_format,
int start_format,
apr_pool_t *scratch_pool)
{
- struct bump_baton bb = { wcroot_abspath };
+ struct bump_baton bb;
+ bb.wcroot_abspath = wcroot_abspath;
if (start_format < SVN_WC__WC_NG_VERSION /* 12 */)
return svn_error_createf(SVN_ERR_WC_UPGRADE_REQUIRED, NULL,
Modified: subversion/branches/1.7.x-r1352068/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1352068/subversion/libsvn_wc/wc_db.c?rev=1352093&r1=1352092&r2=1352093&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1352068/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/branches/1.7.x-r1352068/subversion/libsvn_wc/wc_db.c Wed Jun 20 13:28:29 2012
@@ -4994,8 +4994,10 @@ svn_wc__db_op_set_changelist(svn_wc__db_
{
svn_wc__db_wcroot_t *wcroot;
const char *local_relpath;
- struct set_changelist_baton_t scb = { new_changelist, changelist_filter,
- depth };
+ struct set_changelist_baton_t scb;
+ scb.new_changelist = new_changelist;
+ scb.changelist_filter = changelist_filter;
+ scb.depth = depth;
SVN_ERR_ASSERT(svn_dirent_is_absolute(local_abspath));
@@ -5514,9 +5516,15 @@ svn_wc__db_revert_list_read(svn_boolean_
{
svn_wc__db_wcroot_t *wcroot;
const char *local_relpath;
- struct revert_list_read_baton b = {reverted, conflict_old, conflict_new,
- conflict_working, prop_reject,
- copied_here, kind, result_pool};
+ struct revert_list_read_baton b;
+ b.reverted = reverted;
+ b.conflict_old = conflict_old;
+ b.conflict_new = conflict_new;
+ b.conflict_working = conflict_working;
+ b.prop_reject = prop_reject;
+ b.copied_here = copied_here;
+ b.kind = kind;
+ b.result_pool = result_pool;
SVN_ERR(svn_wc__db_wcroot_parse_local_abspath(&wcroot, &local_relpath,
db, local_abspath, scratch_pool, scratch_pool));
@@ -5588,7 +5596,9 @@ svn_wc__db_revert_list_read_copied_child
{
svn_wc__db_wcroot_t *wcroot;
const char *local_relpath;
- struct revert_list_read_copied_children_baton b = {children, result_pool};
+ struct revert_list_read_copied_children_baton b;
+ b.children = children;
+ b.result_pool = result_pool;
SVN_ERR(svn_wc__db_wcroot_parse_local_abspath(&wcroot, &local_relpath,
db, local_abspath, scratch_pool, scratch_pool));
@@ -7473,7 +7483,9 @@ read_url(const char **url,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
- struct read_url_baton_t rub = { url, result_pool };
+ struct read_url_baton_t rub;
+ rub.url = url;
+ rub.result_pool = result_pool;
SVN_ERR(svn_wc__db_with_txn(wcroot, local_relpath, read_url_txn, &rub,
scratch_pool));
@@ -12187,9 +12199,17 @@ svn_wc__db_revision_status(svn_revnum_t
{
svn_wc__db_wcroot_t *wcroot;
const char *local_relpath;
- struct revision_status_baton_t rsb = { min_revision, max_revision,
- is_sparse_checkout, is_modified, is_switched, trail_url, committed,
- cancel_func, cancel_baton, db };
+ struct revision_status_baton_t rsb;
+ rsb.min_revision = min_revision;
+ rsb.max_revision = max_revision;
+ rsb.is_sparse_checkout = is_sparse_checkout;
+ rsb.is_modified = is_modified;
+ rsb.is_switched = is_switched;
+ rsb.trail_url = trail_url;
+ rsb.committed = committed;
+ rsb.cancel_func = cancel_func;
+ rsb.cancel_baton = cancel_baton;
+ rsb.db = db;
SVN_ERR_ASSERT(svn_dirent_is_absolute(local_abspath));
Modified: subversion/branches/1.7.x-r1352068/subversion/libsvn_wc/wc_db_util.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1352068/subversion/libsvn_wc/wc_db_util.c?rev=1352093&r1=1352092&r2=1352093&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1352068/subversion/libsvn_wc/wc_db_util.c (original)
+++ subversion/branches/1.7.x-r1352068/subversion/libsvn_wc/wc_db_util.c Wed Jun 20 13:28:29 2012
@@ -196,7 +196,11 @@ svn_wc__db_with_txn(svn_wc__db_wcroot_t
void *cb_baton,
apr_pool_t *scratch_pool)
{
- struct txn_baton_t tb = { wcroot, local_relpath, cb_func, cb_baton };
+ struct txn_baton_t tb;
+ tb.wcroot = wcroot;
+ tb.local_relpath = local_relpath;
+ tb.cb_func = cb_func;
+ tb.cb_baton = cb_baton;
return svn_error_trace(
svn_sqlite__with_lock(wcroot->sdb, run_txn, &tb, scratch_pool));
Modified: subversion/branches/1.7.x-r1352068/subversion/tests/libsvn_wc/op-depth-test.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.7.x-r1352068/subversion/tests/libsvn_wc/op-depth-test.c?rev=1352093&r1=1352092&r2=1352093&view=diff
==============================================================================
--- subversion/branches/1.7.x-r1352068/subversion/tests/libsvn_wc/op-depth-test.c (original)
+++ subversion/branches/1.7.x-r1352068/subversion/tests/libsvn_wc/op-depth-test.c Wed Jun 20 13:28:29 2012
@@ -233,7 +233,9 @@ wc_update(svn_test__sandbox_t *b, const
apr_array_header_t *result_revs;
apr_array_header_t *paths = apr_array_make(b->pool, 1,
sizeof(const char *));
- svn_opt_revision_t revision = { svn_opt_revision_number, { revnum } };
+ svn_opt_revision_t revision;
+ revision.kind = svn_opt_revision_number;
+ revision.value.number = revnum;
APR_ARRAY_PUSH(paths, const char *) = wc_path(b, path);
SVN_ERR(svn_client_create_context(&ctx, b->pool));
@@ -449,8 +451,12 @@ check_db_rows(svn_test__sandbox_t *b,
svn_boolean_t have_row;
apr_hash_t *found_hash = apr_hash_make(b->pool);
apr_hash_t *expected_hash = apr_hash_make(b->pool);
- comparison_baton_t comparison_baton
- = { expected_hash, found_hash, b->pool, NULL };
+ comparison_baton_t comparison_baton;
+
+ comparison_baton.expected_hash = expected_hash;
+ comparison_baton.found_hash = found_hash;
+ comparison_baton.scratch_pool = b->pool;
+ comparison_baton.errors = NULL;
/* Fill ACTUAL_HASH with data from the WC DB. */
SVN_ERR(open_wc_db(&sdb, b->wc_abspath, statements, b->pool, b->pool));
@@ -511,23 +517,23 @@ struct copy_subtest_t
nodes_row_t expected[20];
};
+#define source_everything "A/B"
+
+#define source_base_file "A/B/lambda"
+#define source_base_dir "A/B/E"
+
+#define source_added_file "A/B/file-added"
+#define source_added_dir "A/B/D-added"
+#define source_added_dir2 "A/B/D-added/D2"
+
+#define source_copied_file "A/B/lambda-copied"
+#define source_copied_dir "A/B/E-copied"
+
/* Check that all kinds of WC-to-WC copies give correct op_depth results:
* create a Greek tree, make copies in it, and check the resulting DB rows. */
static svn_error_t *
wc_wc_copies(svn_test__sandbox_t *b)
{
- const char source_everything[] = "A/B";
-
- const char source_base_file[] = "A/B/lambda";
- const char source_base_dir[] = "A/B/E";
-
- const char source_added_file[] = "A/B/file-added";
- const char source_added_dir[] = "A/B/D-added";
- const char source_added_dir2[] = "A/B/D-added/D2";
-
- const char source_copied_file[] = "A/B/lambda-copied";
- const char source_copied_dir[] = "A/B/E-copied";
-
SVN_ERR(add_and_commit_greek_tree(b));
/* Create the various kinds of source node which will be copied */
@@ -744,13 +750,15 @@ repo_wc_copies(svn_test__sandbox_t *b)
for (subtest = subtests; subtest->from_path; subtest++)
{
svn_opt_revision_t rev = { svn_opt_revision_number, { 1 } };
- svn_client_copy_source_t source = { NULL, &rev, &rev };
+ svn_client_copy_source_t source;
apr_array_header_t *sources
= apr_array_make(b->pool, 0, sizeof(svn_client_copy_source_t *));
source.path = svn_path_url_add_component2(b->repos_url,
subtest->from_path,
b->pool);
+ source.revision = &rev;
+ source.peg_revision = &rev;
APR_ARRAY_PUSH(sources, svn_client_copy_source_t *) = &source;
SVN_ERR(svn_client_copy6(sources,
wc_path(b, subtest->to_path),