Author: julianfoad
Date: Wed May 27 14:40:34 2015
New Revision: 1682050
URL: http://svn.apache.org/r1682050
Log:
On the 'move-tracking-2' branch: Remove the 'since_rev' parameter from
editor methods, as it is not the right way to convey that information.
* subversion/include/private/svn_editor3e.h
(svn_editor3_delete,
svn_editor3_alter): Remove 'since_rev' parameter.
* subversion/libsvn_delta/editor3e.c
(svn_editor3_delete,
svn_editor3_alter): Remove 'since_rev' parameter.
(wrap_delete,
wrap_alter): Same, and update the forwarding calls.
* subversion/libsvn_delta/compat3e.c
(editor3_delete,
editor3_alter): Remove 'since_rev' parameter.
* subversion/svnmover/svnmover.c
(branch_merge_subtree_r,
move_by_branch_and_delete,
move_by_copy_and_delete,
do_move,
execute): Update calls.
Modified:
subversion/branches/move-tracking-2/subversion/include/private/svn_editor3e.h
subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3e.c
subversion/branches/move-tracking-2/subversion/libsvn_delta/editor3e.c
subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c
Modified:
subversion/branches/move-tracking-2/subversion/include/private/svn_editor3e.h
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/include/private/svn_editor3e.h?rev=1682050&r1=1682049&r2=1682050&view=diff
==============================================================================
---
subversion/branches/move-tracking-2/subversion/include/private/svn_editor3e.h
(original)
+++
subversion/branches/move-tracking-2/subversion/include/private/svn_editor3e.h
Wed May 27 14:40:34 2015
@@ -713,10 +713,6 @@ svn_editor3_copy_tree(svn_editor3_t *edi
* If the element @a eid is a subbranch root, then delete that subbranch
* (recursively). The element @a eid is not the root element of @a branch.
*
- * @a since_rev specifies the base revision on which this deletion was
- * performed: the server can consider the change "out of date" if a commit
- * since then has changed or deleted this element.
- *
* ### Options for Out-Of-Date Checking on Rebase
*
* We may want to specify what kind of OOD check takes place. The
@@ -748,7 +744,6 @@ svn_editor3_copy_tree(svn_editor3_t *edi
*/
svn_error_t *
svn_editor3_delete(svn_editor3_t *editor,
- svn_revnum_t since_rev,
svn_branch_state_t *branch,
svn_branch_eid_t eid);
@@ -756,10 +751,6 @@ svn_editor3_delete(svn_editor3_t *editor
* by @a eid.
* <SVN_EDITOR3_WITH_RESURRECTION> ### or resurrect it? </>
*
- * @a since_rev specifies the base revision on which this edit was
- * performed: the server can consider the change "out of date" if a commit
- * since then has changed or deleted this element.
- *
* Set the element's parent and name to @a new_parent_eid and @a new_name.
*
* Set the payload to @a new_payload, or if null then leave the payload
@@ -772,7 +763,6 @@ svn_editor3_delete(svn_editor3_t *editor
*/
svn_error_t *
svn_editor3_alter(svn_editor3_t *editor,
- svn_revnum_t since_rev,
svn_branch_state_t *branch,
svn_branch_eid_t eid,
svn_branch_eid_t new_parent_eid,
@@ -890,7 +880,6 @@ typedef svn_error_t *(*svn_editor3_cb_co
*/
typedef svn_error_t *(*svn_editor3_cb_delete_t)(
void *baton,
- svn_revnum_t since_rev,
svn_branch_state_t *branch,
svn_branch_eid_t eid,
apr_pool_t *scratch_pool);
@@ -899,7 +888,6 @@ typedef svn_error_t *(*svn_editor3_cb_de
*/
typedef svn_error_t *(*svn_editor3_cb_alter_t)(
void *baton,
- svn_revnum_t since_rev,
svn_branch_state_t *branch,
svn_branch_eid_t eid,
svn_branch_eid_t new_parent_eid,
Modified: subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3e.c
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3e.c?rev=1682050&r1=1682049&r2=1682050&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3e.c
(original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3e.c Wed
May 27 14:40:34 2015
@@ -1207,7 +1207,6 @@ editor3_copy_tree(void *baton,
/* An #svn_editor3_t method. */
static svn_error_t *
editor3_delete(void *baton,
- svn_revnum_t since_rev,
svn_branch_state_t *branch,
svn_branch_eid_t eid,
apr_pool_t *scratch_pool)
@@ -1223,7 +1222,6 @@ editor3_delete(void *baton,
/* An #svn_editor3_t method. */
static svn_error_t *
editor3_alter(void *baton,
- svn_revnum_t since_rev,
svn_branch_state_t *branch,
svn_branch_eid_t eid,
svn_branch_eid_t new_parent_eid,
Modified: subversion/branches/move-tracking-2/subversion/libsvn_delta/editor3e.c
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_delta/editor3e.c?rev=1682050&r1=1682049&r2=1682050&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_delta/editor3e.c
(original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_delta/editor3e.c Wed
May 27 14:40:34 2015
@@ -284,7 +284,6 @@ svn_editor3_copy_tree(svn_editor3_t *edi
svn_error_t *
svn_editor3_delete(svn_editor3_t *editor,
- svn_revnum_t since_rev,
svn_branch_state_t *branch,
svn_branch_eid_t eid)
{
@@ -293,14 +292,13 @@ svn_editor3_delete(svn_editor3_t *editor
/* TODO: verify this element exists (in initial state) */
DO_CALLBACK(editor, cb_delete,
- 3(since_rev, branch, eid));
+ 2(branch, eid));
return SVN_NO_ERROR;
}
svn_error_t *
svn_editor3_alter(svn_editor3_t *editor,
- svn_revnum_t since_rev,
svn_branch_state_t *branch,
svn_branch_eid_t eid,
svn_branch_eid_t new_parent_eid,
@@ -315,7 +313,7 @@ svn_editor3_alter(svn_editor3_t *editor,
/* TODO: verify this element exists (in initial state) */
DO_CALLBACK(editor, cb_alter,
- 6(since_rev, branch, eid,
+ 5(branch, eid,
new_parent_eid, new_name,
new_payload));
@@ -504,7 +502,6 @@ wrap_copy_tree(void *baton,
static svn_error_t *
wrap_delete(void *baton,
- svn_revnum_t since_rev,
svn_branch_state_t *branch,
svn_branch_eid_t eid,
apr_pool_t *scratch_pool)
@@ -514,13 +511,12 @@ wrap_delete(void *baton,
dbg(eb, scratch_pool, "%s : delete()",
eid_str(eid, scratch_pool));
SVN_ERR(svn_editor3_delete(eb->wrapped_editor,
- since_rev, branch, eid));
+ branch, eid));
return SVN_NO_ERROR;
}
static svn_error_t *
wrap_alter(void *baton,
- svn_revnum_t since_rev,
svn_branch_state_t *branch,
svn_branch_eid_t eid,
svn_branch_eid_t new_parent_eid,
@@ -534,7 +530,7 @@ wrap_alter(void *baton,
eid_str(eid, scratch_pool), eid_str(eid, scratch_pool),
eid_str(new_parent_eid, scratch_pool), new_name);
SVN_ERR(svn_editor3_alter(eb->wrapped_editor,
- since_rev, branch, eid,
+ branch, eid,
new_parent_eid, new_name, new_payload));
return SVN_NO_ERROR;
}
Modified: subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c
URL:
http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c?rev=1682050&r1=1682049&r2=1682050&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c
(original)
+++ subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c Wed May
27 14:40:34 2015
@@ -1100,7 +1100,7 @@ branch_merge_subtree_r(svn_editor3_t *ed
eid, result->name,
subbranch_str(tgt->branch, eid, scratch_pool));
- SVN_ERR(svn_editor3_alter(editor, tgt->rev, tgt->branch, eid,
+ SVN_ERR(svn_editor3_alter(editor, tgt->branch, eid,
result->parent_eid, result->name,
result->payload));
@@ -1111,7 +1111,7 @@ branch_merge_subtree_r(svn_editor3_t *ed
notify("D e%d %s%s",
eid, e_yca->name,
subbranch_str(yca->branch, eid, scratch_pool));
- SVN_ERR(svn_editor3_delete(editor, tgt->rev, tgt->branch, eid));
+ SVN_ERR(svn_editor3_delete(editor, tgt->branch, eid));
}
else if (result)
{
@@ -1505,12 +1505,12 @@ move_by_branch_and_delete(svn_editor3_t
its root from the outer branch instead. */
if (el_rev->eid != el_rev->branch->root_eid)
{
- SVN_ERR(svn_editor3_delete(editor, el_rev->rev,
+ SVN_ERR(svn_editor3_delete(editor,
el_rev->branch, el_rev->eid));
}
else
{
- SVN_ERR(svn_editor3_delete(editor, el_rev->rev,
+ SVN_ERR(svn_editor3_delete(editor,
el_rev->branch->outer_branch,
el_rev->branch->outer_eid));
}
SVN_ERR(svn_branch_instantiate_subtree(to_branch,
@@ -1541,7 +1541,7 @@ move_by_copy_and_delete(svn_editor3_t *e
SVN_ERR(svn_editor3_copy_tree(editor, el_rev,
to_branch,
to_parent_eid, to_name));
- SVN_ERR(svn_editor3_delete(editor, el_rev->rev,
+ SVN_ERR(svn_editor3_delete(editor,
el_rev->branch, el_rev->eid));
return SVN_NO_ERROR;
}
@@ -1569,7 +1569,7 @@ do_move(svn_editor3_t *editor,
scratch_pool))
{
/* Move within same branch */
- SVN_ERR(svn_editor3_alter(editor, el_rev->rev,
+ SVN_ERR(svn_editor3_alter(editor,
el_rev->branch, el_rev->eid,
to_parent_el_rev->eid, to_name,
NULL /* "no change" */));
@@ -2019,7 +2019,7 @@ execute(const apr_array_header_t *action
VERIFY_REV_UNSPECIFIED("rm", 0);
VERIFY_EID_EXISTS("rm", 0);
- SVN_ERR(svn_editor3_delete(editor, arg[0]->el_rev->rev,
+ SVN_ERR(svn_editor3_delete(editor,
arg[0]->el_rev->branch,
arg[0]->el_rev->eid));
notify("D %s", action->relpath[0]);
made_changes = TRUE;
@@ -2075,7 +2075,7 @@ execute(const apr_array_header_t *action
if (arg[1]->el_rev->eid >= 0)
{
- SVN_ERR(svn_editor3_alter(editor, SVN_INVALID_REVNUM,
+ SVN_ERR(svn_editor3_alter(editor,
arg[1]->el_rev->branch,
arg[1]->el_rev->eid,
arg[1]->parent_el_rev->eid,
arg[1]->path_name,
payload));
