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/05/05 15:38:40 UTC
svn commit: r941283 -
/subversion/trunk/subversion/libsvn_client/commit_util.c
Author: philip
Date: Wed May 5 13:38:39 2010
New Revision: 941283
URL: http://svn.apache.org/viewvc?rev=941283&view=rev
Log:
* subversion/libsvn_client/commit_util.c
(harvest_committables): Path is already an abspath, use wc-ng interface.
Modified:
subversion/trunk/subversion/libsvn_client/commit_util.c
Modified: subversion/trunk/subversion/libsvn_client/commit_util.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/commit_util.c?rev=941283&r1=941282&r2=941283&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/commit_util.c (original)
+++ subversion/trunk/subversion/libsvn_client/commit_util.c Wed May 5 13:38:39 2010
@@ -1156,16 +1156,19 @@ harvest_copy_committables(void *baton, v
const svn_wc_entry_t *entry;
svn_client__copy_pair_t *pair =
*(svn_client__copy_pair_t **)item;
- const char *src_abspath;
+ const char *url;
/* Read the entry for this SRC. */
- /* ### TODO: Is this conversion really necessary? */
- SVN_ERR(svn_dirent_get_absolute(&src_abspath,
- pair->src_abspath_or_url, pool));
- SVN_ERR(svn_wc__get_entry_versioned(&entry, btn->ctx->wc_ctx, src_abspath,
+ SVN_ERR_ASSERT(svn_dirent_is_absolute(pair->src_abspath_or_url));
+ SVN_ERR(svn_wc__get_entry_versioned(&entry, btn->ctx->wc_ctx,
+ pair->src_abspath_or_url,
svn_node_unknown, FALSE, FALSE,
pool, pool));
+ /* The node's URL is used as the copyfrom URL */
+ SVN_ERR(svn_wc__node_get_url(&url, btn->ctx->wc_ctx, pair->src_abspath_or_url,
+ pool, pool));
+
/* Handle this SRC. Because add_committable() uses the hash pool to
allocate the new commit_item, we can safely use the iterpool here. */
return harvest_committables(btn->committables, NULL,