Google Git
Sign in
apache / subversion / refs/heads/svnsync-folder / . / subversion / libsvn_client / copy.c
blob: 5acf2764dff609b700b1edcb104dd1f22e161793 [file] [log] [blame]
/*
* copy.c: copy/move wrappers around wc 'copy' functionality.
*
* ====================================================================
* Copyright (c) 2000-2007 CollabNet. All rights reserved.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
* are also available at http://subversion.tigris.org/license-1.html.
* If newer versions of this license are posted there, you may use a
* newer version instead, at your option.
*
* This software consists of voluntary contributions made by many
* individuals. For exact contribution history, see the revision
* history and logs, available at http://subversion.tigris.org/.
* ====================================================================
*/
/* ==================================================================== */
/*** Includes. ***/
#include <string.h>
#include <assert.h>
#include "svn_client.h"
#include "svn_error.h"
#include "svn_error_codes.h"
#include "svn_path.h"
#include "svn_opt.h"
#include "svn_time.h"
#include "svn_props.h"
#include "svn_mergeinfo.h"
#include "svn_pools.h"
#include "client.h"
#include "mergeinfo.h"
#include "svn_private_config.h"
#include "private/svn_wc_private.h"
#include "private/svn_mergeinfo_private.h"
/*
* OUR BASIC APPROACH TO COPIES
* ============================
*
* for each source/destination pair
* if (not exist src_path)
* return ERR_BAD_SRC error
*
* if (exist dst_path)
* return ERR_OBSTRUCTION error
* else
* copy src_path into parent_of_dst_path as basename (dst_path)
*
* if (this is a move)
* delete src_path
*/
/*** Code. ***/
/* Obtain the implied mergeinfo and the existing mergeinfo of the
source path, combine them and return the result in
*TARGET_MERGEINFO. ADM_ACCESS may be NULL, if SRC_PATH_OR_URL is an
URL. If NO_REPOS_ACCESS is set, this function is disallowed from
consulting the repository about anything. */
static svn_error_t *
calculate_target_mergeinfo(svn_ra_session_t *ra_session,
apr_hash_t **target_mergeinfo,
svn_wc_adm_access_t *adm_access,
const char *src_path_or_url,
svn_revnum_t src_revnum,
svn_boolean_t no_repos_access,
svn_client_ctx_t *ctx,
apr_pool_t *pool)
{
const svn_wc_entry_t *entry = NULL;
svn_boolean_t locally_added = FALSE;
const char *src_url;
apr_hash_t *src_mergeinfo = NULL;
/* If we have a schedule-add WC path (which was not copied from
elsewhere), it doesn't have any repository mergeinfo, so don't
bother checking. */
if (adm_access)
{
SVN_ERR(svn_wc__entry_versioned(&entry, src_path_or_url, adm_access,
FALSE, pool));
if (entry->schedule == svn_wc_schedule_add && (! entry->copied))
{
locally_added = TRUE;
}
else
{
SVN_ERR(svn_client__entry_location(&src_url, &src_revnum,
src_path_or_url,
svn_opt_revision_working, entry,
pool));
}
}
else
{
src_url = src_path_or_url;
}
if (! locally_added)
{
const char *mergeinfo_path;
if (! no_repos_access)
{
/* Fetch any existing (explicit) mergeinfo. */
SVN_ERR(svn_client__path_relative_to_root(&mergeinfo_path, src_url,
entry ? entry->repos : NULL,
FALSE, ra_session,
adm_access, pool));
SVN_ERR(svn_client__get_repos_mergeinfo(ra_session, &src_mergeinfo,
mergeinfo_path, src_revnum,
svn_mergeinfo_inherited, TRUE,
pool));
}
else
{
svn_boolean_t inherited;
SVN_ERR(svn_client__get_wc_mergeinfo(&src_mergeinfo, &inherited,
FALSE, svn_mergeinfo_inherited,
entry, src_path_or_url, NULL,
NULL, adm_access, ctx, pool));
}
}
*target_mergeinfo = src_mergeinfo;
return SVN_NO_ERROR;
}
/* Extend the mergeinfo for the single WC path TARGET_WCPATH, adding
MERGEINFO to any mergeinfo pre-existing in the WC. */
static svn_error_t *
extend_wc_mergeinfo(const char *target_wcpath, const svn_wc_entry_t *entry,
apr_hash_t *mergeinfo, svn_wc_adm_access_t *adm_access,
svn_client_ctx_t *ctx, apr_pool_t *pool)
{
apr_hash_t *wc_mergeinfo;
/* Get a fresh copy of the pre-existing state of the WC's mergeinfo
updating it. */
SVN_ERR(svn_client__parse_mergeinfo(&wc_mergeinfo, entry, target_wcpath,
FALSE, adm_access, ctx, pool));
/* Combine the provided mergeinfo with any mergeinfo from the WC. */
if (wc_mergeinfo && mergeinfo)
SVN_ERR(svn_mergeinfo_merge(wc_mergeinfo, mergeinfo, pool));
else if (! wc_mergeinfo)
wc_mergeinfo = mergeinfo;
return svn_client__record_wc_mergeinfo(target_wcpath, wc_mergeinfo,
adm_access, pool);
}
/* If WITH_MERGE_HISTORY is TRUE, propagate implied and explicit
mergeinfo for WC-local copy/move operations. Otherwise, either
propagate PAIR->dst's explicit (only) mergeinfo, or set empty
mergeinfo on PAIR->dst. Use POOL for temporary allocations. */
static svn_error_t *
propagate_mergeinfo_within_wc(svn_client__copy_pair_t *pair,
svn_wc_adm_access_t *src_access,
svn_wc_adm_access_t *dst_access,
svn_client_ctx_t *ctx, apr_pool_t *pool)
{
apr_hash_t *mergeinfo;
const svn_wc_entry_t *entry;
SVN_ERR(svn_wc__entry_versioned(&entry, pair->src, src_access, FALSE, pool));
/* Don't attempt to figure out implied mergeinfo for a locally
added/replaced PAIR->src without histroy (if its deleted we
should never even get this far). */
if (entry->schedule == svn_wc_schedule_normal
|| (entry->schedule == svn_wc_schedule_add && entry->copied))
{
svn_ra_session_t *ra_session;
/* Obtain mergeinfo from source. */
SVN_ERR(svn_client__open_ra_session_internal(&ra_session, entry->url,
"", src_access, NULL,
TRUE, TRUE, ctx, pool));
pair->src_revnum = entry->revision;
/* ASSUMPTION: Non-numeric operative and peg revisions --
other than working or unspecified -- won't be encountered
here. For those cases, WC paths will have already been
transformed into repository URLs (as done towards the end
of the setup_copy() routine), and be handled by a
different code path. */
SVN_ERR(calculate_target_mergeinfo(ra_session, &mergeinfo,
src_access, pair->src,
pair->src_revnum, TRUE,
ctx, pool));
/* NULL mergeinfo could be due to there being no mergeinfo. But
it could also be due to us not being able to query the server
about mergeinfo on some parent directory of ours. We need to
turn "no mergeinfo" into "empty mergeinfo", just in case. */
if (! mergeinfo)
mergeinfo = apr_hash_make(pool);
/* Because any local mergeinfo from the copy source will have
already been propagated to the destination, we can avoid
looking at WC-local mergeinfo for the source. */
SVN_ERR(svn_wc__entry_versioned(&entry, pair->dst, dst_access, FALSE,
pool));
return extend_wc_mergeinfo(pair->dst, entry, mergeinfo, dst_access,
ctx, pool);
}
/* If the source had no explicit mergeinfo, set empty explicit
mergeinfo for PAIR->dst, as it almost certainly won't be correct
for that path to inherit the mergeinfo of its parent. */
SVN_ERR(svn_client__parse_mergeinfo(&mergeinfo, entry, pair->src, FALSE,
src_access, ctx, pool));
if (mergeinfo == NULL)
{
mergeinfo = apr_hash_make(pool);
return svn_client__record_wc_mergeinfo(pair->dst, mergeinfo, dst_access,
pool);
}
else
return SVN_NO_ERROR;
}
/* Find the longest common ancestor for all the SRCs and DSTs in COPY_PAIRS.
If SRC_ANCESTOR or DST_ANCESTOR is NULL, nothing will be returned in it.
COMMON_ANCESTOR will be the common ancestor of both the SRC_ANCESTOR and
DST_ANCESTOR, and will only be set if it is not NULL.
*/
static svn_error_t *
get_copy_pair_ancestors(const apr_array_header_t *copy_pairs,
const char **src_ancestor,
const char **dst_ancestor,
const char **common_ancestor,
apr_pool_t *pool)
{
apr_pool_t *subpool = svn_pool_create(pool);
const char *top_dst;
char *top_src;
int i;
top_src = apr_pstrdup(subpool, APR_ARRAY_IDX(copy_pairs, 0,
svn_client__copy_pair_t *)->src);
/* Because all the destinations are in the same directory, we can easily
determine their common ancestor. */
if (copy_pairs->nelts == 1)
top_dst = apr_pstrdup(subpool, APR_ARRAY_IDX(copy_pairs, 0,
svn_client__copy_pair_t *)->dst);
else
top_dst = svn_path_dirname(APR_ARRAY_IDX(copy_pairs, 0,
svn_client__copy_pair_t *)->dst,
subpool);
/* We don't need to clear the subpool here for several reasons:
1) If we do, we can't use it to allocate the initial versions of
top_src and top_dst (above).
2) We don't return any errors in the following loop, so we are guanteed
to destory the subpool at the end of this function.
3) The number of iterations is likely to be few, and the loop will be
through quickly, so memory leakage will not be significant, in time or
space. */
for (i = 1; i < copy_pairs->nelts; i++)
{
const svn_client__copy_pair_t *pair = APR_ARRAY_IDX(copy_pairs, i,
svn_client__copy_pair_t *);
top_src = svn_path_get_longest_ancestor(top_src, pair->src, subpool);
}
if (src_ancestor)
*src_ancestor = apr_pstrdup(pool, top_src);
if (dst_ancestor)
*dst_ancestor = apr_pstrdup(pool, top_dst);
if (common_ancestor)
*common_ancestor = svn_path_get_longest_ancestor(top_src, top_dst, pool);
svn_pool_destroy(subpool);
return SVN_NO_ERROR;
}
/* Copy each COPY_PAIR->SRC into COPY_PAIR->DST. Use POOL for temporary
allocations. */
static svn_error_t *
do_wc_to_wc_copies(const apr_array_header_t *copy_pairs,
svn_client_ctx_t *ctx,
apr_pool_t *pool)
{
int i;
apr_pool_t *iterpool = svn_pool_create(pool);
const char *dst_parent;
svn_wc_adm_access_t *dst_access;
svn_error_t *err = SVN_NO_ERROR;
get_copy_pair_ancestors(copy_pairs, NULL, &dst_parent, NULL, pool);
if (copy_pairs->nelts == 1)
dst_parent = svn_path_dirname(dst_parent, pool);
/* Because all copies are to the same destination directory, we can open
the directory once, and use it for each copy. */
/* ### If we didn't potentially use DST_ACCESS as the SRC_ACCESS, we
### could use a read lock here. */
SVN_ERR(svn_wc_adm_open3(&dst_access, NULL, dst_parent, TRUE, 0,
ctx->cancel_func, ctx->cancel_baton, pool));
for (i = 0; i < copy_pairs->nelts; i++)
{
svn_wc_adm_access_t *src_access;
const char *src_parent;
svn_client__copy_pair_t *pair = APR_ARRAY_IDX(copy_pairs, i,
svn_client__copy_pair_t *);
svn_pool_clear(iterpool);
/* Check for cancellation */
if (ctx->cancel_func)
SVN_ERR(ctx->cancel_func(ctx->cancel_baton));
svn_path_split(pair->src, &src_parent, NULL, pool);
/* Need to avoid attempting to open the same dir twice when source
and destination overlap. */
if (strcmp(src_parent, pair->dst_parent) == 0)
{
/* For directories, extend our lock depth so that we can
access the source's entry fields. */
if (pair->src_kind == svn_node_dir)
SVN_ERR(svn_wc_adm_open3(&src_access, NULL, pair->src, FALSE,
-1, ctx->cancel_func, ctx->cancel_baton,
iterpool));
else
src_access = dst_access;
}
else
{
SVN_ERR(svn_wc_adm_open3(&src_access, NULL, src_parent, FALSE,
pair->src_kind == svn_node_dir ? -1 : 0,
ctx->cancel_func, ctx->cancel_baton,
iterpool));
}
/* Perform the copy */
/* ### This is not a move, so we won't have locked the source, so we
### won't detect any outstanding locks. If the source is locked and
### requires cleanup should we abort the copy? */
err = svn_wc_copy2(pair->src, dst_access, pair->base_name,
ctx->cancel_func, ctx->cancel_baton,
ctx->notify_func2, ctx->notify_baton2, iterpool);
if (err)
break;
err = propagate_mergeinfo_within_wc(pair, src_access, dst_access,
ctx, pool);
if (err)
break;
if (src_access != dst_access)
SVN_ERR(svn_wc_adm_close(src_access));
}
svn_sleep_for_timestamps();
SVN_ERR(err);
SVN_ERR(svn_wc_adm_close(dst_access));
svn_pool_destroy(iterpool);
return SVN_NO_ERROR;
}
/* Move each COPY_PAIR->SRC into COPY_PAIR->DST, deleting COPY_PAIR->SRC
afterwards. Use POOL for temporary allocations. */
static svn_error_t *
do_wc_to_wc_moves(const apr_array_header_t *copy_pairs,
svn_client_ctx_t *ctx,
apr_pool_t *pool)
{
int i;
apr_pool_t *iterpool = svn_pool_create(pool);
svn_error_t *err = SVN_NO_ERROR;
for (i = 0; i < copy_pairs->nelts; i++)
{
svn_wc_adm_access_t *src_access, *dst_access;
const char *src_parent;
svn_client__copy_pair_t *pair = APR_ARRAY_IDX(copy_pairs, i,
svn_client__copy_pair_t *);
svn_pool_clear(iterpool);
/* Check for cancellation */
if (ctx->cancel_func)
SVN_ERR(ctx->cancel_func(ctx->cancel_baton));
svn_path_split(pair->src, &src_parent, NULL, iterpool);
SVN_ERR(svn_wc_adm_open3(&src_access, NULL, src_parent, TRUE,
pair->src_kind == svn_node_dir ? -1 : 0,
ctx->cancel_func, ctx->cancel_baton,
iterpool));
/* Need to avoid attempting to open the same dir twice when source
and destination overlap. */
if (strcmp(src_parent, pair->dst_parent) == 0)
{
dst_access = src_access;
}
else
{
const char *src_parent_abs, *dst_parent_abs;
SVN_ERR(svn_path_get_absolute(&src_parent_abs, src_parent,
iterpool));
SVN_ERR(svn_path_get_absolute(&dst_parent_abs, pair->dst_parent,
iterpool));
if ((pair->src_kind == svn_node_dir)
&& (svn_path_is_child(src_parent_abs, dst_parent_abs,
iterpool)))
{
SVN_ERR(svn_wc_adm_retrieve(&dst_access, src_access,
pair->dst_parent, iterpool));
}
else
{
SVN_ERR(svn_wc_adm_open3(&dst_access, NULL, pair->dst_parent,
TRUE, 0, ctx->cancel_func,
ctx->cancel_baton,
iterpool));
}
}
/* ### Ideally, we'd lookup the mergeinfo here, before
### performing the copy. However, as an implementation
### shortcut, we perform the lookup after the copy. */
/* Perform the copy with mergeinfo, and then the delete. */
err = svn_wc_copy2(pair->src, dst_access, pair->base_name,
ctx->cancel_func, ctx->cancel_baton,
ctx->notify_func2, ctx->notify_baton2, iterpool);
if (err)
break;
err = propagate_mergeinfo_within_wc(pair, src_access, dst_access,
ctx, pool);
if (err)
break;
/* Perform the delete. */
SVN_ERR(svn_wc_delete3(pair->src, src_access,
ctx->cancel_func, ctx->cancel_baton,
ctx->notify_func2, ctx->notify_baton2, FALSE,
iterpool));
if (dst_access != src_access)
SVN_ERR(svn_wc_adm_close(dst_access));
SVN_ERR(svn_wc_adm_close(src_access));
}
svn_sleep_for_timestamps();
SVN_ERR(err);
svn_pool_destroy(iterpool);
return SVN_NO_ERROR;
}
static svn_error_t *
wc_to_wc_copy(const apr_array_header_t *copy_pairs,
svn_boolean_t is_move,
svn_boolean_t make_parents,
svn_client_ctx_t *ctx,
apr_pool_t *pool)
{
int i;
apr_pool_t *iterpool = svn_pool_create(pool);
/* Check that all of our SRCs exist, and all the DSTs don't. */
for (i = 0; i < copy_pairs->nelts; i++)
{
svn_client__copy_pair_t *pair = APR_ARRAY_IDX(copy_pairs, i,
svn_client__copy_pair_t *);
svn_node_kind_t dst_kind, dst_parent_kind;
svn_pool_clear(iterpool);
/* Verify that SRC_PATH exists. */
SVN_ERR(svn_io_check_path(pair->src, &pair->src_kind, iterpool));
if (pair->src_kind == svn_node_none)
return svn_error_createf(SVN_ERR_NODE_UNKNOWN_KIND, NULL,
_("Path '%s' does not exist"),
svn_path_local_style(pair->src, pool));
/* If DST_PATH does not exist, then its basename will become a new
file or dir added to its parent (possibly an implicit '.').
Else, just error out. */
SVN_ERR(svn_io_check_path(pair->dst, &dst_kind, iterpool));
if (dst_kind != svn_node_none)
return svn_error_createf(SVN_ERR_ENTRY_EXISTS, NULL,
_("Path '%s' already exists"),
svn_path_local_style(pair->dst, pool));
svn_path_split(pair->dst, &pair->dst_parent, &pair->base_name, pool);
/* Make sure the destination parent is a directory and produce a clear
error message if it is not. */
SVN_ERR(svn_io_check_path(pair->dst_parent, &dst_parent_kind, iterpool));
if (make_parents && dst_parent_kind == svn_node_none)
{
SVN_ERR(svn_client__make_local_parents(pair->dst_parent, TRUE, ctx,
iterpool));
}
else if (dst_parent_kind != svn_node_dir)
{
return svn_error_createf(SVN_ERR_WC_NOT_DIRECTORY, NULL,
_("Path '%s' is not a directory"),
svn_path_local_style(pair->dst_parent,
pool));
}
}
svn_pool_destroy(iterpool);
/* Copy or move all targets. */
if (is_move)
return do_wc_to_wc_moves(copy_pairs, ctx, pool);
else
return do_wc_to_wc_copies(copy_pairs, ctx, pool);
}
/* Path-specific state used as part of path_driver_cb_baton. */
typedef struct
{
const char *src_url;
const char *src_path;
const char *dst_path;
svn_node_kind_t src_kind;
svn_revnum_t src_revnum;
svn_boolean_t resurrection;
svn_boolean_t dir_add;
svn_string_t *mergeinfo; /* the new mergeinfo for the target */
} path_driver_info_t;
/* The baton used with the path_driver_cb_func() callback for a copy
or move operation. */
struct path_driver_cb_baton
{
/* The editor (and its state) used to perform the operation. */
const svn_delta_editor_t *editor;
void *edit_baton;
/* A hash of path -> path_driver_info_t *'s. */
apr_hash_t *action_hash;
/* Whether the operation is a move or copy. */
svn_boolean_t is_move;
};
static svn_error_t *
path_driver_cb_func(void **dir_baton,
void *parent_baton,
void *callback_baton,
const char *path,
apr_pool_t *pool)
{
struct path_driver_cb_baton *cb_baton = callback_baton;
svn_boolean_t do_delete = FALSE, do_add = FALSE;
path_driver_info_t *path_info = apr_hash_get(cb_baton->action_hash,
path,
APR_HASH_KEY_STRING);
/* Initialize return value. */
*dir_baton = NULL;
/* This function should never get an empty PATH. We can neither
create nor delete the empty PATH, so if someone is calling us
with such, the code is just plain wrong. */
assert(! svn_path_is_empty(path));
/* Check to see if we need to add the path as a directory. */
if (path_info->dir_add)
{
SVN_ERR(cb_baton->editor->add_directory(path, parent_baton, NULL,
SVN_INVALID_REVNUM, pool,
dir_baton));
return SVN_NO_ERROR;
}
/* If this is a resurrection, we know the source and dest paths are
the same, and that our driver will only be calling us once. */
if (path_info->resurrection)
{
/* If this is a move, we do nothing. Otherwise, we do the copy. */
if (! cb_baton->is_move)
do_add = TRUE;
}
/* Not a resurrection. */
else
{
/* If this is a move, we check PATH to see if it is the source
or the destination of the move. */
if (cb_baton->is_move)
{
if (strcmp(path_info->src_path, path) == 0)
do_delete = TRUE;
else
do_add = TRUE;
}
/* Not a move? This must just be the copy addition. */
else
{
do_add = TRUE;
}
}
if (do_delete)
{
SVN_ERR(cb_baton->editor->delete_entry(path, SVN_INVALID_REVNUM,
parent_baton, pool));
}
if (do_add)
{
SVN_ERR(svn_path_check_valid(path, pool));
if (path_info->src_kind == svn_node_file)
{
void *file_baton;
SVN_ERR(cb_baton->editor->add_file(path, parent_baton,
path_info->src_url,
path_info->src_revnum,
pool, &file_baton));
if (path_info->mergeinfo)
SVN_ERR(cb_baton->editor->change_file_prop(file_baton,
SVN_PROP_MERGEINFO,
path_info->mergeinfo,
pool));
SVN_ERR(cb_baton->editor->close_file(file_baton, NULL, pool));
}
else
{
SVN_ERR(cb_baton->editor->add_directory(path, parent_baton,
path_info->src_url,
path_info->src_revnum,
pool, dir_baton));
if (path_info->mergeinfo)
SVN_ERR(cb_baton->editor->change_dir_prop(*dir_baton,
SVN_PROP_MERGEINFO,
path_info->mergeinfo,
pool));
}
}
return SVN_NO_ERROR;
}
static svn_error_t *
repos_to_repos_copy(svn_commit_info_t **commit_info_p,
const apr_array_header_t *copy_pairs,
svn_boolean_t make_parents,
svn_client_ctx_t *ctx,
svn_boolean_t is_move,
apr_pool_t *pool)
{
apr_array_header_t *paths = apr_array_make(pool, 2 * copy_pairs->nelts,
sizeof(const char *));
apr_hash_t *action_hash = apr_hash_make(pool);
apr_array_header_t *path_infos;
const char *top_url, *message, *repos_root;
apr_hash_t *revprop_table;
svn_revnum_t youngest;
svn_ra_session_t *ra_session;
const svn_delta_editor_t *editor;
void *edit_baton;
void *commit_baton;
struct path_driver_cb_baton cb_baton;
apr_array_header_t *new_dirs = NULL;
apr_pool_t *iterpool;
int i;
svn_error_t *err;
/* Create a path_info struct for each src/dst pair, and initialize it. */
path_infos = apr_array_make(pool, copy_pairs->nelts,
sizeof(path_driver_info_t *));
for (i = 0; i < copy_pairs->nelts; i++)
{
path_driver_info_t *info = apr_pcalloc(pool, sizeof(*info));
info->resurrection = FALSE;
APR_ARRAY_PUSH(path_infos, path_driver_info_t *) = info;
}
/* We have to open our session to the longest path common to all
SRC_URLS and DST_URLS in the repository so we can do existence
checks on all paths, and so we can operate on all paths in the
case of a move. */
get_copy_pair_ancestors(copy_pairs, NULL, NULL, &top_url, pool);
/* Check each src/dst pair for resurrection. */
for (i = 0; i < copy_pairs->nelts; i++)
{
svn_client__copy_pair_t *pair = APR_ARRAY_IDX(copy_pairs, i,
svn_client__copy_pair_t *);
path_driver_info_t *info = APR_ARRAY_IDX(path_infos, i,
path_driver_info_t *);
if (strcmp(pair->src, pair->dst) == 0)
{
info->resurrection = TRUE;
/* Special edge-case! (issue #683) If you're resurrecting a
deleted item like this: 'svn cp -rN src_URL dst_URL', then
it's possible for src_URL == dst_URL == top_url. In this
situation, we want to open an RA session to be at least the
*parent* of all three. */
if (strcmp(pair->src, top_url) == 0)
{
top_url = svn_path_dirname(top_url, pool);
}
}
}
/* Open an RA session for the URL. Note that we don't have a local
directory, nor a place to put temp files. */
err = svn_client__open_ra_session_internal(&ra_session, top_url,
NULL, NULL, NULL, FALSE, TRUE,
ctx, pool);
/* If the two URLs appear not to be in the same repository, then
top_url will be empty and the call to svn_ra_open2()
above will have failed. Below we check for that, and propagate a
descriptive error back to the user.
Ideally, we'd contact the repositories and compare their UUIDs to
determine whether or not src and dst are in the same repository,
instead of depending on an essentially textual comparison.
However, it is simpler to assume that if someone is using the
same repository, then they will use the same hostname/path to
refer to it both times. Conversely, if the repositories are
different, then they can't share a non-empty prefix, so top_url
would still be "" and svn_ra_get_library() would still error.
Thus we can get this check without extra network turnarounds to
fetch the UUIDs.
*/
if (err)
{
if ((err->apr_err == SVN_ERR_RA_ILLEGAL_URL)
&& ((top_url == NULL) || (top_url[0] == '\0')))
{
svn_client__copy_pair_t *first_pair =
APR_ARRAY_IDX(copy_pairs, 0, svn_client__copy_pair_t *);
svn_error_clear(err);
return svn_error_createf
(SVN_ERR_UNSUPPORTED_FEATURE, NULL,
_("Source and dest appear not to be in the same repository "
"(src: '%s'; dst: '%s')"),
first_pair->src, first_pair->dst);
}
else
return err;
}
iterpool = svn_pool_create(pool);
/* Iterate over the parents of the destination directory, and make a list
of the ones that don't yet exist. We do not have to worry about
reparenting the ra session because top_url is a common ancestor of the
destination and sources. The sources exist, so therefore top_url must
also exist. */
if (make_parents)
{
svn_client__copy_pair_t *pair = APR_ARRAY_IDX(copy_pairs, 0,
svn_client__copy_pair_t *);
svn_node_kind_t kind;
const char *dir;
new_dirs = apr_array_make(pool, 0, sizeof(const char *));
dir = svn_path_is_child(top_url, svn_path_dirname(pair->dst, pool),
pool);
SVN_ERR(svn_ra_check_path(ra_session, dir, SVN_INVALID_REVNUM, &kind,
iterpool));
while (kind == svn_node_none)
{
svn_pool_clear(iterpool);
APR_ARRAY_PUSH(new_dirs, const char *) = dir;
svn_path_split(dir, &dir, NULL, pool);
SVN_ERR(svn_ra_check_path(ra_session, dir, SVN_INVALID_REVNUM, &kind,
iterpool));
}
}
svn_pool_destroy(iterpool);
SVN_ERR(svn_ra_get_repos_root(ra_session, &repos_root, pool));
/* For each src/dst pair, check to see if that SRC_URL is a child of
the DST_URL (excepting the case where DST_URL is the repo root).
If it is, and the parent of DST_URL is the current TOP_URL, then we
need to reparent the session one directory higher, the parent of
the DST_URL. */
for (i = 0; i < copy_pairs->nelts; i++)
{
svn_client__copy_pair_t *pair = APR_ARRAY_IDX(copy_pairs, i,
svn_client__copy_pair_t *);
path_driver_info_t *info = APR_ARRAY_IDX(path_infos, i,
path_driver_info_t *);
if (strcmp(pair->dst, repos_root) != 0
&& svn_path_is_child(pair->dst, pair->src, pool) != NULL)
{
info->resurrection = TRUE;
top_url = svn_path_dirname(top_url, pool);
SVN_ERR(svn_ra_reparent(ra_session, top_url, pool));
}
}
/* Fetch the youngest revision. */
SVN_ERR(svn_ra_get_latest_revnum(ra_session, &youngest, pool));
for (i = 0; i < copy_pairs->nelts; i++)
{
svn_client__copy_pair_t *pair = APR_ARRAY_IDX(copy_pairs, i,
svn_client__copy_pair_t *);
path_driver_info_t *info = APR_ARRAY_IDX(path_infos, i,
path_driver_info_t *);
svn_node_kind_t dst_kind;
const char *src_rel, *dst_rel;
svn_opt_revision_t *new_rev, *ignored_rev, dead_end_rev;
const char *ignored_url;
/* Pass NULL for the path, to ensure error if trying to get a
revision based on the working copy. */
SVN_ERR(svn_client__get_revision_number
(&pair->src_revnum, NULL, ra_session, &pair->src_op_revision,
NULL, pool));
info->src_revnum = pair->src_revnum;
dead_end_rev.kind = svn_opt_revision_unspecified;
/* Run the history function to get the object's url in the operational
revision. */
SVN_ERR(svn_client__repos_locations(&pair->src, &new_rev,
&ignored_url, &ignored_rev,
NULL,
pair->src, &pair->src_peg_revision,
&pair->src_op_revision, &dead_end_rev,
ctx, pool));
/* Get the portions of the SRC and DST URLs that are relative to
TOP_URL, and URI-decode those sections. */
src_rel = svn_path_is_child(top_url, pair->src, pool);
if (src_rel)
src_rel = svn_path_uri_decode(src_rel, pool);
else
src_rel = "";
dst_rel = svn_path_is_child(top_url, pair->dst, pool);
if (dst_rel)
dst_rel = svn_path_uri_decode(dst_rel, pool);
else
dst_rel = "";
/* We can't move something into itself, period. */
if (svn_path_is_empty(src_rel) && is_move)
return svn_error_createf(SVN_ERR_UNSUPPORTED_FEATURE, NULL,
_("Cannot move URL '%s' into itself"),
pair->src);
/* Verify that SRC_URL exists in the repository. */
SVN_ERR(svn_ra_check_path(ra_session, src_rel, pair->src_revnum,
&info->src_kind, pool));
if (info->src_kind == svn_node_none)
return svn_error_createf
(SVN_ERR_FS_NOT_FOUND, NULL,
_("Path '%s' does not exist in revision %ld"),
pair->src, pair->src_revnum);
/* Figure out the basename that will result from this operation. */
SVN_ERR(svn_ra_check_path(ra_session, dst_rel, youngest, &dst_kind,
pool));
if (dst_kind != svn_node_none)
{
/* We disallow the overwriting of existing paths. */
return svn_error_createf(SVN_ERR_FS_ALREADY_EXISTS, NULL,
_("Path '%s' already exists"), dst_rel);
}
info->src_url = pair->src;
info->src_path = src_rel;
info->dst_path = dst_rel;
}
if (SVN_CLIENT__HAS_LOG_MSG_FUNC(ctx))
{
/* Produce a list of new paths to add, and provide it to the
mechanism used to acquire a log message. */
svn_client_commit_item3_t *item;
const char *tmp_file;
apr_array_header_t *commit_items
= apr_array_make(pool, 2 * copy_pairs->nelts, sizeof(item));
/* Add any intermediate directories to the message */
if (make_parents)
{
for (i = 0; i < new_dirs->nelts; i++)
{
const char *url = APR_ARRAY_IDX(new_dirs, i, const char *);
SVN_ERR(svn_client_commit_item_create
((const svn_client_commit_item3_t **) &item, pool));
item->url = svn_path_join(top_url, url, pool);
item->state_flags = SVN_CLIENT_COMMIT_ITEM_ADD;
APR_ARRAY_PUSH(commit_items, svn_client_commit_item3_t *) = item;
}
}
for (i = 0; i < path_infos->nelts; i++)
{
path_driver_info_t *info = APR_ARRAY_IDX(path_infos, i,
path_driver_info_t *);
SVN_ERR(svn_client_commit_item_create
((const svn_client_commit_item3_t **) &item, pool));
item->url = svn_path_join(top_url, info->dst_path, pool);
item->state_flags = SVN_CLIENT_COMMIT_ITEM_ADD;
APR_ARRAY_PUSH(commit_items, svn_client_commit_item3_t *) = item;
apr_hash_set(action_hash, info->dst_path, APR_HASH_KEY_STRING,
info);
if (is_move && (! info->resurrection))
{
item = apr_pcalloc(pool, sizeof(*item));
item->url = svn_path_join(top_url, info->src_path, pool);
item->state_flags = SVN_CLIENT_COMMIT_ITEM_DELETE;
APR_ARRAY_PUSH(commit_items, svn_client_commit_item3_t *) = item;
apr_hash_set(action_hash, info->src_path, APR_HASH_KEY_STRING,
info);
}
}
SVN_ERR(svn_client__get_log_msg(&message, &tmp_file, commit_items,
ctx, pool));
if (! message)
return SVN_NO_ERROR;
}
else
message = "";
/* Setup our PATHS for the path-based editor drive. */
/* First any intermediate directories. */
if (make_parents)
{
for (i = 0; i < new_dirs->nelts; i++)
{
const char *url = APR_ARRAY_IDX(new_dirs, i, const char *);
path_driver_info_t *info = apr_pcalloc(pool, sizeof(*info));
info->dst_path = url;
info->dir_add = TRUE;
APR_ARRAY_PUSH(paths, const char *) = url;
apr_hash_set(action_hash, url, APR_HASH_KEY_STRING, info);
}
}
/* Then, copy destinations, and possibly move sources. */
for (i = 0; i < path_infos->nelts; i++)
{
path_driver_info_t *info = APR_ARRAY_IDX(path_infos, i,
path_driver_info_t *);
apr_hash_t *mergeinfo;
SVN_ERR(calculate_target_mergeinfo(ra_session, &mergeinfo, NULL,
info->src_url, info->src_revnum,
FALSE, ctx, pool));
if (mergeinfo)
SVN_ERR(svn_mergeinfo__to_string(&info->mergeinfo, mergeinfo, pool));
APR_ARRAY_PUSH(paths, const char *) = info->dst_path;
if (is_move && (! info->resurrection))
APR_ARRAY_PUSH(paths, const char *) = info->src_path;
}
SVN_ERR(svn_client__get_revprop_table(&revprop_table, message, ctx, pool));
/* Fetch RA commit editor. */
SVN_ERR(svn_client__commit_get_baton(&commit_baton, commit_info_p, pool));
SVN_ERR(svn_ra_get_commit_editor3(ra_session, &editor, &edit_baton,
revprop_table,
svn_client__commit_callback,
commit_baton,
NULL, TRUE, /* No lock tokens */
pool));
/* Setup the callback baton. */
cb_baton.editor = editor;
cb_baton.edit_baton = edit_baton;
cb_baton.action_hash = action_hash;
cb_baton.is_move = is_move;
/* Call the path-based editor driver. */
err = svn_delta_path_driver(editor, edit_baton, youngest, paths,
path_driver_cb_func, &cb_baton, pool);
if (err)
{
/* At least try to abort the edit (and fs txn) before throwing err. */
svn_error_clear(editor->abort_edit(edit_baton, pool));
return err;
}
/* Close the edit. */
SVN_ERR(editor->close_edit(edit_baton, pool));
return SVN_NO_ERROR;
}
static svn_error_t *
wc_to_repos_copy(svn_commit_info_t **commit_info_p,
const apr_array_header_t *copy_pairs,
svn_boolean_t make_parents,
svn_client_ctx_t *ctx,
apr_pool_t *pool)
{
const char *message;
apr_hash_t *revprop_table;
const char *top_src_path, *top_dst_url, *repos_root;
svn_ra_session_t *ra_session;
const svn_delta_editor_t *editor;
void *edit_baton;
svn_node_kind_t base_kind;
void *commit_baton;
apr_hash_t *committables;
svn_wc_adm_access_t *adm_access, *dir_access;
apr_array_header_t *commit_items;
const svn_wc_entry_t *entry;
apr_pool_t *iterpool;
apr_array_header_t *new_dirs = NULL;
int i;
/* The commit process uses absolute paths, so we need to open the access
baton using absolute paths, and so we really need to use absolute
paths everywhere. */
for (i = 0; i < copy_pairs->nelts; i++)
{
svn_client__copy_pair_t *pair = APR_ARRAY_IDX(copy_pairs, i,
svn_client__copy_pair_t *);
SVN_ERR(svn_path_get_absolute(&pair->src_abs, pair->src, pool));
}
/*Find the common root of all the source paths, and probe the wc. */
get_copy_pair_ancestors(copy_pairs, &top_src_path, NULL, NULL, pool);
SVN_ERR(svn_wc_adm_probe_open3(&adm_access, NULL, top_src_path,
FALSE, -1, ctx->cancel_func,
ctx->cancel_baton, pool));
/* Determine the least common ancesor for the destinations, and open an RA
session to that location. */
svn_path_split(APR_ARRAY_IDX(copy_pairs, 0, svn_client__copy_pair_t *)->dst,
&top_dst_url,
NULL, pool);
for (i = 1; i < copy_pairs->nelts; i++)
{
svn_client__copy_pair_t *pair = APR_ARRAY_IDX(copy_pairs, i,
svn_client__copy_pair_t *);
top_dst_url = svn_path_get_longest_ancestor(top_dst_url, pair->dst, pool);
}
SVN_ERR(svn_client__open_ra_session_internal(&ra_session, top_dst_url,
svn_wc_adm_access_path
(adm_access),
adm_access, NULL, TRUE, TRUE,
ctx, pool));
/* If requested, determine the nearest existing parent of the destination,
and reparent the ra session there. */
if (make_parents)
{
const char *root_url = top_dst_url;
svn_node_kind_t kind;
new_dirs = apr_array_make(pool, 0, sizeof(const char *));
SVN_ERR(svn_ra_check_path(ra_session, "", SVN_INVALID_REVNUM, &kind,
pool));
while (kind == svn_node_none)
{
APR_ARRAY_PUSH(new_dirs, const char *) = root_url;
svn_path_split(root_url, &root_url, NULL, pool);
SVN_ERR(svn_ra_reparent(ra_session, root_url, pool));
SVN_ERR(svn_ra_check_path(ra_session, "", SVN_INVALID_REVNUM, &kind,
pool));
}
top_dst_url = root_url;
}
/* Figure out the basename that will result from each copy and check to make
sure it doesn't exist already. */
iterpool = svn_pool_create(pool);
for (i = 0; i < copy_pairs->nelts; i++)
{
svn_node_kind_t dst_kind;
const char *dst_rel;
svn_client__copy_pair_t *pair =
APR_ARRAY_IDX(copy_pairs, i, svn_client__copy_pair_t *);
svn_pool_clear(iterpool);
SVN_ERR(svn_wc_entry(&entry, pair->src, adm_access, FALSE, iterpool));
pair->src_revnum = entry->revision;
dst_rel = svn_path_uri_decode(svn_path_is_child(top_dst_url,
pair->dst,
iterpool),
iterpool);
SVN_ERR(svn_ra_check_path(ra_session, dst_rel, SVN_INVALID_REVNUM,
&dst_kind, iterpool));
if (dst_kind != svn_node_none)
{
return svn_error_createf(SVN_ERR_FS_ALREADY_EXISTS, NULL,
_("Path '%s' already exists"), pair->dst);
}
}
svn_pool_destroy(iterpool);
if (SVN_CLIENT__HAS_LOG_MSG_FUNC(ctx))
{
/* Produce a list of new paths to add, and provide it to the
mechanism used to acquire a log message. */
svn_client_commit_item3_t *item;
const char *tmp_file;
commit_items = apr_array_make(pool, copy_pairs->nelts, sizeof(item));
/* Add any intermediate directories to the message */
if (make_parents)
{
for (i = 0; i < new_dirs->nelts; i++)
{
const char *url = APR_ARRAY_IDX(new_dirs, i, const char *);
SVN_ERR(svn_client_commit_item_create
((const svn_client_commit_item3_t **) &item, pool));
item->url = url;
item->state_flags = SVN_CLIENT_COMMIT_ITEM_ADD;
APR_ARRAY_PUSH(commit_items, svn_client_commit_item3_t *) = item;
}
}
for (i = 0; i < copy_pairs->nelts; i++ )
{
svn_client__copy_pair_t *pair = APR_ARRAY_IDX(copy_pairs, i,
svn_client__copy_pair_t *);
SVN_ERR(svn_client_commit_item_create
((const svn_client_commit_item3_t **) &item, pool));
item->url = pair->dst;
item->state_flags = SVN_CLIENT_COMMIT_ITEM_ADD;
APR_ARRAY_PUSH(commit_items, svn_client_commit_item3_t *) = item;
}
SVN_ERR(svn_client__get_log_msg(&message, &tmp_file, commit_items,
ctx, pool));
if (! message)
{
SVN_ERR(svn_wc_adm_close(adm_access));
return SVN_NO_ERROR;
}
}
else
message = "";
SVN_ERR(svn_client__get_revprop_table(&revprop_table, message, ctx, pool));
/* Crawl the working copy for commit items. */
SVN_ERR(svn_io_check_path(top_src_path, &base_kind, pool));
if (base_kind == svn_node_dir)
SVN_ERR(svn_wc_adm_retrieve(&dir_access, adm_access, top_src_path, pool));
else
dir_access = adm_access;
SVN_ERR(svn_client__get_copy_committables(&committables,
copy_pairs, dir_access,
ctx, pool));
/* ### todo: There should be only one hash entry, which currently
has a hacked name until we have the entries files storing
canonical repository URLs. Then, the hacked name can go away and
be replaced with a entry->repos (or whereever the entry's
canonical repos URL is stored). */
if (! (commit_items = apr_hash_get(committables,
SVN_CLIENT__SINGLE_REPOS_NAME,
APR_HASH_KEY_STRING)))
{
SVN_ERR(svn_wc_adm_close(adm_access));
return SVN_NO_ERROR;
}
/* If we are creating intermediate directories, tack them onto the list
of committables. */
if (make_parents)
{
for (i = 0; i < new_dirs->nelts; i++)
{
const char *url = APR_ARRAY_IDX(new_dirs, i, const char *);
svn_client_commit_item3_t *item;
SVN_ERR(svn_client_commit_item_create
((const svn_client_commit_item3_t **) &item, pool));
item->url = url;
item->state_flags = SVN_CLIENT_COMMIT_ITEM_ADD;
item->incoming_prop_changes = apr_array_make(pool, 1,
sizeof(svn_prop_t *));
APR_ARRAY_PUSH(commit_items, svn_client_commit_item3_t *) = item;
}
}
/* Reparent the ra_session to repos_root. So that 'svn_ra_get_log'
on paths relative to repos_root would work fine. */
SVN_ERR(svn_ra_get_repos_root(ra_session, &repos_root, pool));
SVN_ERR(svn_ra_reparent(ra_session, repos_root, pool));
/* ### TODO: This extra loop would be unnecessary if this code lived
### in svn_client__get_copy_committables(), which is incidentally
### only used above (so should really be in this source file). */
for (i = 0; i < copy_pairs->nelts; i++)
{
svn_prop_t *mergeinfo_prop;
apr_hash_t *mergeinfo, *wc_mergeinfo;
svn_client__copy_pair_t *pair = APR_ARRAY_IDX(copy_pairs, i,
svn_client__copy_pair_t *);
svn_client_commit_item3_t *item =
APR_ARRAY_IDX(commit_items, i, svn_client_commit_item3_t *);
/* Set the mergeinfo for the destination to the combined merge
info known to the WC and the repository. */
item->outgoing_prop_changes = apr_array_make(pool, 1,
sizeof(svn_prop_t *));
mergeinfo_prop = apr_palloc(item->outgoing_prop_changes->pool,
sizeof(svn_prop_t));
mergeinfo_prop->name = SVN_PROP_MERGEINFO;
SVN_ERR(calculate_target_mergeinfo(ra_session, &mergeinfo, adm_access,
pair->src, pair->src_revnum,
FALSE, ctx, pool));
SVN_ERR(svn_wc_entry(&entry, pair->src, adm_access, FALSE, pool));
SVN_ERR(svn_client__parse_mergeinfo(&wc_mergeinfo, entry,
pair->src, FALSE, adm_access, ctx,
pool));
if (wc_mergeinfo && mergeinfo)
SVN_ERR(svn_mergeinfo_merge(mergeinfo, wc_mergeinfo, pool));
else if (! mergeinfo)
mergeinfo = wc_mergeinfo;
if (mergeinfo)
SVN_ERR(svn_mergeinfo__to_string((svn_string_t **)
&mergeinfo_prop->value,
mergeinfo, pool));
APR_ARRAY_PUSH(item->outgoing_prop_changes, svn_prop_t *) =
mergeinfo_prop;
}
/* Sort and condense our COMMIT_ITEMS. */
SVN_ERR(svn_client__condense_commit_items(&top_dst_url,
commit_items, pool));
/* Open an RA session to DST_URL. */
SVN_ERR(svn_client__open_ra_session_internal(&ra_session, top_dst_url,
NULL, NULL, commit_items,
FALSE, FALSE, ctx, pool));
/* Fetch RA commit editor. */
SVN_ERR(svn_client__commit_get_baton(&commit_baton, commit_info_p, pool));
SVN_ERR(svn_ra_get_commit_editor3(ra_session, &editor, &edit_baton,
revprop_table, svn_client__commit_callback,
commit_baton, NULL,
TRUE, /* No lock tokens */
pool));
/* Perform the commit. */
SVN_ERR_W(svn_client__do_commit(top_dst_url, commit_items, adm_access,
editor, edit_baton,
0, /* ### any notify_path_offset needed? */
NULL, NULL, ctx, pool),
_("Commit failed (details follow):"));
/* Sleep to ensure timestamp integrity. */
svn_sleep_for_timestamps();
/* It's only a read lock, so unlocking is harmless. */
SVN_ERR(svn_wc_adm_close(adm_access));
return SVN_NO_ERROR;
}
/* Peform each individual copy operation for a repos -> wc copy. A
helper for repos_to_wc_copy(). */
static svn_error_t *
repos_to_wc_copy_single(svn_client__copy_pair_t *pair,
svn_boolean_t same_repositories,
svn_ra_session_t *ra_session,
svn_wc_adm_access_t *adm_access,
svn_client_ctx_t *ctx,
apr_pool_t *pool)
{
svn_revnum_t src_revnum = pair->src_revnum;
apr_hash_t *src_mergeinfo;
const svn_wc_entry_t *dst_entry;
if (pair->src_kind == svn_node_dir)
{
SVN_ERR(svn_client__checkout_internal
(NULL, pair->src_original, pair->dst, &pair->src_peg_revision,
&pair->src_op_revision,
SVN_DEPTH_INFINITY_OR_FILES(TRUE),
FALSE, FALSE, NULL, ctx, pool));
/* Rewrite URLs recursively, remove wcprops, and mark everything
as 'copied' -- assuming that the src and dst are from the
same repository. (It's kind of weird that svn_wc_add() is the
way to do this; see its doc for more about the controversy.) */
if (same_repositories)
{
svn_wc_adm_access_t *dst_access;
SVN_ERR(svn_wc_adm_open3(&dst_access, adm_access, pair->dst, TRUE,
-1, ctx->cancel_func, ctx->cancel_baton,
pool));
SVN_ERR(svn_wc_entry(&dst_entry, pair->dst, dst_access, FALSE,
pool));
if (pair->src_op_revision.kind == svn_opt_revision_head)
{
/* If we just checked out from the "head" revision,
that's fine, but we don't want to pass a '-1' as a
copyfrom_rev to svn_wc_add(). That function will
dump it right into the entry, and when we try to
commit later on, the 'add-dir-with-history' step will
be -very- unhappy; it only accepts specific
revisions.
On the other hand, we *could* say that -1 is a
legitimate copyfrom_rev, but I think that's bogus.
Somebody made a copy from a particular revision; if
they wait a long time to commit, it would be terrible
if the copied happened from a newer revision!! */
/* We just did a checkout; whatever revision we just
got, that should be the copyfrom_revision when we
commit later. */
src_revnum = dst_entry->revision;
}
/* Schedule dst_path for addition in parent, with copy history.
(This function also recursively puts a 'copied' flag on every
entry). */
SVN_ERR(svn_wc_add2(pair->dst, adm_access, pair->src,
src_revnum,
ctx->cancel_func, ctx->cancel_baton,
ctx->notify_func2, ctx->notify_baton2, pool));
/* ### Recording of implied mergeinfo should really occur
### *before* the notification callback is invoked by
### svn_wc_add2(), but can't occur before we add the new
### source path. */
SVN_ERR(calculate_target_mergeinfo(ra_session, &src_mergeinfo, NULL,
pair->src, src_revnum,
FALSE, ctx, pool));
SVN_ERR(extend_wc_mergeinfo(pair->dst, dst_entry, src_mergeinfo,
dst_access, ctx, pool));
}
else /* different repositories */
{
/* ### Someday, we would just call svn_wc_add(), as above,
but with no copyfrom args. I.e. in the
directory-foreign-UUID case, we still want everything
scheduled for addition, URLs rewritten, and wcprop cache
deleted, but WITHOUT any copied flags or copyfrom urls.
Unfortunately, svn_wc_add() is such a mess that it chokes
at the moment when we pass a NULL copyfromurl. */
return svn_error_createf
(SVN_ERR_UNSUPPORTED_FEATURE, NULL,
_("Source URL '%s' is from foreign repository; "
"leaving it as a disjoint WC"), pair->src);
}
} /* end directory case */
else if (pair->src_kind == svn_node_file)
{
apr_file_t *fp;
svn_stream_t *fstream;
svn_revnum_t real_rev;
const char *new_text_path;
apr_hash_t *new_props;
svn_error_t *err;
const char *src_rel;
SVN_ERR(svn_io_open_unique_file2(&fp, &new_text_path, pair->dst, ".tmp",
svn_io_file_del_none, pool));
fstream = svn_stream_from_aprfile2(fp, FALSE, pool);
SVN_ERR(svn_client__path_relative_to_session(&src_rel, ra_session,
pair->src, pool));
SVN_ERR(svn_ra_get_file(ra_session, src_rel, src_revnum, fstream,
&real_rev, &new_props, pool));
SVN_ERR(svn_stream_close(fstream));
/* If SRC_REVNUM is invalid (HEAD), then REAL_REV is now the
revision that was actually retrieved. This is the value we
want to use as 'copyfrom_rev' below. */
if (! SVN_IS_VALID_REVNUM(src_revnum))
src_revnum = real_rev;
err = svn_wc_add_repos_file2
(pair->dst, adm_access,
new_text_path, NULL, new_props, NULL,
same_repositories ? pair->src : NULL,
same_repositories ? src_revnum : SVN_INVALID_REVNUM,
pool);
SVN_ERR(svn_wc_entry(&dst_entry, pair->dst, adm_access, FALSE, pool));
SVN_ERR(calculate_target_mergeinfo(ra_session, &src_mergeinfo,
NULL, pair->src, src_revnum,
FALSE, ctx, pool));
SVN_ERR(extend_wc_mergeinfo(pair->dst, dst_entry, src_mergeinfo,
adm_access, ctx, pool));
/* Ideally, svn_wc_add_repos_file() would take a notify function
and baton, and we wouldn't have to make this call here.
However, the situation is... complicated. See issue #1552
for the full story. */
if (!err && ctx->notify_func2)
{
svn_wc_notify_t *notify = svn_wc_create_notify(pair->dst,
svn_wc_notify_add,
pool);
notify->kind = pair->src_kind;
(*ctx->notify_func2)(ctx->notify_baton2, notify, pool);
}
svn_sleep_for_timestamps();
SVN_ERR(err);
}
return SVN_NO_ERROR;
}
static svn_error_t *
repos_to_wc_copy(const apr_array_header_t *copy_pairs,
svn_boolean_t make_parents,
svn_client_ctx_t *ctx,
apr_pool_t *pool)
{
svn_ra_session_t *ra_session;
svn_wc_adm_access_t *adm_access;
const char *top_src_url, *top_dst_path;
const char *src_uuid = NULL, *dst_uuid = NULL;
svn_boolean_t same_repositories;
apr_pool_t *iterpool = svn_pool_create(pool);
int i;
/* Get the real path for the source, based upon its peg revision. */
for (i = 0; i < copy_pairs->nelts; i++)
{
svn_client__copy_pair_t *pair = APR_ARRAY_IDX(copy_pairs, i,
svn_client__copy_pair_t *);
const char *src, *ignored_url;
svn_opt_revision_t *new_rev, *ignored_rev, dead_end_rev;
svn_pool_clear(iterpool);
dead_end_rev.kind = svn_opt_revision_unspecified;
SVN_ERR(svn_client__repos_locations(&src, &new_rev,
&ignored_url, &ignored_rev,
NULL,
pair->src,
&pair->src_peg_revision,
&pair->src_op_revision,
&dead_end_rev,
ctx, iterpool));
pair->src_original = pair->src;
pair->src = apr_pstrdup(pool, src);
}
get_copy_pair_ancestors(copy_pairs, &top_src_url, &top_dst_path, NULL, pool);
if (copy_pairs->nelts == 1)
top_src_url = svn_path_dirname(top_src_url, pool);
/* Open a repository session to the longest common src ancestor. We do not
(yet) have a working copy, so we don't have a corresponding path and
tempfiles cannot go into the admin area. */
SVN_ERR(svn_client__open_ra_session_internal(&ra_session, top_src_url, NULL,
NULL, NULL, FALSE, TRUE,
ctx, pool));
/* Pass null for the path, to ensure error if trying to get a
revision based on the working copy. */
for (i = 0; i < copy_pairs->nelts; i++)
{
svn_client__copy_pair_t *pair = APR_ARRAY_IDX(copy_pairs, i,
svn_client__copy_pair_t *);
SVN_ERR(svn_client__get_revision_number
(&pair->src_revnum, NULL, ra_session, &pair->src_op_revision,
NULL, pool));
}
/* Get the correct src path for the peg revision used, and verify that we
aren't overwriting an existing path. */
for (i = 0; i < copy_pairs->nelts; i++)
{
svn_client__copy_pair_t *pair = APR_ARRAY_IDX(copy_pairs, i,
svn_client__copy_pair_t *);
svn_node_kind_t dst_parent_kind, dst_kind;
const char *dst_parent;
const char *src_rel;
svn_pool_clear(iterpool);
/* Next, make sure that the path exists in the repository. */
SVN_ERR(svn_client__path_relative_to_session(&src_rel, ra_session,
pair->src, iterpool));
SVN_ERR(svn_ra_check_path(ra_session, src_rel, pair->src_revnum,
&pair->src_kind, pool));
if (pair->src_kind == svn_node_none)
{
if (SVN_IS_VALID_REVNUM(pair->src_revnum))
return svn_error_createf
(SVN_ERR_FS_NOT_FOUND, NULL,
_("Path '%s' not found in revision %ld"),
pair->src, pair->src_revnum);
else
return svn_error_createf
(SVN_ERR_FS_NOT_FOUND, NULL,
_("Path '%s' not found in head revision"), pair->src);
}
/* Figure out about dst. */
SVN_ERR(svn_io_check_path(pair->dst, &dst_kind, iterpool));
if (dst_kind != svn_node_none)
{
return svn_error_createf(SVN_ERR_ENTRY_EXISTS, NULL,
_("Path '%s' already exists"),
svn_path_local_style(pair->dst, pool));
}
/* Make sure the destination parent is a directory and produce a clear
error message if it is not. */
dst_parent = svn_path_dirname(pair->dst, iterpool);
SVN_ERR(svn_io_check_path(dst_parent, &dst_parent_kind, iterpool));
if (make_parents && dst_parent_kind == svn_node_none)
{
SVN_ERR(svn_client__make_local_parents(dst_parent, TRUE, ctx,
iterpool));
}
else if (dst_parent_kind != svn_node_dir)
{
return svn_error_createf(SVN_ERR_WC_NOT_DIRECTORY, NULL,
_("Path '%s' is not a directory"),
svn_path_local_style(dst_parent, pool));
}
}
/* Probe the wc at the longest common dst ancestor. */
SVN_ERR(svn_wc_adm_probe_open3(&adm_access, NULL, top_dst_path, TRUE,
0, ctx->cancel_func, ctx->cancel_baton,
pool));
/* We've already checked for physical obstruction by a working file.
But there could also be logical obstruction by an entry whose
working file happens to be missing.*/
for (i = 0; i < copy_pairs->nelts; i++)
{
svn_client__copy_pair_t *pair = APR_ARRAY_IDX(copy_pairs, i,
svn_client__copy_pair_t *);
const svn_wc_entry_t *ent;
svn_pool_clear(iterpool);
SVN_ERR(svn_wc_entry(&ent, pair->dst, adm_access, FALSE, iterpool));
if (ent && (ent->kind != svn_node_dir) &&
(ent->schedule != svn_wc_schedule_delete))
return svn_error_createf
(SVN_ERR_WC_OBSTRUCTED_UPDATE, NULL,
_("Entry for '%s' exists (though the working file is missing)"),
svn_path_local_style(pair->dst, pool));
}
/* Decide whether the two repositories are the same or not. */
{
svn_error_t *src_err, *dst_err;
const char *parent;
/* Get the repository uuid of SRC_URL */
src_err = svn_ra_get_uuid(ra_session, &src_uuid, pool);
if (src_err && src_err->apr_err != SVN_ERR_RA_NO_REPOS_UUID)
return src_err;
/* Get repository uuid of dst's parent directory, since dst may
not exist. ### TODO: we should probably walk up the wc here,
in case the parent dir has an imaginary URL. */
if (copy_pairs->nelts == 1)
svn_path_split(top_dst_path, &parent, NULL, pool);
else
parent = top_dst_path;
dst_err = svn_client_uuid_from_path(&dst_uuid, parent, adm_access,
ctx, pool);
if (dst_err && dst_err->apr_err != SVN_ERR_RA_NO_REPOS_UUID)
return dst_err;
/* If either of the UUIDs are nonexistent, then at least one of
the repositories must be very old. Rather than punish the
user, just assume the repositories are different, so no
copy-history is attempted. */
if (src_err || dst_err || (! src_uuid) || (! dst_uuid))
same_repositories = FALSE;
else
same_repositories = (strcmp(src_uuid, dst_uuid) == 0) ? TRUE : FALSE;
}
/* Perform the move for each of the copy_pairs. */
for (i = 0; i < copy_pairs->nelts; i++)
{
/* Check for cancellation */
if (ctx->cancel_func)
SVN_ERR(ctx->cancel_func(ctx->cancel_baton));
svn_pool_clear(iterpool);
SVN_ERR(repos_to_wc_copy_single(APR_ARRAY_IDX(copy_pairs, i,
svn_client__copy_pair_t *),
same_repositories,
ra_session, adm_access,
ctx, iterpool));
}
SVN_ERR(svn_wc_adm_close(adm_access));
svn_pool_destroy(iterpool);
return SVN_NO_ERROR;
}
#define NEED_REPOS_REVNUM(revision) \
((revision.kind != svn_opt_revision_unspecified) \
&& (revision.kind != svn_opt_revision_working))
/* Perform all allocations in POOL. */
static svn_error_t *
setup_copy(svn_commit_info_t **commit_info_p,
const apr_array_header_t *sources,
const char *dst_path_in,
svn_boolean_t is_move,
svn_boolean_t force,
svn_boolean_t make_parents,
svn_client_ctx_t *ctx,
apr_pool_t *pool)
{
apr_array_header_t *copy_pairs = apr_array_make(pool, sources->nelts,
sizeof(struct copy_pair *));
svn_boolean_t srcs_are_urls, dst_is_url;
int i;
/* Check to see if the supplied peg revisions make sense. */
for (i = 0; i < sources->nelts; i++)
{
svn_client_copy_source_t *source =
((svn_client_copy_source_t **) (sources->elts))[i];
if (svn_path_is_url(source->path)
&& (source->peg_revision->kind == svn_opt_revision_base
|| source->peg_revision->kind == svn_opt_revision_committed
|| source->peg_revision->kind == svn_opt_revision_previous))
return svn_error_create
(SVN_ERR_CLIENT_BAD_REVISION, NULL,
_("Revision type requires a working copy path, not a URL"));
}
/* Are either of our paths URLs?
* Just check the first src_path. If there are more than one, we'll check
* for homogeneity amoung them down below. */
srcs_are_urls = svn_path_is_url(APR_ARRAY_IDX(sources, 0,
svn_client_copy_source_t *)->path);
dst_is_url = svn_path_is_url(dst_path_in);
/* If we have multiple source paths, it implies the dst_path is a directory
* we are moving or copying into. Populate the dst_paths array to contain
* a destination path for each of the source paths. */
if (sources->nelts > 1)
{
apr_pool_t *iterpool = svn_pool_create(pool);
for (i = 0; i < sources->nelts; i++)
{
svn_client_copy_source_t *source = APR_ARRAY_IDX(sources, i,
svn_client_copy_source_t *);
svn_client__copy_pair_t *pair = apr_palloc(pool, sizeof(*pair));
const char *src_basename;
svn_boolean_t src_is_url = svn_path_is_url(source->path);
svn_pool_clear(iterpool);
pair->src = apr_pstrdup(pool, source->path);
pair->src_op_revision = *source->revision;
pair->src_peg_revision = *source->peg_revision;
SVN_ERR(svn_opt_resolve_revisions(&pair->src_peg_revision,
&pair->src_op_revision,
src_is_url,
TRUE,
iterpool));
src_basename = svn_path_basename(pair->src, iterpool);
if (srcs_are_urls && ! dst_is_url)
src_basename = svn_path_uri_decode(src_basename, pool);
/* Check to see if all the sources are urls or all working copy
* paths. */
if (src_is_url != srcs_are_urls)
return svn_error_create
(SVN_ERR_UNSUPPORTED_FEATURE, NULL,
_("Cannot mix repository and working copy sources"));
pair->dst = svn_path_join(dst_path_in, src_basename, pool);
APR_ARRAY_PUSH(copy_pairs, svn_client__copy_pair_t *) = pair;
}
svn_pool_destroy(iterpool);
}
else
{
/* Only one source path. */
svn_client__copy_pair_t *pair = apr_palloc(pool, sizeof(*pair));
svn_client_copy_source_t *source =
APR_ARRAY_IDX(sources, 0, svn_client_copy_source_t *);
pair->src = apr_pstrdup(pool, source->path);
pair->src_op_revision = *source->revision;
pair->src_peg_revision = *source->peg_revision;
SVN_ERR(svn_opt_resolve_revisions(&pair->src_peg_revision,
&pair->src_op_revision,
svn_path_is_url(pair->src),
TRUE,
pool));
pair->dst = dst_path_in;
APR_ARRAY_PUSH(copy_pairs, svn_client__copy_pair_t *) = pair;
}
if (!srcs_are_urls && !dst_is_url)
{
apr_pool_t *iterpool = svn_pool_create(pool);
for (i = 0; i < copy_pairs->nelts; i++ )
{
svn_client__copy_pair_t *pair = APR_ARRAY_IDX(copy_pairs, i,
svn_client__copy_pair_t *);
svn_pool_clear(iterpool);
if (svn_path_is_child(pair->src, pair->dst, iterpool))
return svn_error_createf
(SVN_ERR_UNSUPPORTED_FEATURE, NULL,
_("Cannot copy path '%s' into its own child '%s'"),
svn_path_local_style(pair->src, pool),
svn_path_local_style(pair->dst, pool));
}
svn_pool_destroy(iterpool);
}
if (is_move)
{
if (srcs_are_urls == dst_is_url)
{
for (i = 0; i < copy_pairs->nelts; i++)
{
svn_client__copy_pair_t *pair = APR_ARRAY_IDX(copy_pairs, i,
svn_client__copy_pair_t *);
if (strcmp(pair->src, pair->dst) == 0)
return svn_error_createf
(SVN_ERR_UNSUPPORTED_FEATURE, NULL,
_("Cannot move path '%s' into itself"),
svn_path_local_style(pair->src, pool));
}
}
else
{
/* Disallow moves between the working copy and the repository. */
return svn_error_create
(SVN_ERR_UNSUPPORTED_FEATURE, NULL,
_("Moves between the working copy and the repository are not "
"supported"));
}
}
else
{
if (!srcs_are_urls)
{
/* If we are doing a wc->* move, but with an operational revision
other than the working copy revision, we are really doing a
repo->* move, because we're going to need to get the rev from the
repo. */
svn_boolean_t need_repos_op_rev = FALSE;
svn_boolean_t need_repos_peg_rev = FALSE;
/* Check to see if any revision is something other than
svn_opt_revision_unspecified or svn_opt_revision_working. */
for (i = 0; i < copy_pairs->nelts; i++)
{
svn_client__copy_pair_t *pair = APR_ARRAY_IDX(copy_pairs, i,
svn_client__copy_pair_t *);
if (NEED_REPOS_REVNUM(pair->src_op_revision))
need_repos_op_rev = TRUE;
if (NEED_REPOS_REVNUM(pair->src_peg_revision))
need_repos_peg_rev = TRUE;
if (need_repos_op_rev || need_repos_peg_rev)
break;
}
if (need_repos_op_rev || need_repos_peg_rev)
{
apr_pool_t *iterpool = svn_pool_create(pool);
for (i = 0; i < copy_pairs->nelts; i++)
{
const char *url;
svn_client__copy_pair_t *pair = APR_ARRAY_IDX(copy_pairs, i,
svn_client__copy_pair_t *);
/* We can convert the working copy path to a URL based on the
entries file. */
svn_wc_adm_access_t *adm_access; /* ### FIXME local */
const svn_wc_entry_t *entry;
svn_pool_clear(iterpool);
SVN_ERR(svn_wc_adm_probe_open3(&adm_access, NULL,
pair->src, FALSE, 0,
ctx->cancel_func,
ctx->cancel_baton,
iterpool));
SVN_ERR(svn_wc__entry_versioned(&entry, pair->src, adm_access,
FALSE, iterpool));
SVN_ERR(svn_wc_adm_close(adm_access));
url = (entry->copied ? entry->copyfrom_url : entry->url);
if (url == NULL)
return svn_error_createf
(SVN_ERR_ENTRY_MISSING_URL, NULL,
_("'%s' does not have a URL associated with it"),
svn_path_local_style(pair->src, pool));
pair->src = apr_pstrdup(pool, url);
if (!need_repos_peg_rev
|| pair->src_peg_revision.kind == svn_opt_revision_base)
{
/* Default the peg revision to that of the WC entry. */
pair->src_peg_revision.kind = svn_opt_revision_number;
pair->src_peg_revision.value.number =
(entry->copied ? entry->copyfrom_rev : entry->revision);
}
if (pair->src_op_revision.kind == svn_opt_revision_base)
{
/* Use the entry's revision as the operational rev. */
pair->src_op_revision.kind = svn_opt_revision_number;
pair->src_op_revision.value.number =
(entry->copied ? entry->copyfrom_rev : entry->revision);
}
}
svn_pool_destroy(iterpool);
srcs_are_urls = TRUE;
}
}
}
/* Now, call the right handler for the operation. */
if ((! srcs_are_urls) && (! dst_is_url))
{
*commit_info_p = NULL;
SVN_ERR(wc_to_wc_copy(copy_pairs, is_move, make_parents,
ctx, pool));
}
else if ((! srcs_are_urls) && (dst_is_url))
{
SVN_ERR(wc_to_repos_copy(commit_info_p, copy_pairs, make_parents,
ctx, pool));
}
else if ((srcs_are_urls) && (! dst_is_url))
{
*commit_info_p = NULL;
SVN_ERR(repos_to_wc_copy(copy_pairs, make_parents, ctx, pool));
}
else
{
SVN_ERR(repos_to_repos_copy(commit_info_p, copy_pairs, make_parents,
ctx, is_move, pool));
}
return SVN_NO_ERROR;
}
/* Public Interfaces */
svn_error_t *
svn_client_copy4(svn_commit_info_t **commit_info_p,
apr_array_header_t *sources,
const char *dst_path,
svn_boolean_t copy_as_child,
svn_boolean_t make_parents,
svn_client_ctx_t *ctx,
apr_pool_t *pool)
{
svn_error_t *err;
svn_commit_info_t *commit_info = NULL;
apr_pool_t *subpool = svn_pool_create(pool);
if (sources->nelts > 1 && !copy_as_child)
return svn_error_create(SVN_ERR_CLIENT_MULTIPLE_SOURCES_DISALLOWED,
NULL, NULL);
err = setup_copy(&commit_info,
sources, dst_path,
FALSE /* is_move */,
TRUE /* force, set to avoid deletion check */,
make_parents,
ctx,
subpool);
/* If the destination exists, try to copy the sources as children of the
destination. */
if (copy_as_child && err && (sources->nelts == 1)
&& (err->apr_err == SVN_ERR_ENTRY_EXISTS
|| err->apr_err == SVN_ERR_FS_ALREADY_EXISTS))
{
const char *src_path = APR_ARRAY_IDX(sources, 0,
svn_client_copy_source_t *)->path;
const char *src_basename;
svn_error_clear(err);
svn_pool_clear(subpool);
src_basename = svn_path_basename(src_path, subpool);
if (svn_path_is_url(src_path) && ! svn_path_is_url(dst_path))
src_basename = svn_path_uri_decode(src_basename, pool);
err = setup_copy(&commit_info,
sources,
svn_path_join(dst_path, src_basename, pool),
FALSE /* is_move */,
TRUE /* force, set to avoid deletion check */,
make_parents,
ctx,
subpool);
}
if (commit_info_p != NULL)
{
if (commit_info)
*commit_info_p = svn_commit_info_dup(commit_info, pool);
else
*commit_info_p = commit_info;
}
svn_pool_destroy(subpool);
return err;
}
svn_error_t *
svn_client_copy3(svn_commit_info_t **commit_info_p,
const char *src_path,
const svn_opt_revision_t *src_revision,
const char *dst_path,
svn_client_ctx_t *ctx,
apr_pool_t *pool)
{
apr_array_header_t *sources = apr_array_make(pool, 1,
sizeof(const svn_client_copy_source_t *));
svn_client_copy_source_t copy_source;
copy_source.path = src_path;
copy_source.revision = src_revision;
copy_source.peg_revision = src_revision;
APR_ARRAY_PUSH(sources, const svn_client_copy_source_t *) = &copy_source;
return svn_client_copy4(commit_info_p,
sources,
dst_path,
FALSE, FALSE,
ctx,
pool);
}
svn_error_t *
svn_client_copy2(svn_commit_info_t **commit_info_p,
const char *src_path,
const svn_opt_revision_t *src_revision,
const char *dst_path,
svn_client_ctx_t *ctx,
apr_pool_t *pool)
{
svn_error_t *err;
err = svn_client_copy3(commit_info_p, src_path, src_revision,
dst_path, ctx, pool);
/* If the target exists, try to copy the source as a child of the target.
This will obviously fail if target is not a directory, but that's exactly
what we want. */
if (err && (err->apr_err == SVN_ERR_ENTRY_EXISTS
|| err->apr_err == SVN_ERR_FS_ALREADY_EXISTS))
{
const char *src_basename = svn_path_basename(src_path, pool);
svn_error_clear(err);
return svn_client_copy3(commit_info_p, src_path, src_revision,
svn_path_join(dst_path, src_basename, pool),
ctx, pool);
}
return err;
}
svn_error_t *
svn_client_copy(svn_client_commit_info_t **commit_info_p,
const char *src_path,
const svn_opt_revision_t *src_revision,
const char *dst_path,
svn_client_ctx_t *ctx,
apr_pool_t *pool)
{
svn_commit_info_t *commit_info = NULL;
svn_error_t *err;
err = svn_client_copy2(&commit_info, src_path, src_revision, dst_path,
ctx, pool);
/* These structs have the same layout for the common fields. */
*commit_info_p = (svn_client_commit_info_t *) commit_info;
return err;
}
svn_error_t *
svn_client_move5(svn_commit_info_t **commit_info_p,
apr_array_header_t *src_paths,
const char *dst_path,
svn_boolean_t force,
svn_boolean_t move_as_child,
svn_boolean_t make_parents,
svn_client_ctx_t *ctx,
apr_pool_t *pool)
{
svn_commit_info_t *commit_info = NULL;
const svn_opt_revision_t head_revision
= { svn_opt_revision_head, { 0 } };
svn_error_t *err;
int i;
apr_pool_t *subpool = svn_pool_create(pool);
apr_array_header_t *sources = apr_array_make(pool, src_paths->nelts,
sizeof(const svn_client_copy_source_t *));
if (src_paths->nelts > 1 && !move_as_child)
return svn_error_create(SVN_ERR_CLIENT_MULTIPLE_SOURCES_DISALLOWED,
NULL, NULL);
for (i = 0; i < src_paths->nelts; i++)
{
const char *src_path = APR_ARRAY_IDX(src_paths, i, const char *);
svn_client_copy_source_t *copy_source = apr_palloc(pool,
sizeof(*copy_source));
copy_source->path = src_path;
copy_source->revision = &head_revision;
copy_source->peg_revision = &head_revision;
APR_ARRAY_PUSH(sources, svn_client_copy_source_t *) = copy_source;
}
err = setup_copy(&commit_info, sources, dst_path,
TRUE /* is_move */,
force,
make_parents,
ctx,
subpool);
/* If the destination exists, try to move the sources as children of the
destination. */
if (move_as_child && err && (src_paths->nelts == 1)
&& (err->apr_err == SVN_ERR_ENTRY_EXISTS
|| err->apr_err == SVN_ERR_FS_ALREADY_EXISTS))
{
const char *src_path = APR_ARRAY_IDX(src_paths, 0, const char *);
const char *src_basename;
svn_error_clear(err);
svn_pool_clear(subpool);
src_basename = svn_path_basename(src_path, pool);
err = setup_copy(&commit_info, sources,
svn_path_join(dst_path, src_basename, pool),
TRUE /* is_move */,
force,
make_parents,
ctx,
subpool);
}
if (commit_info_p != NULL)
{
if (commit_info)
*commit_info_p = svn_commit_info_dup(commit_info, pool);
else
*commit_info_p = commit_info;
}
svn_pool_destroy(subpool);
return err;
}
svn_error_t *
svn_client_move4(svn_commit_info_t **commit_info_p,
const char *src_path,
const char *dst_path,
svn_boolean_t force,
svn_client_ctx_t *ctx,
apr_pool_t *pool)
{
apr_array_header_t *src_paths =
apr_array_make(pool, 1, sizeof(const char *));
APR_ARRAY_PUSH(src_paths, const char *) = src_path;
return svn_client_move5(commit_info_p,
src_paths, dst_path, force, FALSE,
FALSE, ctx, pool);
}
svn_error_t *
svn_client_move3(svn_commit_info_t **commit_info_p,
const char *src_path,
const char *dst_path,
svn_boolean_t force,
svn_client_ctx_t *ctx,
apr_pool_t *pool)
{
svn_error_t *err;
err = svn_client_move4(commit_info_p, src_path, dst_path, force, ctx, pool);
/* If the target exists, try to move the source as a child of the target.
This will obviously fail if target is not a directory, but that's exactly
what we want. */
if (err && (err->apr_err == SVN_ERR_ENTRY_EXISTS
|| err->apr_err == SVN_ERR_FS_ALREADY_EXISTS))
{
const char *src_basename = svn_path_basename(src_path, pool);
svn_error_clear(err);
return svn_client_move4(commit_info_p, src_path,
svn_path_join(dst_path, src_basename, pool),
force, ctx, pool);
}
return err;
}
svn_error_t *
svn_client_move2(svn_client_commit_info_t **commit_info_p,
const char *src_path,
const char *dst_path,
svn_boolean_t force,
svn_client_ctx_t *ctx,
apr_pool_t *pool)
{
svn_commit_info_t *commit_info = NULL;
svn_error_t *err;
err = svn_client_move3(&commit_info, src_path, dst_path, force, ctx, pool);
/* These structs have the same layout for the common fields. */
*commit_info_p = (svn_client_commit_info_t *) commit_info;
return err;
}
svn_error_t *
svn_client_move(svn_client_commit_info_t **commit_info_p,
const char *src_path,
const svn_opt_revision_t *src_revision,
const char *dst_path,
svn_boolean_t force,
svn_client_ctx_t *ctx,
apr_pool_t *pool)
{
svn_commit_info_t *commit_info = NULL;
svn_error_t *err;
svn_client_copy_source_t copy_source;
apr_array_header_t *sources = apr_array_make(pool, 1,
sizeof(const svn_client_copy_source_t *));
/* It doesn't make sense to specify revisions in a move. */
/* ### todo: this check could fail wrongly. For example,
someone could pass in an svn_opt_revision_number that just
happens to be the HEAD. It's fair enough to punt then, IMHO,
and just demand that the user not specify a revision at all;
beats mucking up this function with RA calls and such. */
if (src_revision->kind != svn_opt_revision_unspecified
&& src_revision->kind != svn_opt_revision_head)
{
return svn_error_create
(SVN_ERR_UNSUPPORTED_FEATURE, NULL,
_("Cannot specify revisions (except HEAD) with move operations"));
}
copy_source.path = src_path;
copy_source.revision = src_revision;
copy_source.peg_revision = src_revision;
APR_ARRAY_PUSH(sources, const svn_client_copy_source_t *) = &copy_source;
err = setup_copy(&commit_info,
sources, dst_path,
TRUE /* is_move */,
force,
FALSE /* make_parents */,
ctx,
pool);
/* These structs have the same layout for the common fields. */
*commit_info_p = (svn_client_commit_info_t *) commit_info;
return err;
}