/* This implements the `svn_opt_subcommand_t' interface. */
svn_error_t *
svn_cl__move(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;
const char *dst_path;
svn_commit_info_t *commit_info = NULL;
svn_error_t *err;
SVN_ERR(svn_cl__args_to_target_array_print_reserved(&targets, os,
opt_state->targets,
ctx, pool));
if (targets->nelts < 2)
return svn_error_create(SVN_ERR_CL_INSUFFICIENT_ARGS, 0, NULL);
if (opt_state->start_revision.kind != svn_opt_revision_unspecified
&& opt_state->start_revision.kind != svn_opt_revision_head)
{
return svn_error_create
(SVN_ERR_UNSUPPORTED_FEATURE, NULL,
_("Cannot specify revisions (except HEAD) with move operations"));
}
if (! opt_state->quiet)
svn_cl__get_notifier(&ctx->notify_func2, &ctx->notify_baton2, FALSE,
FALSE, FALSE, pool);
dst_path = APR_ARRAY_IDX(targets, targets->nelts - 1, const char *);
apr_array_pop(targets);
if (! svn_path_is_url(dst_path))
{
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));
SVN_ERR(svn_opt__eat_peg_revisions(&targets, targets, pool));
err = svn_client_move5(&commit_info, targets, dst_path, opt_state->force,
TRUE, opt_state->parents, opt_state->revprop_table,
ctx, pool);
if (err)
err = svn_cl__may_need_force(err);
if (ctx->log_msg_func3)
SVN_ERR(svn_cl__cleanup_log_msg(ctx->log_msg_baton3, err, pool));
else if (err)
return err;
if (commit_info && ! opt_state->quiet)
SVN_ERR(svn_cl__print_commit_info(commit_info, pool));
return SVN_NO_ERROR;
}
static gpointer move_thread (gpointer user_data)
{
struct thread_args *args = user_data;
svn_error_t *err;
apr_array_header_t *paths;
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 (const char *));
APR_ARRAY_PUSH (paths, const char *) = from;
#if CHECK_SVN_VERSION_G(1,8)
if ((err = svn_client_move7(paths, to, FALSE, FALSE, TRUE, FALSE, NULL,
tsh_commit_func2, dialog, ctx, subpool)))
#elif CHECK_SVN_VERSION_G(1,7)
if ((err = svn_client_move6(paths, to, FALSE, FALSE, NULL, tsh_commit_func2,
dialog, ctx, subpool)))
#else
if ((err = svn_client_move5(&commit_info, paths, to, FALSE, 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 move");
}
#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);
}
Py::Object pysvn_client::cmd_move2( const Py::Tuple &a_args, const Py::Dict &a_kws )
{
static argument_description args_desc[] =
{
{ true, name_sources },
{ true, name_dest_url_or_path },
{ false, name_force },
{ false, name_move_as_child },
{ false, name_make_parents },
{ false, name_revprops },
{ false, NULL }
};
FunctionArguments args( "move2", args_desc, a_args, a_kws );
args.check();
SvnPool pool( m_context );
pysvn_commit_info_t *commit_info = NULL;
std::string type_error_message;
try
{
type_error_message = "expecting list for sources (arg 1)";
Py::List list_all_sources = args.getArg( name_sources );
apr_array_header_t *all_sources =
apr_array_make( pool, list_all_sources.length(), sizeof(const char *) );
for( unsigned int index=0; index<list_all_sources.length(); index++ )
{
type_error_message = "expecting string in sources list";
Py::String py_src_url_or_path( list_all_sources[ index ] );
std::string src_url_or_path;
if( py_src_url_or_path.isUnicode() )
{
Py::String utf8( py_src_url_or_path.encode( name_utf8 ) );
src_url_or_path = py_src_url_or_path.as_std_string();
}
else
{
src_url_or_path = py_src_url_or_path.as_std_string();
}
std::string norm_src_url_or_path( svnNormalisedIfPath( src_url_or_path, pool ) );
const char *src_path_copy = apr_pstrdup( pool, norm_src_url_or_path.c_str() );
APR_ARRAY_PUSH( all_sources, const char *) = src_path_copy;
}
type_error_message = "expecting string for dest_url_or_path";
Py::String dest_path( args.getUtf8String( name_dest_url_or_path ) );
type_error_message = "expecting boolean for keyword force";
bool force = args.getBoolean( name_force, false );
type_error_message = "expecting boolean for keyword move_as_child";
bool move_as_child = args.getBoolean( name_move_as_child, false );
type_error_message = "expecting boolean for keyword make_parents";
bool make_parents = args.getBoolean( name_make_parents, false );
apr_hash_t *revprops = NULL;
if( args.hasArg( name_revprops ) )
{
Py::Object py_revprop = args.getArg( name_revprops );
if( !py_revprop.isNone() )
{
revprops = hashOfStringsFromDistOfStrings( py_revprop, pool );
}
}
try
{
std::string norm_dest_path( svnNormalisedIfPath( dest_path, pool ) );
checkThreadPermission();
PythonAllowThreads permission( m_context );
// behavior changed
svn_error_t *error = svn_client_move5
(
&commit_info,
all_sources,
norm_dest_path.c_str(),
force,
move_as_child,
make_parents,
revprops,
m_context,
pool
);
permission.allowThisThread();
if( error != NULL )
{
throw SvnException( error );
}
}
catch( SvnException &e )
{
// use callback error over ClientException
m_context.checkForError( m_module.client_error );
throw_client_error( e );
}
}
catch( Py::TypeError & )
{
throw Py::TypeError( type_error_message );
}
return toObject( commit_info );
}
