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 2014/09/10 14:44:06 UTC
svn commit: r1623981 - in /subversion/trunk/subversion/libsvn_client: copy.c
mtcc.c util.c
Author: rhuijben
Date: Wed Sep 10 12:44:06 2014
New Revision: 1623981
URL: http://svn.apache.org/r1623981
Log:
Tweak svn_client_commit_item3_t creation in a few places, to fill more
fields in a proper way.
* subversion/libsvn_client/copy.c
(repos_to_repos_copy): Mark the items added as a proper copy. Create
delete item as proper item.
* subversion/libsvn_client/mtcc.c
(add_commit_items): Mark copies as copy.
* subversion/libsvn_client/util.c
(svn_client_commit_item3_create): Initialize revisions as SVN_INVALID_REVNUM
instead of r0.
Modified:
subversion/trunk/subversion/libsvn_client/copy.c
subversion/trunk/subversion/libsvn_client/mtcc.c
subversion/trunk/subversion/libsvn_client/util.c
Modified: subversion/trunk/subversion/libsvn_client/copy.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/copy.c?rev=1623981&r1=1623980&r2=1623981&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/copy.c (original)
+++ subversion/trunk/subversion/libsvn_client/copy.c Wed Sep 10 12:44:06 2014
@@ -1101,12 +1101,15 @@ repos_to_repos_copy(const apr_array_head
item = svn_client_commit_item3_create(pool);
item->url = svn_path_url_add_component2(top_url, info->dst_path,
pool);
- item->state_flags = SVN_CLIENT_COMMIT_ITEM_ADD;
+ item->state_flags = SVN_CLIENT_COMMIT_ITEM_ADD
+ | SVN_CLIENT_COMMIT_ITEM_IS_COPY;
+ item->copyfrom_url = info->src_url;
+ item->copyfrom_rev = info->src_revnum;
APR_ARRAY_PUSH(commit_items, svn_client_commit_item3_t *) = item;
if (is_move && (! info->resurrection))
{
- item = apr_pcalloc(pool, sizeof(*item));
+ item = svn_client_commit_item3_create(pool);
item->url = svn_path_url_add_component2(top_url, info->src_path,
pool);
item->state_flags = SVN_CLIENT_COMMIT_ITEM_DELETE;
Modified: subversion/trunk/subversion/libsvn_client/mtcc.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/mtcc.c?rev=1623981&r1=1623980&r2=1623981&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/mtcc.c (original)
+++ subversion/trunk/subversion/libsvn_client/mtcc.c Wed Sep 10 12:44:06 2014
@@ -1250,6 +1250,7 @@ add_commit_items(mtcc_op_t *op,
op->src_relpath,
result_pool);
item->copyfrom_rev = op->src_rev;
+ item->state_flags |= SVN_CLIENT_COMMIT_ITEM_IS_COPY;
}
else
item->copyfrom_rev = SVN_INVALID_REVNUM;
Modified: subversion/trunk/subversion/libsvn_client/util.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/util.c?rev=1623981&r1=1623980&r2=1623981&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/util.c (original)
+++ subversion/trunk/subversion/libsvn_client/util.c Wed Sep 10 12:44:06 2014
@@ -138,7 +138,12 @@ svn_client__pathrev_fspath(const svn_cli
svn_client_commit_item3_t *
svn_client_commit_item3_create(apr_pool_t *pool)
{
- return apr_pcalloc(pool, sizeof(svn_client_commit_item3_t));
+ svn_client_commit_item3_t *item = apr_pcalloc(pool, sizeof(*item));
+
+ item->revision = SVN_INVALID_REVNUM;
+ item->copyfrom_rev = SVN_INVALID_REVNUM;
+
+ return item;
}
svn_client_commit_item3_t *