You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ph...@apache.org on 2010/04/27 12:17:57 UTC
svn commit: r938396 - /subversion/trunk/subversion/libsvn_client/copy.c
Author: philip
Date: Tue Apr 27 10:17:57 2010
New Revision: 938396
URL: http://svn.apache.org/viewvc?rev=938396&view=rev
Log:
* subversion/libsvn_client/copy.c
(wc_to_repos_copy): Use node interface to remove an svn_wc_entry_t.
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=938396&r1=938395&r2=938396&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/copy.c (original)
+++ subversion/trunk/subversion/libsvn_client/copy.c Tue Apr 27 10:17:57 2010
@@ -1149,7 +1149,6 @@ wc_to_repos_copy(svn_commit_info_t **com
void *commit_baton;
apr_hash_t *committables;
apr_array_header_t *commit_items;
- const svn_wc_entry_t *entry;
apr_pool_t *iterpool;
apr_array_header_t *new_dirs = NULL;
apr_hash_t *commit_revprops;
@@ -1166,13 +1165,17 @@ wc_to_repos_copy(svn_commit_info_t **com
for (i = 0; i < copy_pairs->nelts; i++)
{
+ svn_node_kind_t kind;
svn_client__copy_pair_t *pair = APR_ARRAY_IDX(copy_pairs, i,
svn_client__copy_pair_t *);
svn_pool_clear(iterpool);
/* Sanity check if the source path is versioned. */
- SVN_ERR(svn_wc__get_entry_versioned(&entry, ctx->wc_ctx, pair->src,
- svn_node_unknown, FALSE, FALSE,
- iterpool, iterpool));
+ SVN_ERR(svn_wc__node_get_kind(&kind, ctx->wc_ctx, pair->src, FALSE,
+ iterpool));
+ if (kind == svn_node_unknown)
+ return svn_error_createf(SVN_ERR_NODE_UNKNOWN_KIND, NULL,
+ _("Path '%s' does not exist"),
+ svn_dirent_local_style(pair->src, pool));
}
/* Determine the longest common ancestor for the destinations, and open an RA
@@ -1218,10 +1221,8 @@ wc_to_repos_copy(svn_commit_info_t **com
svn_pool_clear(iterpool);
- SVN_ERR(svn_wc__get_entry_versioned(&entry, ctx->wc_ctx, pair->src,
- svn_node_unknown, FALSE, FALSE,
- iterpool, iterpool));
- pair->src_revnum = entry->revision;
+ SVN_ERR(svn_wc__node_get_base_rev(&pair->src_revnum, ctx->wc_ctx,
+ pair->src, iterpool));
dst_rel = svn_path_uri_decode(svn_uri_is_child(top_dst_url,
pair->dst,
@@ -1338,9 +1339,6 @@ wc_to_repos_copy(svn_commit_info_t **com
SVN_ERR(calculate_target_mergeinfo(ra_session, &mergeinfo, pair->src,
NULL, SVN_INVALID_REVNUM,
ctx, iterpool));
- SVN_ERR(svn_wc__get_entry_versioned(&entry, ctx->wc_ctx, pair->src,
- svn_node_unknown, FALSE, FALSE,
- pool, pool));
SVN_ERR(svn_client__parse_mergeinfo(&wc_mergeinfo, ctx->wc_ctx,
pair->src, iterpool, iterpool));
if (wc_mergeinfo && mergeinfo)
Re: svn commit: r938396 - /subversion/trunk/subversion/libsvn_client/copy.c
Posted by Philip Martin <ph...@wandisco.com>.
Greg Stein <gs...@gmail.com> writes:
> Euh... nope. "does not exist" is svn_node_none.
r938404. Thanks!
--
Philip
Re: svn commit: r938396 - /subversion/trunk/subversion/libsvn_client/copy.c
Posted by Greg Stein <gs...@gmail.com>.
On Tue, Apr 27, 2010 at 06:17, <ph...@apache.org> wrote:
> +++ subversion/trunk/subversion/libsvn_client/copy.c Tue Apr 27 10:17:57 2010
>...
> @@ -1166,13 +1165,17 @@ wc_to_repos_copy(svn_commit_info_t **com
>
> for (i = 0; i < copy_pairs->nelts; i++)
> {
> + svn_node_kind_t kind;
> svn_client__copy_pair_t *pair = APR_ARRAY_IDX(copy_pairs, i,
> svn_client__copy_pair_t *);
> svn_pool_clear(iterpool);
> /* Sanity check if the source path is versioned. */
> - SVN_ERR(svn_wc__get_entry_versioned(&entry, ctx->wc_ctx, pair->src,
> - svn_node_unknown, FALSE, FALSE,
> - iterpool, iterpool));
> + SVN_ERR(svn_wc__node_get_kind(&kind, ctx->wc_ctx, pair->src, FALSE,
> + iterpool));
> + if (kind == svn_node_unknown)
> + return svn_error_createf(SVN_ERR_NODE_UNKNOWN_KIND, NULL,
> + _("Path '%s' does not exist"),
> + svn_dirent_local_style(pair->src, pool));
Euh... nope. "does not exist" is svn_node_none.
>...
Cheers,
-g