static gpointer switch_thread (gpointer user_data) { struct thread_args *args = user_data; svn_opt_revision_t revision; svn_error_t *err; svn_client_ctx_t *ctx = args->ctx; apr_pool_t *subpool, *pool = args->pool; TshNotifyDialog *dialog = args->dialog; gchar *path = args->path; gchar *url = args->url; gchar *error_str; g_free (args); subpool = svn_pool_create (pool); revision.kind = svn_opt_revision_head; #if CHECK_SVN_VERSION_S(1,6) if ((err = svn_client_switch2(NULL, path, url, &revision, &revision, svn_depth_infinity, FALSE, FALSE, FALSE, ctx, subpool))) #else /* CHECK_SVN_VERSION(1,7) */ if ((err = svn_client_switch3(NULL, path, url, &revision, &revision, svn_depth_infinity, TRUE, FALSE, FALSE, FALSE, 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); } svn_pool_destroy (subpool); G_GNUC_BEGIN_IGNORE_DEPRECATIONS gdk_threads_enter(); tsh_notify_dialog_done (dialog); gdk_threads_leave(); G_GNUC_END_IGNORE_DEPRECATIONS tsh_reset_cancel(); return GINT_TO_POINTER (TRUE); }
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); }
/* This implements the `svn_opt_subcommand_t' interface. */ svn_error_t * svn_cl__switch(apr_getopt_t *os, void *baton, apr_pool_t *scratch_pool) { svn_error_t *err = SVN_NO_ERROR; svn_error_t *externals_err = SVN_NO_ERROR; 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; const char *target, *switch_url; svn_opt_revision_t peg_revision; svn_depth_t depth; svn_boolean_t depth_is_sticky; struct svn_cl__check_externals_failed_notify_baton nwb; /* This command should discover (or derive) exactly two cmdline arguments: a local path to update ("target"), and a new url to switch to ("switch_url"). */ SVN_ERR(svn_cl__args_to_target_array_print_reserved(&targets, os, opt_state->targets, ctx, FALSE, scratch_pool)); /* handle only-rewrite case specially */ if (opt_state->relocate) return rewrite_urls(targets, opt_state->ignore_externals, ctx, scratch_pool); if (targets->nelts < 1) return svn_error_create(SVN_ERR_CL_INSUFFICIENT_ARGS, 0, NULL); if (targets->nelts > 2) return svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, 0, NULL); /* Get the required SWITCH_URL and its optional PEG_REVISION, and the * optional TARGET argument. */ SVN_ERR(svn_opt_parse_path(&peg_revision, &switch_url, APR_ARRAY_IDX(targets, 0, const char *), scratch_pool)); if (targets->nelts == 1) target = ""; else target = APR_ARRAY_IDX(targets, 1, const char *); /* Validate the switch_url */ if (! svn_path_is_url(switch_url)) return svn_error_createf(SVN_ERR_BAD_URL, NULL, _("'%s' does not appear to be a URL"), switch_url); SVN_ERR(svn_cl__check_target_is_local_path(target)); /* Deal with depthstuffs. */ if (opt_state->set_depth != svn_depth_unknown) { depth = opt_state->set_depth; depth_is_sticky = TRUE; } else { depth = opt_state->depth; depth_is_sticky = FALSE; } nwb.wrapped_func = ctx->notify_func2; nwb.wrapped_baton = ctx->notify_baton2; nwb.had_externals_error = FALSE; ctx->notify_func2 = svn_cl__check_externals_failed_notify_wrapper; ctx->notify_baton2 = &nwb; /* Postpone conflict resolution during the switch operation. * If any conflicts occur we'll run the conflict resolver later. */ /* Do the 'switch' update. */ err = svn_client_switch3(NULL, target, switch_url, &peg_revision, &(opt_state->start_revision), depth, depth_is_sticky, opt_state->ignore_externals, opt_state->force, opt_state->ignore_ancestry, ctx, scratch_pool); if (err) { if (err->apr_err == SVN_ERR_CLIENT_UNRELATED_RESOURCES) return svn_error_createf(SVN_ERR_CLIENT_UNRELATED_RESOURCES, err, _("Path '%s' does not share common version " "control ancestry with the requested switch " "location. Use --ignore-ancestry to " "disable this check."), svn_dirent_local_style(target, scratch_pool)); return err; } if (nwb.had_externals_error) externals_err = svn_error_create(SVN_ERR_CL_ERROR_PROCESSING_EXTERNALS, NULL, _("Failure occurred processing one or " "more externals definitions")); if (! opt_state->quiet) { err = svn_cl__print_conflict_stats(nwb.wrapped_baton, scratch_pool); if (err) return svn_error_compose_create(externals_err, err); } if (opt_state->conflict_func && svn_cl__notifier_check_conflicts(nwb.wrapped_baton)) { err = svn_cl__resolve_conflicts( svn_cl__notifier_get_conflicted_paths(nwb.wrapped_baton, scratch_pool), depth, opt_state, ctx, scratch_pool); if (err) return svn_error_compose_create(externals_err, err); } return svn_error_compose_create(externals_err, err); }