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;
}
static gpointer copy_thread (gpointer user_data)
{
struct thread_args *args = user_data;
svn_error_t *err;
svn_opt_revision_t revision;
apr_array_header_t *paths;
svn_client_copy_source_t copy_source;
svn_client_ctx_t *ctx = args->ctx;
apr_pool_t *subpool, *pool = args->pool;
TshNotifyDialog *dialog = args->dialog;
gchar *from = args->from;
gchar *to = args->to;
gchar *error_str;
#if CHECK_SVN_VERSION_S(1,6)
svn_commit_info_t *commit_info;
gchar *message;
gchar buffer[256];
#endif
g_free (args);
subpool = svn_pool_create (pool);
paths = apr_array_make (subpool, 1, sizeof (svn_client_copy_source_t *));
revision.kind = svn_opt_revision_unspecified;
copy_source.path = from;
copy_source.revision = &revision;
copy_source.peg_revision = &revision;
APR_ARRAY_PUSH (paths, svn_client_copy_source_t *) = ©_source;
#if CHECK_SVN_VERSION_G(1,9)
if ((err = svn_client_copy7(paths, to, FALSE, FALSE, FALSE, FALSE, FALSE,
NULL, NULL, tsh_commit_func2, dialog, ctx,
subpool)))
#elif CHECK_SVN_VERSION_G(1,7)
if ((err = svn_client_copy6(paths, to, FALSE, FALSE, FALSE, NULL,
tsh_commit_func2, dialog, ctx, subpool)))
#elif CHECK_SVN_VERSION_G(1,6)
if ((err = svn_client_copy5(&commit_info, paths, to, FALSE, FALSE, FALSE,
NULL, ctx, subpool)))
#else
if ((err = svn_client_copy4(&commit_info, paths, to, FALSE, FALSE, NULL,
ctx, subpool)))
#endif
{
svn_pool_destroy (subpool);
error_str = tsh_strerror(err);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
tsh_notify_dialog_add(dialog, _("Failed"), error_str, NULL);
tsh_notify_dialog_done (dialog);
gdk_threads_leave();
G_GNUC_END_IGNORE_DEPRECATIONS
g_free(error_str);
svn_error_clear(err);
tsh_reset_cancel();
return GINT_TO_POINTER (FALSE);
}
#if CHECK_SVN_VERSION_S(1,6)
if(SVN_IS_VALID_REVNUM(commit_info->revision))
{
g_snprintf(buffer, 256, _("At revision: %ld"), commit_info->revision);
message = buffer;
}
else
{
message = _("Local copy");
}
#endif
svn_pool_destroy (subpool);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gdk_threads_enter();
#if CHECK_SVN_VERSION_S(1,6)
tsh_notify_dialog_add(dialog, _("Completed"), message, NULL);
#endif
tsh_notify_dialog_done (dialog);
gdk_threads_leave();
G_GNUC_END_IGNORE_DEPRECATIONS
tsh_reset_cancel();
return GINT_TO_POINTER (TRUE);
}
/* This implements the `svn_opt_subcommand_t' interface. */
svn_error_t *
svn_cl__copy(apr_getopt_t *os,
void *baton,
apr_pool_t *pool)
{
svn_cl__opt_state_t *opt_state = ((svn_cl__cmd_baton_t *) baton)->opt_state;
svn_client_ctx_t *ctx = ((svn_cl__cmd_baton_t *) baton)->ctx;
apr_array_header_t *targets, *sources;
const char *src_path, *dst_path;
svn_boolean_t srcs_are_urls, dst_is_url;
svn_error_t *err;
int i;
SVN_ERR(svn_cl__args_to_target_array_print_reserved(&targets, os,
opt_state->targets,
ctx, FALSE, pool));
if (targets->nelts < 2)
return svn_error_create(SVN_ERR_CL_INSUFFICIENT_ARGS, 0, NULL);
/* Get the src list and associated peg revs */
sources = apr_array_make(pool, targets->nelts - 1,
sizeof(svn_client_copy_source_t *));
for (i = 0; i < (targets->nelts - 1); i++)
{
const char *target = APR_ARRAY_IDX(targets, i, const char *);
svn_client_copy_source_t *source = apr_palloc(pool, sizeof(*source));
const char *src;
svn_opt_revision_t *peg_revision = apr_palloc(pool,
sizeof(*peg_revision));
SVN_ERR(svn_opt_parse_path(peg_revision, &src, target, pool));
source->path = src;
source->revision = &(opt_state->start_revision);
source->peg_revision = peg_revision;
APR_ARRAY_PUSH(sources, svn_client_copy_source_t *) = source;
}
SVN_ERR(svn_cl__eat_peg_revisions(&targets, targets, pool));
/* Figure out which type of notification to use.
(There is no need to check that the src paths are homogeneous;
svn_client_copy6() through its subroutine try_copy() will return an
error if they are not.) */
src_path = APR_ARRAY_IDX(targets, 0, const char *);
srcs_are_urls = svn_path_is_url(src_path);
dst_path = APR_ARRAY_IDX(targets, targets->nelts - 1, const char *);
apr_array_pop(targets);
dst_is_url = svn_path_is_url(dst_path);
if ((! srcs_are_urls) && (! dst_is_url))
{
/* WC->WC */
}
else if ((! srcs_are_urls) && (dst_is_url))
{
/* WC->URL : Use notification. */
if (! opt_state->quiet)
SVN_ERR(svn_cl__notifier_mark_wc_to_repos_copy(ctx->notify_baton2));
}
else if ((srcs_are_urls) && (! dst_is_url))
{
/* URL->WC : Use checkout-style notification. */
if (! opt_state->quiet)
SVN_ERR(svn_cl__notifier_mark_checkout(ctx->notify_baton2));
}
else
{
/* URL -> URL, meaning that no notification is needed. */
ctx->notify_func2 = NULL;
}
if (! dst_is_url)
{
ctx->log_msg_func3 = NULL;
if (opt_state->message || opt_state->filedata || opt_state->revprop_table)
return svn_error_create
(SVN_ERR_CL_UNNECESSARY_LOG_MESSAGE, NULL,
_("Local, non-commit operations do not take a log message "
"or revision properties"));
}
if (ctx->log_msg_func3)
SVN_ERR(svn_cl__make_log_msg_baton(&(ctx->log_msg_baton3), opt_state,
NULL, ctx->config, pool));
err = svn_client_copy6(sources, dst_path, TRUE,
opt_state->parents, opt_state->ignore_externals,
opt_state->revprop_table,
svn_cl__print_commit_info, NULL,
ctx, pool);
if (ctx->log_msg_func3)
SVN_ERR(svn_cl__cleanup_log_msg(ctx->log_msg_baton3, err, pool));
else if (err)
return svn_error_trace(err);
return SVN_NO_ERROR;
}
/* This implements the `svn_opt_subcommand_t' interface. */
svn_error_t *
svn_cl__copy(apr_getopt_t *os,
void *baton,
apr_pool_t *pool)
{
svn_cl__opt_state_t *opt_state = ((svn_cl__cmd_baton_t *) baton)->opt_state;
svn_client_ctx_t *ctx = ((svn_cl__cmd_baton_t *) baton)->ctx;
apr_array_header_t *targets, *sources;
const char *src_path, *dst_path;
svn_boolean_t srcs_are_urls, dst_is_url;
svn_error_t *err;
int i;
SVN_ERR(svn_cl__args_to_target_array_print_reserved(&targets, os,
opt_state->targets,
ctx, FALSE, pool));
if (targets->nelts < 2)
return svn_error_create(SVN_ERR_CL_INSUFFICIENT_ARGS, 0, NULL);
/* Get the src list and associated peg revs */
sources = apr_array_make(pool, targets->nelts - 1,
sizeof(svn_client_copy_source_t *));
for (i = 0; i < (targets->nelts - 1); i++)
{
const char *target = APR_ARRAY_IDX(targets, i, const char *);
svn_client_copy_source_t *source = apr_palloc(pool, sizeof(*source));
const char *src;
svn_opt_revision_t *peg_revision = apr_palloc(pool,
sizeof(*peg_revision));
err = svn_opt_parse_path(peg_revision, &src, target, pool);
if (err)
{
/* Issue #3606: 'svn cp .@HEAD target' gives
svn: '@HEAD' is just a peg revision. Maybe try '@HEAD@' instead?
This is caused by a first round of canonicalization in
svn_cl__args_to_target_array_print_reserved(). Undo that in an
attempt to fix this issue without revving many apis.
*/
if (*target == '@' && err->apr_err == SVN_ERR_BAD_FILENAME)
{
svn_error_t *err2;
err2 = svn_opt_parse_path(peg_revision, &src,
apr_pstrcat(pool, ".", target,
(const char *)NULL), pool);
if (err2)
{
/* Fix attempt failed; return original error */
svn_error_clear(err2);
}
else
{
/* Error resolved. Use path */
svn_error_clear(err);
err = NULL;
}
}
if (err)
return svn_error_trace(err);
}
source->path = src;
source->revision = &(opt_state->start_revision);
source->peg_revision = peg_revision;
APR_ARRAY_PUSH(sources, svn_client_copy_source_t *) = source;
}
/* Get DST_PATH (the target path or URL) and check that no peg revision is
* specified for it. */
{
const char *tgt = APR_ARRAY_IDX(targets, targets->nelts - 1, const char *);
svn_opt_revision_t peg;
SVN_ERR(svn_opt_parse_path(&peg, &dst_path, tgt, pool));
if (peg.kind != svn_opt_revision_unspecified)
return svn_error_createf(SVN_ERR_ILLEGAL_TARGET, NULL,
_("'%s': a peg revision is not allowed here"),
tgt);
}
/* Figure out which type of notification to use.
(There is no need to check that the src paths are homogeneous;
svn_client_copy6() through its subroutine try_copy() will return an
error if they are not.) */
src_path = APR_ARRAY_IDX(targets, 0, const char *);
srcs_are_urls = svn_path_is_url(src_path);
dst_is_url = svn_path_is_url(dst_path);
if ((! srcs_are_urls) && (! dst_is_url))
{
/* WC->WC */
}
else if ((! srcs_are_urls) && (dst_is_url))
{
/* WC->URL : Use notification. */
if (! opt_state->quiet)
SVN_ERR(svn_cl__notifier_mark_wc_to_repos_copy(ctx->notify_baton2));
}
else if ((srcs_are_urls) && (! dst_is_url))
{
/* URL->WC : Use checkout-style notification. */
if (! opt_state->quiet)
SVN_ERR(svn_cl__notifier_mark_checkout(ctx->notify_baton2));
}
else
{
/* URL -> URL, meaning that no notification is needed. */
ctx->notify_func2 = NULL;
}
if (! dst_is_url)
{
ctx->log_msg_func3 = NULL;
if (opt_state->message || opt_state->filedata || opt_state->revprop_table)
return svn_error_create
(SVN_ERR_CL_UNNECESSARY_LOG_MESSAGE, NULL,
_("Local, non-commit operations do not take a log message "
"or revision properties"));
}
if (ctx->log_msg_func3)
SVN_ERR(svn_cl__make_log_msg_baton(&(ctx->log_msg_baton3), opt_state,
NULL, ctx->config, pool));
err = svn_client_copy6(sources, dst_path, TRUE,
opt_state->parents, opt_state->ignore_externals,
opt_state->revprop_table,
(opt_state->quiet ? NULL : svn_cl__print_commit_info),
NULL,
ctx, pool);
if (ctx->log_msg_func3)
SVN_ERR(svn_cl__cleanup_log_msg(ctx->log_msg_baton3, err, pool));
else if (err)
return svn_error_trace(err);
return SVN_NO_ERROR;
}
