You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2015/08/25 18:40:10 UTC
svn commit: r1697729 - /subversion/trunk/subversion/libsvn_client/copy.c
Author: rhuijben
Date: Tue Aug 25 16:40:10 2015
New Revision: 1697729
URL: http://svn.apache.org/r1697729
Log:
Following up on r1697725, assume that abspaths are passed in a few
more places.
* subversion/libsvn_client/copy.c
(repos_to_wc_copy_locked): Assume abspath is passed.
(repos_to_wc_copy): Rename local variable to document that it is an
absolute path.
Modified:
subversion/trunk/subversion/libsvn_client/copy.c
Modified: subversion/trunk/subversion/libsvn_client/copy.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/copy.c?rev=1697729&r1=1697728&r2=1697729&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/copy.c (original)
+++ subversion/trunk/subversion/libsvn_client/copy.c Tue Aug 25 16:40:10 2015
@@ -2562,7 +2562,7 @@ repos_to_wc_copy_single(svn_boolean_t *t
static svn_error_t *
repos_to_wc_copy_locked(svn_boolean_t *timestamp_sleep,
const apr_array_header_t *copy_pairs,
- const char *top_dst_path,
+ const char *top_dst_abspath,
svn_boolean_t ignore_externals,
svn_boolean_t pin_externals,
const apr_hash_t *externals_to_pin,
@@ -2582,7 +2582,6 @@ repos_to_wc_copy_locked(svn_boolean_t *t
/* Decide whether the two repositories are the same or not. */
{
- const char *parent;
const char *parent_abspath;
const char *src_uuid, *dst_uuid;
@@ -2593,11 +2592,10 @@ repos_to_wc_copy_locked(svn_boolean_t *t
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)
- parent = svn_dirent_dirname(top_dst_path, scratch_pool);
+ parent_abspath = svn_dirent_dirname(top_dst_abspath, scratch_pool);
else
- parent = top_dst_path;
+ parent_abspath = top_dst_abspath;
- SVN_ERR(svn_dirent_get_absolute(&parent_abspath, parent, scratch_pool));
SVN_ERR(svn_client_get_repos_root(NULL /* root_url */, &dst_uuid,
parent_abspath, ctx,
iterpool, iterpool));
@@ -2638,7 +2636,7 @@ repos_to_wc_copy(svn_boolean_t *timestam
apr_pool_t *pool)
{
svn_ra_session_t *ra_session;
- const char *top_src_url, *top_dst_path;
+ const char *top_src_url, *top_dst_abspath;
apr_pool_t *iterpool = svn_pool_create(pool);
const char *lock_abspath;
int i;
@@ -2663,13 +2661,13 @@ repos_to_wc_copy(svn_boolean_t *timestam
pair->src_abspath_or_url = apr_pstrdup(pool, src);
}
- SVN_ERR(get_copy_pair_ancestors(copy_pairs, &top_src_url, &top_dst_path,
+ SVN_ERR(get_copy_pair_ancestors(copy_pairs, &top_src_url, &top_dst_abspath,
NULL, pool));
- lock_abspath = top_dst_path;
+ lock_abspath = top_dst_abspath;
if (copy_pairs->nelts == 1)
{
top_src_url = svn_uri_dirname(top_src_url, pool);
- lock_abspath = svn_dirent_dirname(top_dst_path, pool);
+ lock_abspath = svn_dirent_dirname(top_dst_abspath, pool);
}
/* Open a repository session to the longest common src ancestor. We do not
@@ -2741,7 +2739,7 @@ repos_to_wc_copy(svn_boolean_t *timestam
SVN_WC__CALL_WITH_WRITE_LOCK(
repos_to_wc_copy_locked(timestamp_sleep,
- copy_pairs, top_dst_path, ignore_externals,
+ copy_pairs, top_dst_abspath, ignore_externals,
pin_externals, externals_to_pin,
ra_session, ctx, pool),
ctx->wc_ctx, lock_abspath, FALSE, pool);