You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2015/10/22 17:57:33 UTC
svn commit: r1710045 - in /subversion/branches/move-tracking-2/subversion:
include/private/ libsvn_delta/ libsvn_ra/ libsvn_ra_local/ libsvn_repos/
libsvn_wc/ svnmover/
Author: julianfoad
Date: Thu Oct 22 15:57:33 2015
New Revision: 1710045
URL: http://svn.apache.org/viewvc?rev=1710045&view=rev
Log:
On the 'move-tracking-2' branch: Rename some identifiers away from 'editor3'
towards 'branch_compat'.
This continues the refactoring to use branch txn/state objects instead of
a single 'editor'.
Modified:
subversion/branches/move-tracking-2/subversion/include/private/svn_branch.h
subversion/branches/move-tracking-2/subversion/include/private/svn_editor3e.h
subversion/branches/move-tracking-2/subversion/include/private/svn_ra_private.h
subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3e.c
subversion/branches/move-tracking-2/subversion/libsvn_ra/ra_loader.c
subversion/branches/move-tracking-2/subversion/libsvn_ra_local/ra_plugin.c
subversion/branches/move-tracking-2/subversion/libsvn_repos/commit.c
subversion/branches/move-tracking-2/subversion/libsvn_wc/deprecated.c
subversion/branches/move-tracking-2/subversion/libsvn_wc/update_editor.c
subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c
subversion/branches/move-tracking-2/subversion/svnmover/svnmover.h
Modified: subversion/branches/move-tracking-2/subversion/include/private/svn_branch.h
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/include/private/svn_branch.h?rev=1710045&r1=1710044&r2=1710045&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/include/private/svn_branch.h (original)
+++ subversion/branches/move-tracking-2/subversion/include/private/svn_branch.h Thu Oct 22 15:57:33 2015
@@ -70,7 +70,7 @@
* 'svn_branch_state_t' for the individual branches in it. A flat tree is
* represented by 'svn_branch_subtree_t'. But there is currently not a
* clean separation; there is some overlap and some warts such as the
- * 'svn_editor3_sequence_point' method.
+ * 'svn_branch_txn_sequence_point' method.
*/
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=1710045&r1=1710044&r2=1710045&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 Thu Oct 22 15:57:33 2015
@@ -1038,7 +1038,7 @@ svn_editor3__get_debug_editor(svn_editor
* file therein, lives at least for the life time of @a result_pool.
* @a scratch_pool is provided for temporary allocations.
*/
-typedef svn_error_t *(*svn_editor3__shim_fetch_func_t)(
+typedef svn_error_t *(*svn_branch_compat__shim_fetch_func_t)(
svn_node_kind_t *kind,
apr_hash_t **props,
svn_stringbuf_t **file_text,
@@ -1056,14 +1056,14 @@ svn_error_t *
svn_payload_fetch(svn_element_payload_t **payload_p,
svn_branch_txn_t *txn,
svn_element_branch_ref_t branch_ref,
- svn_editor3__shim_fetch_func_t fetch_func,
+ svn_branch_compat__shim_fetch_func_t fetch_func,
void *fetch_baton,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
/* An object for communicating out-of-band details between an Ev1-to-Ev3
* shim and an Ev3-to-Ev1 shim. */
-typedef struct svn_editor3__shim_connector_t svn_editor3__shim_connector_t;
+typedef struct svn_branch_compat__shim_connector_t svn_branch_compat__shim_connector_t;
/* Return an Ev3 editor in *EDITOR_P which will drive the Ev1 delta
* editor DEDITOR/DEDIT_BATON.
@@ -1103,14 +1103,14 @@ typedef struct svn_editor3__shim_connect
* allocations.
*/
svn_error_t *
-svn_editor3__ev3_from_delta_for_commit(
+svn_branch_compat_txn_from_delta_for_commit(
svn_branch_txn_t **txn_p,
- svn_editor3__shim_connector_t **shim_connector,
+ svn_branch_compat__shim_connector_t **shim_connector,
const svn_delta_editor_t *deditor,
void *dedit_baton,
svn_branch_txn_t *branching_txn,
const char *repos_root_url,
- svn_editor3__shim_fetch_func_t fetch_func,
+ svn_branch_compat__shim_fetch_func_t fetch_func,
void *fetch_baton,
svn_cancel_func_t cancel_func,
void *cancel_baton,
@@ -1135,15 +1135,15 @@ svn_editor3__ev3_from_delta_for_commit(
* allocations.
*/
svn_error_t *
-svn_editor3__delta_from_ev3_for_commit(
+svn_branch_compat_delta_from_txn_for_commit(
const svn_delta_editor_t **deditor,
void **dedit_baton,
svn_branch_txn_t *edit_txn,
const char *repos_root_url,
const char *base_relpath,
- svn_editor3__shim_fetch_func_t fetch_func,
+ svn_branch_compat__shim_fetch_func_t fetch_func,
void *fetch_baton,
- const svn_editor3__shim_connector_t *shim_connector,
+ const svn_branch_compat__shim_connector_t *shim_connector,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
@@ -1158,21 +1158,21 @@ svn_editor3__delta_from_ev3_for_commit(
* original or copy-from kind/properties/text for a path being committed.
*/
svn_error_t *
-svn_editor3__insert_shims(
+svn_branch_compat__insert_shims(
const svn_delta_editor_t **new_deditor,
void **new_dedit_baton,
const svn_delta_editor_t *old_deditor,
void *old_dedit_baton,
const char *repos_root,
const char *base_relpath,
- svn_editor3__shim_fetch_func_t fetch_func,
+ svn_branch_compat__shim_fetch_func_t fetch_func,
void *fetch_baton,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
/* A callback for declaring the target revision of an update or switch.
*/
-typedef svn_error_t *(*svn_editor3__set_target_revision_func_t)(
+typedef svn_error_t *(*svn_branch_compat__set_target_revision_func_t)(
void *baton,
svn_revnum_t target_revision,
apr_pool_t *scratch_pool);
@@ -1190,21 +1190,21 @@ typedef struct svn_update_editor3_t {
* to be called before driving the editor. It has its own baton, rather
* than using the editor's baton, so that the editor can be replaced (by
* a wrapper editor, typically) without having to wrap this callback. */
- svn_editor3__set_target_revision_func_t set_target_revision_func;
+ svn_branch_compat__set_target_revision_func_t set_target_revision_func;
void *set_target_revision_baton;
} svn_update_editor3_t;
/* Like svn_delta__ev3_from_delta_for_commit() but for an update editor.
*/
svn_error_t *
-svn_editor3__ev3_from_delta_for_update(
+svn_branch_compat_txn_from_delta_for_update(
svn_update_editor3_t **editor_p,
const svn_delta_editor_t *deditor,
void *dedit_baton,
svn_branch_txn_t *branching_txn,
const char *repos_root_url,
const char *base_repos_relpath,
- svn_editor3__shim_fetch_func_t fetch_func,
+ svn_branch_compat__shim_fetch_func_t fetch_func,
void *fetch_baton,
svn_cancel_func_t cancel_func,
void *cancel_baton,
@@ -1214,13 +1214,13 @@ svn_editor3__ev3_from_delta_for_update(
/* Like svn_delta__delta_from_ev3_for_commit() but for an update editor.
*/
svn_error_t *
-svn_editor3__delta_from_ev3_for_update(
+svn_branch_compat_delta_from_txn_for_update(
const svn_delta_editor_t **deditor,
void **dedit_baton,
svn_update_editor3_t *update_editor,
const char *repos_root_url,
const char *base_repos_relpath,
- svn_editor3__shim_fetch_func_t fetch_func,
+ svn_branch_compat__shim_fetch_func_t fetch_func,
void *fetch_baton,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool);
Modified: subversion/branches/move-tracking-2/subversion/include/private/svn_ra_private.h
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/include/private/svn_ra_private.h?rev=1710045&r1=1710044&r2=1710045&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/include/private/svn_ra_private.h (original)
+++ subversion/branches/move-tracking-2/subversion/include/private/svn_ra_private.h Thu Oct 22 15:57:33 2015
@@ -312,7 +312,7 @@ svn_ra__replay_ev2(svn_ra_session_t *ses
*/
svn_error_t *
svn_ra_load_branching_state(svn_branch_txn_t **branching_txn_p,
- svn_editor3__shim_fetch_func_t *fetch_func,
+ svn_branch_compat__shim_fetch_func_t *fetch_func,
void **fetch_baton,
svn_ra_session_t *session,
const char *branch_info_dir,
@@ -326,15 +326,15 @@ svn_ra_load_branching_state(svn_branch_t
* directory, otherwise store branching info in revprops.
*/
svn_error_t *
-svn_ra_get_commit_editor_ev3(svn_ra_session_t *session,
- svn_branch_txn_t **edit_txn_p,
- apr_hash_t *revprop_table,
- svn_commit_callback2_t commit_callback,
- void *commit_baton,
- apr_hash_t *lock_tokens,
- svn_boolean_t keep_locks,
- const char *branch_info_dir,
- apr_pool_t *pool);
+svn_ra_get_commit_txn(svn_ra_session_t *session,
+ svn_branch_txn_t **edit_txn_p,
+ apr_hash_t *revprop_table,
+ svn_commit_callback2_t commit_callback,
+ void *commit_baton,
+ apr_hash_t *lock_tokens,
+ svn_boolean_t keep_locks,
+ const char *branch_info_dir,
+ apr_pool_t *pool);
/* Ev3 version of svn_ra_do_update3(). */
svn_error_t *
@@ -367,7 +367,7 @@ svn_ra_do_switch4(svn_ra_session_t *sess
/* Fetch kind and/or props and/or text.
*
- * Implements svn_editor3__shim_fetch_func_t. */
+ * Implements svn_branch_compat__shim_fetch_func_t. */
svn_error_t *
svn_ra_fetch(svn_node_kind_t *kind_p,
apr_hash_t **props_p,
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=1710045&r1=1710044&r2=1710045&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3e.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3e.c Thu Oct 22 15:57:33 2015
@@ -82,7 +82,7 @@ peg_path_str(svn_pathrev_t loc,
* The shim connector enables a more exact round-trip conversion from an
* Ev1 drive to Ev3 and back to Ev1.
*/
-struct svn_editor3__shim_connector_t
+struct svn_branch_compat__shim_connector_t
{
/* Set to true if and when an Ev1 receiving shim receives an absolute
* path (prefixed with '/') from the delta edit, and causes the Ev1
@@ -98,7 +98,7 @@ struct svn_editor3__shim_connector_t
* Otherwise, default calls will be used.
*
* (Possibly more useful for update editors than for commit editors?) */
- svn_editor3__set_target_revision_func_t target_revision_func;
+ svn_branch_compat__set_target_revision_func_t target_revision_func;
/* If not null, a callback that the Ev3 driver may call to
* provide the "base revision" of the root directory, even if it is not
@@ -120,28 +120,28 @@ struct svn_editor3__shim_connector_t
};
svn_error_t *
-svn_editor3__insert_shims(
+svn_branch_compat__insert_shims(
const svn_delta_editor_t **new_deditor,
void **new_dedit_baton,
const svn_delta_editor_t *old_deditor,
void *old_dedit_baton,
const char *repos_root,
const char *base_relpath,
- svn_editor3__shim_fetch_func_t fetch_func,
+ svn_branch_compat__shim_fetch_func_t fetch_func,
void *fetch_baton,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
#if 0
svn_branch_txn_t *edit_txn;
- svn_editor3__shim_connector_t *shim_connector;
+ svn_branch_compat__shim_connector_t *shim_connector;
#ifdef SVN_DEBUG
/*SVN_ERR(svn_delta__get_debug_editor(&old_deditor, &old_dedit_baton,
old_deditor, old_dedit_baton,
"[OUT] ", result_pool));*/
#endif
- SVN_ERR(svn_editor3__ev3_from_delta_for_commit(
+ SVN_ERR(svn_branch_compat_txn_from_delta_for_commit(
&edit_txn,
&shim_connector,
old_deditor, old_dedit_baton,
@@ -150,7 +150,7 @@ svn_editor3__insert_shims(
fetch_func, fetch_baton,
NULL, NULL /*cancel*/,
result_pool, scratch_pool));
- SVN_ERR(svn_editor3__delta_from_ev3_for_commit(
+ SVN_ERR(svn_branch_compat_delta_from_txn_for_commit(
new_deditor, new_dedit_baton,
edit_txn,
repos_root, base_relpath,
@@ -425,15 +425,15 @@ delete_subtree(apr_hash_t *changes,
*/
svn_error_t *
-svn_editor3__delta_from_ev3_for_commit(
+svn_branch_compat_delta_from_txn_for_commit(
const svn_delta_editor_t **deditor,
void **dedit_baton,
svn_branch_txn_t *edit_txn,
const char *repos_root_url,
const char *base_relpath,
- svn_editor3__shim_fetch_func_t fetch_func,
+ svn_branch_compat__shim_fetch_func_t fetch_func,
void *fetch_baton,
- const svn_editor3__shim_connector_t *shim_connector,
+ const svn_branch_compat__shim_connector_t *shim_connector,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
@@ -443,18 +443,18 @@ svn_editor3__delta_from_ev3_for_commit(
}
svn_error_t *
-svn_editor3__delta_from_ev3_for_update(
+svn_branch_compat_delta_from_txn_for_update(
const svn_delta_editor_t **deditor,
void **dedit_baton,
svn_update_editor3_t *update_editor,
const char *repos_root_url,
const char *base_repos_relpath,
- svn_editor3__shim_fetch_func_t fetch_func,
+ svn_branch_compat__shim_fetch_func_t fetch_func,
void *fetch_baton,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
- svn_editor3__shim_connector_t *shim_connector
+ svn_branch_compat__shim_connector_t *shim_connector
= apr_pcalloc(result_pool, sizeof(*shim_connector));
shim_connector->target_revision_func = update_editor->set_target_revision_func;
@@ -463,7 +463,7 @@ svn_editor3__delta_from_ev3_for_update(
shim_connector->ev1_absolute_paths /*...*/;
#endif
- SVN_ERR(svn_editor3__delta_from_ev3_for_commit(
+ SVN_ERR(svn_branch_compat_delta_from_txn_for_commit(
deditor, dedit_baton,
update_editor->edit_txn,
repos_root_url, base_repos_relpath,
@@ -536,7 +536,7 @@ typedef struct ev3_from_delta_baton_t
void *dedit_baton;
/* Callbacks */
- svn_editor3__shim_fetch_func_t fetch_func;
+ svn_branch_compat__shim_fetch_func_t fetch_func;
void *fetch_baton;
/* The Ev1 root directory baton if we have opened the root, else null. */
@@ -642,7 +642,7 @@ static svn_error_t *
fetch_base_props(apr_hash_t **base_props,
apr_hash_t *changes,
const char *repos_relpath,
- svn_editor3__shim_fetch_func_t fetch_func,
+ svn_branch_compat__shim_fetch_func_t fetch_func,
void *fetch_baton,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
@@ -1088,7 +1088,7 @@ svn_error_t *
svn_payload_fetch(svn_element_payload_t **payload_p,
svn_branch_txn_t *txn,
svn_element_branch_ref_t branch_ref,
- svn_editor3__shim_fetch_func_t fetch_func,
+ svn_branch_compat__shim_fetch_func_t fetch_func,
void *fetch_baton,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
@@ -1858,7 +1858,7 @@ compat_branch_txn_abort(svn_branch_txn_t
typedef struct wrap_fetch_baton_t
{
/* Wrapped fetcher */
- svn_editor3__shim_fetch_func_t fetch_func;
+ svn_branch_compat__shim_fetch_func_t fetch_func;
void *fetch_baton;
} wrap_fetch_baton_t;
@@ -1901,14 +1901,14 @@ wrap_fetch_func(svn_node_kind_t *kind,
}
svn_error_t *
-svn_editor3__ev3_from_delta_for_commit(
+svn_branch_compat_txn_from_delta_for_commit(
svn_branch_txn_t **txn_p,
- svn_editor3__shim_connector_t **shim_connector,
+ svn_branch_compat__shim_connector_t **shim_connector,
const svn_delta_editor_t *deditor,
void *dedit_baton,
svn_branch_txn_t *branching_txn,
const char *repos_root_url,
- svn_editor3__shim_fetch_func_t fetch_func,
+ svn_branch_compat__shim_fetch_func_t fetch_func,
void *fetch_baton,
svn_cancel_func_t cancel_func,
void *cancel_baton,
@@ -1984,14 +1984,14 @@ svn_editor3__ev3_from_delta_for_commit(
}
svn_error_t *
-svn_editor3__ev3_from_delta_for_update(
+svn_branch_compat_txn_from_delta_for_update(
svn_update_editor3_t **update_editor_p,
const svn_delta_editor_t *deditor,
void *dedit_baton,
svn_branch_txn_t *branching_txn,
const char *repos_root_url,
const char *base_repos_relpath,
- svn_editor3__shim_fetch_func_t fetch_func,
+ svn_branch_compat__shim_fetch_func_t fetch_func,
void *fetch_baton,
svn_cancel_func_t cancel_func,
void *cancel_baton,
@@ -2000,7 +2000,7 @@ svn_editor3__ev3_from_delta_for_update(
{
svn_update_editor3_t *update_editor
= apr_pcalloc(result_pool, sizeof(*update_editor));
- svn_editor3__shim_connector_t *shim_connector;
+ svn_branch_compat__shim_connector_t *shim_connector;
SVN_DBG(("svn_delta__ev3_from_delta_for_update(base='%s')...",
base_repos_relpath));
@@ -2008,7 +2008,7 @@ svn_editor3__ev3_from_delta_for_update(
/*SVN_ERR(svn_delta__get_debug_editor(&deditor, &dedit_baton,
deditor, dedit_baton,
"[1>UP] ", result_pool));*/
- SVN_ERR(svn_editor3__ev3_from_delta_for_commit(
+ SVN_ERR(svn_branch_compat_txn_from_delta_for_commit(
&update_editor->edit_txn,
&shim_connector,
deditor, dedit_baton,
Modified: subversion/branches/move-tracking-2/subversion/libsvn_ra/ra_loader.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_ra/ra_loader.c?rev=1710045&r1=1710044&r2=1710045&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_ra/ra_loader.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_ra/ra_loader.c Thu Oct 22 15:57:33 2015
@@ -730,7 +730,7 @@ svn_branch_revision_fetch_info(svn_branc
*/
static svn_error_t *
txn_fetch_payloads(svn_branch_txn_t *txn,
- svn_editor3__shim_fetch_func_t fetch_func,
+ svn_branch_compat__shim_fetch_func_t fetch_func,
void *fetch_baton,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
@@ -772,7 +772,7 @@ static svn_error_t *
svn_branch_repos_fetch_info(svn_branch_repos_t **repos_p,
svn_ra_session_t *ra_session,
const char *branch_info_dir,
- svn_editor3__shim_fetch_func_t fetch_func,
+ svn_branch_compat__shim_fetch_func_t fetch_func,
void *fetch_baton,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
@@ -809,7 +809,7 @@ svn_branch_get_mutable_state(svn_branch_
svn_ra_session_t *ra_session,
const char *branch_info_dir,
svn_revnum_t base_revision,
- svn_editor3__shim_fetch_func_t fetch_func,
+ svn_branch_compat__shim_fetch_func_t fetch_func,
void *fetch_baton,
apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
@@ -1015,7 +1015,7 @@ svn_ra_fetch(svn_node_kind_t *kind_p,
svn_error_t *
svn_ra_load_branching_state(svn_branch_txn_t **branching_txn_p,
- svn_editor3__shim_fetch_func_t *fetch_func,
+ svn_branch_compat__shim_fetch_func_t *fetch_func,
void **fetch_baton,
svn_ra_session_t *session,
const char *branch_info_dir,
@@ -1056,22 +1056,22 @@ svn_ra_load_branching_state(svn_branch_t
}
svn_error_t *
-svn_ra_get_commit_editor_ev3(svn_ra_session_t *session,
- svn_branch_txn_t **edit_txn_p,
- apr_hash_t *revprop_table,
- svn_commit_callback2_t commit_callback,
- void *commit_baton,
- apr_hash_t *lock_tokens,
- svn_boolean_t keep_locks,
- const char *branch_info_dir,
- apr_pool_t *pool)
+svn_ra_get_commit_txn(svn_ra_session_t *session,
+ svn_branch_txn_t **edit_txn_p,
+ apr_hash_t *revprop_table,
+ svn_commit_callback2_t commit_callback,
+ void *commit_baton,
+ apr_hash_t *lock_tokens,
+ svn_boolean_t keep_locks,
+ const char *branch_info_dir,
+ apr_pool_t *pool)
{
svn_branch_txn_t *branching_txn;
- svn_editor3__shim_fetch_func_t fetch_func;
+ svn_branch_compat__shim_fetch_func_t fetch_func;
void *fetch_baton;
const svn_delta_editor_t *deditor;
void *dedit_baton;
- svn_editor3__shim_connector_t *shim_connector;
+ svn_branch_compat__shim_connector_t *shim_connector;
/* load branching info
* ### Currently we always start from a single base revision, never from
@@ -1100,7 +1100,7 @@ svn_ra_get_commit_editor_ev3(svn_ra_sess
/*if (! svn_dbg__quiet_mode())
SVN_ERR(svn_delta__get_debug_editor(&deditor, &dedit_baton,
deditor, dedit_baton, "", pool));*/
- SVN_ERR(svn_editor3__ev3_from_delta_for_commit(
+ SVN_ERR(svn_branch_compat_txn_from_delta_for_commit(
edit_txn_p,
&shim_connector,
deditor, dedit_baton, branching_txn,
@@ -1139,9 +1139,10 @@ svn_error_t *svn_ra_get_commit_editor3(s
SVN_ERR(svn_ra__dup_session(&fbb->session, session, repos_root_url, pool, pool));
fbb->session_path = base_relpath;
fbb->repos_root_url = repos_root_url;
- SVN_ERR(svn_editor3__insert_shims(editor, edit_baton, *editor, *edit_baton,
- repos_root_url, base_relpath,
- svn_ra_fetch, fbb, pool, pool));
+ SVN_ERR(svn_branch_compat__insert_shims(editor, edit_baton,
+ *editor, *edit_baton,
+ repos_root_url, base_relpath,
+ svn_ra_fetch, fbb, pool, pool));
}
return SVN_NO_ERROR;
Modified: subversion/branches/move-tracking-2/subversion/libsvn_ra_local/ra_plugin.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_ra_local/ra_plugin.c?rev=1710045&r1=1710044&r2=1710045&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_ra_local/ra_plugin.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_ra_local/ra_plugin.c Thu Oct 22 15:57:33 2015
@@ -1077,7 +1077,7 @@ svn_ra_local__do_update_ev3(svn_ra_sessi
void *update_baton;
fb->session = session;
- SVN_ERR(svn_editor3__delta_from_ev3_for_update(
+ SVN_ERR(svn_branch_compat_delta_from_txn_for_update(
&update_editor, &update_baton,
update_editor3,
sess->repos_url, sess->fs_path->data + 1,
@@ -1149,7 +1149,7 @@ svn_ra_local__do_switch_ev3(svn_ra_sessi
void *update_baton;
fb->session = session;
- SVN_ERR(svn_editor3__delta_from_ev3_for_update(
+ SVN_ERR(svn_branch_compat_delta_from_txn_for_update(
&update_editor, &update_baton,
switch_editor,
sess->repos_url, sess->fs_path->data + 1,
Modified: subversion/branches/move-tracking-2/subversion/libsvn_repos/commit.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_repos/commit.c?rev=1710045&r1=1710044&r2=1710045&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_repos/commit.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_repos/commit.c Thu Oct 22 15:57:33 2015
@@ -1050,7 +1050,7 @@ svn_repos_get_commit_editor5(const svn_d
*edit_baton = eb;
*editor = e;
- SVN_ERR(svn_editor3__insert_shims(editor, edit_baton, *editor, *edit_baton,
+ SVN_ERR(svn_branch_compat__insert_shims(editor, edit_baton, *editor, *edit_baton,
repos_url,
svn_relpath_canonicalize(eb->base_path, pool),
fetch_func, eb, pool, pool));
Modified: subversion/branches/move-tracking-2/subversion/libsvn_wc/deprecated.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_wc/deprecated.c?rev=1710045&r1=1710044&r2=1710045&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_wc/deprecated.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_wc/deprecated.c Thu Oct 22 15:57:33 2015
@@ -3595,7 +3595,7 @@ svn_wc_get_update_editor4(const svn_delt
sfb->base_rrpath = anchor_repos_relpath;
sfb->fetch_base = TRUE;
- SVN_ERR(svn_editor3__delta_from_ev3_for_update(
+ SVN_ERR(svn_branch_compat_delta_from_txn_for_update(
editor, edit_baton,
editor3,
repos_root_url, anchor_repos_relpath,
Modified: subversion/branches/move-tracking-2/subversion/libsvn_wc/update_editor.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_wc/update_editor.c?rev=1710045&r1=1710044&r2=1710045&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_wc/update_editor.c Thu Oct 22 15:57:33 2015
@@ -5117,7 +5117,7 @@ make_editor3(svn_revnum_t *target_revisi
SVN_DBG(("wc make up/sw editor: base_rrpath='%s'; base_abspath=%s",
sfb->base_rrpath, sfb->base_abspath));
- SVN_ERR(svn_editor3__ev3_from_delta_for_update(
+ SVN_ERR(svn_branch_compat_txn_from_delta_for_update(
editor,
inner_editor, inner_baton,
NULL /* ### branching_txn */,
@@ -5648,7 +5648,7 @@ svn_wc__get_switch_editor(const svn_delt
sfb->base_rrpath = anchor_repos_relpath;
sfb->fetch_base = TRUE;
- SVN_ERR(svn_editor3__delta_from_ev3_for_update(
+ SVN_ERR(svn_branch_compat_delta_from_txn_for_update(
editor, edit_baton,
editor3,
repos_root, anchor_repos_relpath,
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=1710045&r1=1710044&r2=1710045&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c (original)
+++ subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c Thu Oct 22 15:57:33 2015
@@ -161,7 +161,7 @@ wc_checkout(svnmover_wc_t *wc,
apr_pool_t *scratch_pool)
{
const char *branch_info_dir = NULL;
- svn_editor3__shim_fetch_func_t fetch_func;
+ svn_branch_compat__shim_fetch_func_t fetch_func;
void *fetch_baton;
svn_branch_txn_t *base_txn;
@@ -650,14 +650,14 @@ wc_commit(svn_revnum_t *new_rev_p,
}
/* Start a new editor for the commit. */
- SVN_ERR(svn_ra_get_commit_editor_ev3(wc->ra_session,
- &commit_txn,
- revprops,
- commit_callback, &ccbb,
- NULL /*lock_tokens*/, FALSE /*keep_locks*/,
- branch_info_dir,
- scratch_pool));
- /*SVN_ERR(svn_editor3__get_debug_editor(&wc->editor, wc->editor, scratch_pool));*/
+ SVN_ERR(svn_ra_get_commit_txn(wc->ra_session,
+ &commit_txn,
+ revprops,
+ commit_callback, &ccbb,
+ NULL /*lock_tokens*/, FALSE /*keep_locks*/,
+ branch_info_dir,
+ scratch_pool));
+ /*SVN_ERR(svn_branch_txn__get_debug(&wc->edit_txn, wc->edit_txn, scratch_pool));*/
edit_root_branch_id = wc->working->branch_id;
edit_root_branch = svn_branch_txn_get_branch_by_id(
Modified: subversion/branches/move-tracking-2/subversion/svnmover/svnmover.h
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/svnmover/svnmover.h?rev=1710045&r1=1710044&r2=1710045&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/svnmover/svnmover.h (original)
+++ subversion/branches/move-tracking-2/subversion/svnmover/svnmover.h Thu Oct 22 15:57:33 2015
@@ -31,7 +31,6 @@
#include "svn_ra.h"
#include "private/svn_branch.h"
-#include "private/svn_editor3e.h"
#ifdef __cplusplus
extern "C" {