diff options
Diffstat (limited to 'subversion/tests/libsvn_wc/utils.c')
| -rw-r--r-- | subversion/tests/libsvn_wc/utils.c | 385 |
1 files changed, 381 insertions, 4 deletions
diff --git a/subversion/tests/libsvn_wc/utils.c b/subversion/tests/libsvn_wc/utils.c index 49d3303..1682b98 100644 --- a/subversion/tests/libsvn_wc/utils.c +++ b/subversion/tests/libsvn_wc/utils.c @@ -23,6 +23,7 @@ #include "svn_error.h" #include "svn_client.h" #include "svn_pools.h" +#include "private/svn_dep_compat.h" #include "utils.h" @@ -81,17 +82,18 @@ create_repos_and_wc(const char **repos_url, /* Create a WC. Set *WC_ABSPATH to its path. */ { + apr_pool_t *subpool = svn_pool_create(pool); /* To cleanup CTX */ svn_client_ctx_t *ctx; svn_opt_revision_t head_rev = { svn_opt_revision_head, {0} }; - SVN_ERR(svn_client_create_context(&ctx, pool)); - /* SVN_ERR(svn_config_get_config(&ctx->config, config_dir, pool)); */ + SVN_ERR(svn_client_create_context2(&ctx, NULL, subpool)); SVN_ERR(svn_dirent_get_absolute(wc_abspath, wc_path, pool)); SVN_ERR(svn_client_checkout3(NULL, *repos_url, *wc_abspath, &head_rev, &head_rev, svn_depth_infinity, FALSE /* ignore_externals */, FALSE /* allow_unver_obstructions */, - ctx, pool)); + ctx, subpool)); + svn_pool_destroy(subpool); } /* Register this WC for cleanup. */ @@ -132,7 +134,8 @@ svn_test__create_fake_wc(const char *wc_abspath, svn_error_clear(svn_io_remove_file2(db_abspath, FALSE, scratch_pool)); SVN_ERR(svn_wc__db_util_open_db(&sdb, wc_abspath, "wc.db", - svn_sqlite__mode_rwcreate, my_statements, + svn_sqlite__mode_rwcreate, + FALSE /* exclusive */, my_statements, result_pool, scratch_pool)); for (i = 0; my_statements[i] != NULL; i++) SVN_ERR(svn_sqlite__exec_statements(sdb, /* my_statements[] */ i)); @@ -153,3 +156,377 @@ svn_test__sandbox_create(svn_test__sandbox_t *sandbox, SVN_ERR(svn_wc_context_create(&sandbox->wc_ctx, NULL, pool, pool)); return SVN_NO_ERROR; } + +void +sbox_file_write(svn_test__sandbox_t *b, const char *path, const char *text) +{ + FILE *f = fopen(sbox_wc_path(b, path), "w"); + + fputs(text, f); + fclose(f); +} + +svn_error_t * +sbox_wc_add(svn_test__sandbox_t *b, const char *path) +{ + const char *parent_abspath; + + path = sbox_wc_path(b, path); + parent_abspath = svn_dirent_dirname(path, b->pool); + SVN_ERR(svn_wc__acquire_write_lock(NULL, b->wc_ctx, parent_abspath, FALSE, + b->pool, b->pool)); + SVN_ERR(svn_wc_add_from_disk2(b->wc_ctx, path, NULL /*props*/, + NULL, NULL, b->pool)); + SVN_ERR(svn_wc__release_write_lock(b->wc_ctx, parent_abspath, b->pool)); + return SVN_NO_ERROR; +} + +svn_error_t * +sbox_disk_mkdir(svn_test__sandbox_t *b, const char *path) +{ + path = sbox_wc_path(b, path); + SVN_ERR(svn_io_dir_make(path, APR_FPROT_OS_DEFAULT, b->pool)); + return SVN_NO_ERROR; +} + +svn_error_t * +sbox_wc_mkdir(svn_test__sandbox_t *b, const char *path) +{ + SVN_ERR(sbox_disk_mkdir(b, path)); + SVN_ERR(sbox_wc_add(b, path)); + return SVN_NO_ERROR; +} + +#if 0 /* not used */ +/* Copy the file or directory tree FROM_PATH to TO_PATH which must not exist + * beforehand. */ +svn_error_t * +sbox_disk_copy(svn_test__sandbox_t *b, const char *from_path, const char *to_path) +{ + const char *to_dir, *to_name; + + from_path = sbox_wc_path(b, from_path); + to_path = sbox_wc_path(b, to_path); + svn_dirent_split(&to_dir, &to_name, to_path, b->pool); + return svn_io_copy_dir_recursively(from_path, to_dir, to_name, + FALSE, NULL, NULL, b->pool); +} +#endif + +svn_error_t * +sbox_wc_copy(svn_test__sandbox_t *b, const char *from_path, const char *to_path) +{ + const char *parent_abspath; + + from_path = sbox_wc_path(b, from_path); + to_path = sbox_wc_path(b, to_path); + parent_abspath = svn_dirent_dirname(to_path, b->pool); + SVN_ERR(svn_wc__acquire_write_lock(NULL, b->wc_ctx, parent_abspath, FALSE, + b->pool, b->pool)); + SVN_ERR(svn_wc_copy3(b->wc_ctx, from_path, to_path, FALSE, + NULL, NULL, NULL, NULL, b->pool)); + SVN_ERR(svn_wc__release_write_lock(b->wc_ctx, parent_abspath, b->pool)); + return SVN_NO_ERROR; +} + +svn_error_t * +sbox_wc_copy_url(svn_test__sandbox_t *b, const char *from_url, + svn_revnum_t revision, const char *to_path) +{ + apr_pool_t *scratch_pool = b->pool; + svn_client_ctx_t *ctx; + svn_opt_revision_t rev = { svn_opt_revision_unspecified, {0} }; + svn_client_copy_source_t* src; + apr_array_header_t *sources = apr_array_make( + scratch_pool, 1, + sizeof(svn_client_copy_source_t *)); + + SVN_ERR(svn_client_create_context2(&ctx, NULL, scratch_pool)); + ctx->wc_ctx = b->wc_ctx; + + if (SVN_IS_VALID_REVNUM(revision)) + { + rev.kind = svn_opt_revision_number; + rev.value.number = revision; + } + + src = apr_pcalloc(scratch_pool, sizeof(*src)); + + src->path = from_url; + src->revision = &rev; + src->peg_revision = &rev; + + APR_ARRAY_PUSH(sources, svn_client_copy_source_t *) = src; + + SVN_ERR(svn_client_copy6(sources, sbox_wc_path(b, to_path), + FALSE, FALSE, FALSE, NULL, NULL, NULL, + ctx, scratch_pool)); + + ctx->wc_ctx = NULL; + + return SVN_NO_ERROR; +} + + +svn_error_t * +sbox_wc_revert(svn_test__sandbox_t *b, const char *path, svn_depth_t depth) +{ + const char *abspath = sbox_wc_path(b, path); + const char *dir_abspath; + const char *lock_root_abspath; + + if (strcmp(abspath, b->wc_abspath)) + dir_abspath = svn_dirent_dirname(abspath, b->pool); + else + dir_abspath = abspath; + + SVN_ERR(svn_wc__acquire_write_lock(&lock_root_abspath, b->wc_ctx, + dir_abspath, FALSE /* lock_anchor */, + b->pool, b->pool)); + SVN_ERR(svn_wc_revert4(b->wc_ctx, abspath, depth, FALSE, NULL, + NULL, NULL, /* cancel baton + func */ + NULL, NULL, /* notify baton + func */ + b->pool)); + SVN_ERR(svn_wc__release_write_lock(b->wc_ctx, lock_root_abspath, b->pool)); + return SVN_NO_ERROR; +} + +svn_error_t * +sbox_wc_delete(svn_test__sandbox_t *b, const char *path) +{ + const char *abspath = sbox_wc_path(b, path); + const char *dir_abspath = svn_dirent_dirname(abspath, b->pool); + const char *lock_root_abspath; + + SVN_ERR(svn_wc__acquire_write_lock(&lock_root_abspath, b->wc_ctx, + dir_abspath, FALSE, + b->pool, b->pool)); + SVN_ERR(svn_wc_delete4(b->wc_ctx, abspath, FALSE, TRUE, + NULL, NULL, /* cancel baton + func */ + NULL, NULL, /* notify baton + func */ + b->pool)); + SVN_ERR(svn_wc__release_write_lock(b->wc_ctx, lock_root_abspath, b->pool)); + return SVN_NO_ERROR; +} + +svn_error_t * +sbox_wc_exclude(svn_test__sandbox_t *b, const char *path) +{ + const char *abspath = sbox_wc_path(b, path); + const char *lock_root_abspath; + + SVN_ERR(svn_wc__acquire_write_lock(&lock_root_abspath, b->wc_ctx, + abspath, TRUE, + b->pool, b->pool)); + SVN_ERR(svn_wc_exclude(b->wc_ctx, abspath, + NULL, NULL, /* cancel baton + func */ + NULL, NULL, /* notify baton + func */ + b->pool)); + SVN_ERR(svn_wc__release_write_lock(b->wc_ctx, lock_root_abspath, b->pool)); + return SVN_NO_ERROR; +} + +svn_error_t * +sbox_wc_commit_ex(svn_test__sandbox_t *b, + apr_array_header_t *targets, + svn_depth_t depth) +{ + svn_client_ctx_t *ctx; + apr_pool_t *scratch_pool = svn_pool_create(b->pool); + svn_error_t *err; + + SVN_ERR(svn_client_create_context2(&ctx, NULL, scratch_pool)); + ctx->wc_ctx = b->wc_ctx; + + /* A successfull commit doesn't close the ra session, but leaves that + to the caller. This leaves the BDB handle open, which might cause + problems in further test code. (op_depth_tests.c's repo_wc_copy) */ + err = svn_client_commit6(targets, depth, + FALSE /* keep_locks */, + FALSE /* keep_changelist */, + TRUE /* commit_as_operations */, + TRUE /* include_file_externals */, + FALSE /* include_dir_externals */, + NULL, NULL, NULL, NULL, ctx, scratch_pool); + + svn_pool_destroy(scratch_pool); + + return svn_error_trace(err); +} + +svn_error_t * +sbox_wc_commit(svn_test__sandbox_t *b, const char *path) +{ + apr_array_header_t *targets = apr_array_make(b->pool, 1, + sizeof(const char *)); + + APR_ARRAY_PUSH(targets, const char *) = sbox_wc_path(b, path); + return sbox_wc_commit_ex(b, targets, svn_depth_infinity); +} + +svn_error_t * +sbox_wc_update_depth(svn_test__sandbox_t *b, + const char *path, + svn_revnum_t revnum, + svn_depth_t depth, + svn_boolean_t sticky) +{ + svn_client_ctx_t *ctx; + 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; + + revision.kind = svn_opt_revision_number; + revision.value.number = revnum; + + APR_ARRAY_PUSH(paths, const char *) = sbox_wc_path(b, path); + SVN_ERR(svn_client_create_context2(&ctx, NULL, b->pool)); + ctx->wc_ctx = b->wc_ctx; + return svn_client_update4(&result_revs, paths, &revision, depth, + sticky, FALSE, FALSE, FALSE, FALSE, + ctx, b->pool); +} + +svn_error_t * +sbox_wc_update(svn_test__sandbox_t *b, const char *path, svn_revnum_t revnum) +{ + SVN_ERR(sbox_wc_update_depth(b, path, revnum, svn_depth_unknown, FALSE)); + return SVN_NO_ERROR; +} + +svn_error_t * +sbox_wc_switch(svn_test__sandbox_t *b, + const char *path, + const char *url, + svn_depth_t depth) +{ + svn_client_ctx_t *ctx; + svn_revnum_t result_rev; + svn_opt_revision_t head_rev = { svn_opt_revision_head, {0} }; + + url = apr_pstrcat(b->pool, b->repos_url, url, (char*)NULL); + SVN_ERR(svn_client_create_context2(&ctx, NULL, b->pool)); + ctx->wc_ctx = b->wc_ctx; + return svn_client_switch3(&result_rev, sbox_wc_path(b, path), url, + &head_rev, &head_rev, depth, + FALSE /* depth_is_sticky */, + TRUE /* ignore_externals */, + FALSE /* allow_unver_obstructions */, + TRUE /* ignore_ancestry */, + ctx, b->pool); +} + +svn_error_t * +sbox_wc_resolved(svn_test__sandbox_t *b, const char *path) +{ + return sbox_wc_resolve(b, path, svn_depth_infinity, + svn_wc_conflict_choose_merged); +} + +svn_error_t * +sbox_wc_resolve(svn_test__sandbox_t *b, const char *path, svn_depth_t depth, + svn_wc_conflict_choice_t conflict_choice) +{ + const char *lock_abspath; + svn_error_t *err; + + SVN_ERR(svn_wc__acquire_write_lock_for_resolve(&lock_abspath, b->wc_ctx, + sbox_wc_path(b, path), + b->pool, b->pool)); + err = svn_wc__resolve_conflicts(b->wc_ctx, sbox_wc_path(b, path), + depth, + TRUE /* resolve_text */, + "" /* resolve_prop (ALL props) */, + TRUE /* resolve_tree */, + conflict_choice, + NULL, NULL, /* conflict func */ + NULL, NULL, /* cancellation */ + NULL, NULL, /* notification */ + b->pool); + + err = svn_error_compose_create(err, svn_wc__release_write_lock(b->wc_ctx, + lock_abspath, + b->pool)); + return err; +} + +svn_error_t * +sbox_wc_move(svn_test__sandbox_t *b, const char *src, const char *dst) +{ + svn_client_ctx_t *ctx; + apr_array_header_t *paths = apr_array_make(b->pool, 1, + sizeof(const char *)); + + SVN_ERR(svn_client_create_context2(&ctx, NULL, b->pool)); + ctx->wc_ctx = b->wc_ctx; + APR_ARRAY_PUSH(paths, const char *) = sbox_wc_path(b, src); + return svn_client_move7(paths, sbox_wc_path(b, dst), + FALSE /* move_as_child */, + FALSE /* make_parents */, + TRUE /* allow_mixed_revisions */, + FALSE /* metadata_only */, + NULL /* revprop_table */, + NULL, NULL, /* commit callback */ + ctx, b->pool); +} + +svn_error_t * +sbox_wc_propset(svn_test__sandbox_t *b, + const char *name, + const char *value, + const char *path) +{ + svn_client_ctx_t *ctx; + apr_array_header_t *paths = apr_array_make(b->pool, 1, + sizeof(const char *)); + svn_string_t *pval = value ? svn_string_create(value, b->pool) : NULL; + + SVN_ERR(svn_client_create_context2(&ctx, NULL, b->pool)); + ctx->wc_ctx = b->wc_ctx; + APR_ARRAY_PUSH(paths, const char *) = sbox_wc_path(b, path); + return svn_client_propset_local(name, pval, paths, svn_depth_empty, + TRUE /* skip_checks */, + NULL, ctx, b->pool); +} + +svn_error_t * +sbox_wc_relocate(svn_test__sandbox_t *b, + const char *new_repos_url) +{ + apr_pool_t *scratch_pool = b->pool; + svn_client_ctx_t *ctx; + + SVN_ERR(svn_client_create_context2(&ctx, NULL, scratch_pool)); + ctx->wc_ctx = b->wc_ctx; + + SVN_ERR(svn_client_relocate2(b->wc_abspath, b->repos_url, + new_repos_url, FALSE, ctx,scratch_pool)); + + b->repos_url = apr_pstrdup(b->pool, new_repos_url); + + return SVN_NO_ERROR; +} + +svn_error_t * +sbox_add_and_commit_greek_tree(svn_test__sandbox_t *b) +{ + const struct svn_test__tree_entry_t *node; + + for (node = svn_test__greek_tree_nodes; node->path; node++) + { + if (node->contents) + { + sbox_file_write(b, node->path, node->contents); + SVN_ERR(sbox_wc_add(b, node->path)); + } + else + { + SVN_ERR(sbox_wc_mkdir(b, node->path)); + } + } + + SVN_ERR(sbox_wc_commit(b, "")); + + return SVN_NO_ERROR; +} |