subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1663306 [2/2] - in /subversion/branches/move-tracking-2/subversion: include/private/ libsvn_delta/ libsvn_ra/ libsvn_repos/ svnmover/
Date Mon, 02 Mar 2015 13:56:06 GMT
Copied: subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3p.c (from r1663305,
subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3.c)
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3p.c?p2=subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3p.c&p1=subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3.c&r1=1663305&r2=1663306&rev=1663306&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3p.c Mon Mar  2 13:56:06
2015
@@ -75,7 +75,7 @@
  * 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_editor3p__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
@@ -113,7 +113,7 @@ struct svn_editor3__shim_connector_t
 };
 
 svn_error_t *
-svn_editor3__insert_shims(
+svn_editor3p__insert_shims(
                         const svn_delta_editor_t **new_deditor,
                         void **new_dedit_baton,
                         const svn_delta_editor_t *old_deditor,
@@ -125,8 +125,8 @@ svn_editor3__insert_shims(
                         apr_pool_t *result_pool,
                         apr_pool_t *scratch_pool)
 {
-  svn_editor3_t *editor3;
-  svn_editor3__shim_connector_t *shim_connector;
+  svn_editor3p_t *editor3;
+  svn_editor3p__shim_connector_t *shim_connector;
 
 #ifdef SVN_DEBUG
   /*SVN_ERR(svn_delta__get_debug_editor(&old_deditor, &old_dedit_baton,
@@ -142,7 +142,7 @@ svn_editor3__insert_shims(
                         NULL, NULL /*cancel*/,
                         result_pool, scratch_pool));
 #ifdef SVN_DEBUG
-  /*SVN_ERR(svn_editor3__get_debug_editor(&editor3, editor3, result_pool));*/
+  /*SVN_ERR(svn_editor3p__get_debug_editor(&editor3, editor3, result_pool));*/
 #endif
   SVN_ERR(svn_delta__delta_from_ev3_for_commit(
                         new_deditor, new_dedit_baton,
@@ -609,7 +609,7 @@ txn_path(const char *repos_relpath, svn_
 
 struct ev3_edit_baton
 {
-  svn_editor3_t *editor;
+  svn_editor3p_t *editor;
 
   apr_hash_t *changes;  /* REPOS_RELPATH -> struct change_node  */
 
@@ -626,7 +626,7 @@ struct ev3_edit_baton
   /* Base directory of the edit, relative to the repository root. */
   const char *base_relpath;
 
-  const svn_editor3__shim_connector_t *shim_connector;
+  const svn_editor3p__shim_connector_t *shim_connector;
 
   svn_editor3__shim_fetch_func_t fetch_func;
   void *fetch_baton;
@@ -755,14 +755,14 @@ process_actions(struct ev3_edit_baton *e
   /* Process any delete, no matter whether it will be replaced. */
   if (change->deleting)
     {
-      SVN_ERR(svn_editor3_rm(eb->editor,
+      SVN_ERR(svn_editor3p_rm(eb->editor,
                              txn_path(repos_relpath, change->deleting_rev, "")));
     }
 
 #ifdef SHIM_WITH_ADD_ABSENT
   if (change->action == RESTRUCTURE_ADD_ABSENT)
     {
-      SVN_ERR(svn_editor3_mk(eb->editor, change->kind,
+      SVN_ERR(svn_editor3p_mk(eb->editor, change->kind,
                              parent_loc, repos_relpath_basename));
 
       /* No further work possible on this path. */
@@ -777,7 +777,7 @@ process_actions(struct ev3_edit_baton *e
 
       if (change->copyfrom_path != NULL)
         {
-          SVN_ERR(svn_editor3_cp(eb->editor,
+          SVN_ERR(svn_editor3p_cp(eb->editor,
 #ifdef SVN_EDITOR3_WITH_COPY_FROM_THIS_REV
                                  txn_path(change->copyfrom_path, change->copyfrom_rev,
""),
 #else
@@ -788,7 +788,7 @@ process_actions(struct ev3_edit_baton *e
         }
       else
         {
-          SVN_ERR(svn_editor3_mk(eb->editor, change->kind,
+          SVN_ERR(svn_editor3p_mk(eb->editor, change->kind,
                                  parent_loc, repos_relpath_basename));
           /* Fall through to make changes post-add. */
         }
@@ -829,7 +829,7 @@ process_actions(struct ev3_edit_baton *e
         }
       else
         SVN_ERR_MALFUNCTION();
-      SVN_ERR(svn_editor3_put(eb->editor, change_loc, new_content));
+      SVN_ERR(svn_editor3p_put(eb->editor, change_loc, new_content));
     }
 
   return SVN_NO_ERROR;
@@ -1487,7 +1487,7 @@ ev3_close_edit(void *edit_baton,
 
   SVN_ERR(run_actions(edit_baton, scratch_pool));
   eb->closed = TRUE;
-  SVN_ERR(svn_editor3_complete(eb->editor));
+  SVN_ERR(svn_editor3p_complete(eb->editor));
   return SVN_NO_ERROR;
 }
 
@@ -1503,7 +1503,7 @@ ev3_abort_edit(void *edit_baton,
 #endif
 
   if (!eb->closed)
-    SVN_ERR(svn_editor3_abort(eb->editor));
+    SVN_ERR(svn_editor3p_abort(eb->editor));
   return SVN_NO_ERROR;
 }
 
@@ -1511,12 +1511,12 @@ svn_error_t *
 svn_delta__delta_from_ev3_for_commit(
                         const svn_delta_editor_t **deditor,
                         void **dedit_baton,
-                        svn_editor3_t *editor,
+                        svn_editor3p_t *editor,
                         const char *repos_root_url,
                         const char *base_relpath,
                         svn_editor3__shim_fetch_func_t fetch_func,
                         void *fetch_baton,
-                        const svn_editor3__shim_connector_t *shim_connector,
+                        const svn_editor3p__shim_connector_t *shim_connector,
                         apr_pool_t *result_pool,
                         apr_pool_t *scratch_pool)
 {
@@ -1580,7 +1580,7 @@ svn_delta__delta_from_ev3_for_update(
                         apr_pool_t *result_pool,
                         apr_pool_t *scratch_pool)
 {
-  svn_editor3__shim_connector_t *shim_connector
+  svn_editor3p__shim_connector_t *shim_connector
     = apr_pcalloc(result_pool, sizeof(*shim_connector));
 
   shim_connector->target_revision_func = update_editor->set_target_revision_func;
@@ -2209,7 +2209,7 @@ e3_general_path_in_txn(ev3_from_delta_ba
                           loc.relpath, result_pool);
 }
 
-/* An #svn_editor3_t method. */
+/* An #svn_editor3p_t method. */
 static svn_error_t *
 editor3_mk(void *baton,
            svn_node_kind_t new_kind,
@@ -2236,7 +2236,7 @@ editor3_mk(void *baton,
   return SVN_NO_ERROR;
 }
 
-/* An #svn_editor3_t method. */
+/* An #svn_editor3p_t method. */
 static svn_error_t *
 editor3_cp(void *baton,
 #ifdef SVN_EDITOR3_WITH_COPY_FROM_THIS_REV
@@ -2285,7 +2285,7 @@ editor3_cp(void *baton,
   return SVN_NO_ERROR;
 }
 
-/* An #svn_editor3_t method. */
+/* An #svn_editor3p_t method. */
 static svn_error_t *
 editor3_mv(void *baton,
            svn_pathrev_t from_loc,
@@ -2335,7 +2335,7 @@ editor3_mv(void *baton,
 }
 
 #ifdef SVN_EDITOR3_WITH_RESURRECTION
-/* An #svn_editor3_t method. */
+/* An #svn_editor3p_t method. */
 static svn_error_t *
 editor3_res(void *baton,
             svn_pathrev_t from_loc,
@@ -2349,7 +2349,7 @@ editor3_res(void *baton,
 }
 #endif
 
-/* An #svn_editor3_t method. */
+/* An #svn_editor3p_t method. */
 static svn_error_t *
 editor3_rm(void *baton,
            svn_editor3_txn_path_t loc,
@@ -2373,7 +2373,7 @@ editor3_rm(void *baton,
   return SVN_NO_ERROR;
 }
 
-/* An #svn_editor3_t method. */
+/* An #svn_editor3p_t method. */
 static svn_error_t *
 editor3_put(void *baton,
             svn_editor3_txn_path_t loc,
@@ -2412,7 +2412,7 @@ editor3_put(void *baton,
   return SVN_NO_ERROR;
 }
 
-/* An #svn_editor3_t method. */
+/* An #svn_editor3p_t method. */
 static svn_error_t *
 editor3_complete(void *baton,
                  apr_pool_t *scratch_pool)
@@ -2435,7 +2435,7 @@ editor3_complete(void *baton,
   return err;
 }
 
-/* An #svn_editor3_t method. */
+/* An #svn_editor3p_t method. */
 static svn_error_t *
 editor3_abort(void *baton,
               apr_pool_t *scratch_pool)
@@ -2465,8 +2465,8 @@ editor3_abort(void *baton,
 
 svn_error_t *
 svn_delta__ev3_from_delta_for_commit(
-                        svn_editor3_t **editor_p,
-                        svn_editor3__shim_connector_t **shim_connector,
+                        svn_editor3p_t **editor_p,
+                        svn_editor3p__shim_connector_t **shim_connector,
                         const svn_delta_editor_t *deditor,
                         void *dedit_baton,
                         const char *repos_root_url,
@@ -2478,7 +2478,7 @@ svn_delta__ev3_from_delta_for_commit(
                         apr_pool_t *result_pool,
                         apr_pool_t *scratch_pool)
 {
-  static const svn_editor3_cb_funcs_t editor_funcs = {
+  static const svn_editor3p_cb_funcs_t editor_funcs = {
     editor3_mk,
     editor3_cp,
     editor3_mv,
@@ -2487,8 +2487,7 @@ svn_delta__ev3_from_delta_for_commit(
 #endif
     editor3_rm,
     editor3_put,
-    NULL, NULL, NULL, NULL, NULL, NULL,
-    NULL,
+
     editor3_complete,
     editor3_abort
   };
@@ -2508,7 +2507,7 @@ svn_delta__ev3_from_delta_for_commit(
 
   eb->edit_pool = result_pool;
 
-  *editor_p = svn_editor3_create(&editor_funcs, eb,
+  *editor_p = svn_editor3p_create(&editor_funcs, eb,
                                  cancel_func, cancel_baton, result_pool);
 
   if (shim_connector)
@@ -2545,7 +2544,7 @@ svn_delta__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_editor3p__shim_connector_t *shim_connector;
 
   SVN_DBG(("svn_delta__ev3_from_delta_for_update(base='%s')...",
            base_repos_relpath));

Copied: subversion/branches/move-tracking-2/subversion/libsvn_delta/editor3e.c (from r1663305,
subversion/branches/move-tracking-2/subversion/libsvn_delta/editor3.c)
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_delta/editor3e.c?p2=subversion/branches/move-tracking-2/subversion/libsvn_delta/editor3e.c&p1=subversion/branches/move-tracking-2/subversion/libsvn_delta/editor3.c&r1=1663305&r2=1663306&rev=1663306&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_delta/editor3.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_delta/editor3e.c Mon Mar  2 13:56:06
2015
@@ -29,7 +29,7 @@
 #include "svn_dirent_uri.h"
 #include "svn_props.h"
 
-#include "private/svn_editor3.h"
+#include "private/svn_editor3e.h"
 #include "svn_private_config.h"
 
 #ifdef SVN_DEBUG
@@ -166,100 +166,6 @@ check_cancel(svn_editor3_t *editor)
 
 
 /*
- * ===================================================================
- * Editor for Commit (incremental tree changes; path-based addressing)
- * ===================================================================
- */
-
-svn_error_t *
-svn_editor3_mk(svn_editor3_t *editor,
-               svn_node_kind_t new_kind,
-               svn_editor3_txn_path_t parent_loc,
-               const char *new_name)
-{
-  /* SVN_ERR_ASSERT(...); */
-
-  DO_CALLBACK(editor, cb_mk,
-              3(new_kind, parent_loc, new_name));
-
-  return SVN_NO_ERROR;
-}
-
-svn_error_t *
-svn_editor3_cp(svn_editor3_t *editor,
-#ifdef SVN_EDITOR3_WITH_COPY_FROM_THIS_REV
-               svn_editor3_txn_path_t from_loc,
-#else
-               svn_pathrev_t from_loc,
-#endif
-               svn_editor3_txn_path_t parent_loc,
-               const char *new_name)
-{
-  /* SVN_ERR_ASSERT(...); */
-
-  DO_CALLBACK(editor, cb_cp,
-              3(from_loc, parent_loc, new_name));
-
-  return SVN_NO_ERROR;
-}
-
-svn_error_t *
-svn_editor3_mv(svn_editor3_t *editor,
-               svn_pathrev_t from_loc,
-               svn_editor3_txn_path_t new_parent_loc,
-               const char *new_name)
-{
-  /* SVN_ERR_ASSERT(...); */
-
-  DO_CALLBACK(editor, cb_mv,
-              3(from_loc, new_parent_loc, new_name));
-
-  return SVN_NO_ERROR;
-}
-
-#ifdef SVN_EDITOR3_WITH_RESURRECTION
-svn_error_t *
-svn_editor3_res(svn_editor3_t *editor,
-                svn_pathrev_t from_loc,
-                svn_editor3_txn_path_t parent_loc,
-                const char *new_name)
-{
-  /* SVN_ERR_ASSERT(...); */
-
-  DO_CALLBACK(editor, cb_res,
-              3(from_loc, parent_loc, new_name));
-
-  return SVN_NO_ERROR;
-}
-#endif
-
-svn_error_t *
-svn_editor3_rm(svn_editor3_t *editor,
-               svn_editor3_txn_path_t loc)
-{
-  /* SVN_ERR_ASSERT(...); */
-
-  DO_CALLBACK(editor, cb_rm,
-              1(loc));
-
-  return SVN_NO_ERROR;
-}
-
-svn_error_t *
-svn_editor3_put(svn_editor3_t *editor,
-                svn_editor3_txn_path_t loc,
-                const svn_element_content_t *new_content)
-{
-  /* SVN_ERR_ASSERT(...); */
-
-  DO_CALLBACK(editor, cb_put,
-              2(loc, new_content));
-
-  return SVN_NO_ERROR;
-}
-
-
-/*
  * ========================================================================
  * Editor for Commit (independent per-node changes; node-id addressing)
  * ========================================================================
@@ -511,24 +417,6 @@ dbg(wrapper_baton_t *eb,
   svn_error_clear(svn_stream_puts(eb->debug_stream, "\n"));
 }
 
-/* Return a human-readable string representation of LOC. */
-static const char *
-peg_path_str(svn_pathrev_t loc,
-             apr_pool_t *result_pool)
-{
-  return apr_psprintf(result_pool, "%s@%ld",
-                      loc.relpath, loc.rev);
-}
-
-/* Return a human-readable string representation of LOC. */
-static const char *
-txn_path_str(svn_editor3_txn_path_t loc,
-             apr_pool_t *result_pool)
-{
-  return apr_psprintf(result_pool, "%s//%s",
-                      peg_path_str(loc.peg, result_pool), loc.relpath);
-}
-
 /* Return a human-readable string representation of EL_REV. */
 static const char *
 el_rev_str(const svn_branch_el_rev_id_t *el_rev,
@@ -547,109 +435,6 @@ eid_str(svn_branch_eid_t eid,
 }
 
 static svn_error_t *
-wrap_mk(void *baton,
-        svn_node_kind_t new_kind,
-        svn_editor3_txn_path_t parent_loc,
-        const char *new_name,
-        apr_pool_t *scratch_pool)
-{
-  wrapper_baton_t *eb = baton;
-
-  dbg(eb, scratch_pool, "mk(k=%s, p=%s, n=%s)",
-      svn_node_kind_to_word(new_kind),
-      txn_path_str(parent_loc, scratch_pool), new_name);
-  SVN_ERR(svn_editor3_mk(eb->wrapped_editor,
-                         new_kind, parent_loc, new_name));
-  return SVN_NO_ERROR;
-}
-
-static svn_error_t *
-wrap_cp(void *baton,
-#ifdef SVN_EDITOR3_WITH_COPY_FROM_THIS_REV
-        svn_editor3_txn_path_t from_loc,
-#else
-        svn_pathrev_t from_loc,
-#endif
-        svn_editor3_txn_path_t parent_loc,
-        const char *new_name,
-        apr_pool_t *scratch_pool)
-{
-  wrapper_baton_t *eb = baton;
-
-  dbg(eb, scratch_pool, "cp(f=%s, p=%s, n=%s)",
-      peg_path_str(from_loc, scratch_pool),
-      txn_path_str(parent_loc, scratch_pool), new_name);
-  SVN_ERR(svn_editor3_cp(eb->wrapped_editor,
-                         from_loc, parent_loc, new_name));
-  return SVN_NO_ERROR;
-}
-
-static svn_error_t *
-wrap_mv(void *baton,
-        svn_pathrev_t from_loc,
-        svn_editor3_txn_path_t new_parent_loc,
-        const char *new_name,
-        apr_pool_t *scratch_pool)
-{
-  wrapper_baton_t *eb = baton;
-
-  dbg(eb, scratch_pool, "mv(f=%s, p=%s, n=%s)",
-      peg_path_str(from_loc, scratch_pool),
-      txn_path_str(new_parent_loc, scratch_pool), new_name);
-  SVN_ERR(svn_editor3_mv(eb->wrapped_editor,
-                         from_loc, new_parent_loc, new_name));
-  return SVN_NO_ERROR;
-}
-
-#ifdef SVN_EDITOR3_WITH_RESURRECTION
-static svn_error_t *
-wrap_res(void *baton,
-         svn_pathrev_t from_loc,
-         svn_editor3_txn_path_t parent_loc,
-         const char *new_name,
-         apr_pool_t *scratch_pool)
-{
-  wrapper_baton_t *eb = baton;
-
-  dbg(eb, scratch_pool, "res(f=%s, p=%s, n=%s)",
-      peg_path_str(from_loc, scratch_pool),
-      txn_path_str(parent_loc, scratch_pool), new_name);
-  SVN_ERR(svn_editor3_res(eb->wrapped_editor,
-                          from_loc, parent_loc, new_name));
-  return SVN_NO_ERROR;
-}
-#endif
-
-static svn_error_t *
-wrap_rm(void *baton,
-        svn_editor3_txn_path_t loc,
-        apr_pool_t *scratch_pool)
-{
-  wrapper_baton_t *eb = baton;
-
-  dbg(eb, scratch_pool, "rm(%s)",
-      txn_path_str(loc, scratch_pool));
-  SVN_ERR(svn_editor3_rm(eb->wrapped_editor,
-                         loc));
-  return SVN_NO_ERROR;
-}
-
-static svn_error_t *
-wrap_put(void *baton,
-         svn_editor3_txn_path_t loc,
-         const svn_element_content_t *new_content,
-         apr_pool_t *scratch_pool)
-{
-  wrapper_baton_t *eb = baton;
-
-  dbg(eb, scratch_pool, "put(%s)",
-      txn_path_str(loc, scratch_pool));
-  SVN_ERR(svn_editor3_put(eb->wrapped_editor,
-                          loc, new_content));
-  return SVN_NO_ERROR;
-}
-
-static svn_error_t *
 wrap_add(void *baton,
          svn_branch_eid_t *local_eid,
          svn_node_kind_t new_kind,
@@ -807,14 +592,6 @@ svn_editor3__get_debug_editor(svn_editor
                               apr_pool_t *result_pool)
 {
   static const svn_editor3_cb_funcs_t wrapper_funcs = {
-    wrap_mk,
-    wrap_cp,
-    wrap_mv,
-#ifdef SVN_EDITOR3_WITH_RESURRECTION
-    wrap_res,
-#endif
-    wrap_rm,
-    wrap_put,
     wrap_add,
     wrap_instantiate,
     wrap_copy_one,

Copied: subversion/branches/move-tracking-2/subversion/libsvn_delta/editor3p.c (from r1663282,
subversion/branches/move-tracking-2/subversion/libsvn_delta/editor3.c)
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_delta/editor3p.c?p2=subversion/branches/move-tracking-2/subversion/libsvn_delta/editor3p.c&p1=subversion/branches/move-tracking-2/subversion/libsvn_delta/editor3.c&r1=1663282&r2=1663306&rev=1663306&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_delta/editor3.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_delta/editor3p.c Mon Mar  2 13:56:06
2015
@@ -30,6 +30,7 @@
 #include "svn_props.h"
 
 #include "private/svn_editor3.h"
+#include "private/svn_editor3paths.h"
 #include "svn_private_config.h"
 
 #ifdef SVN_DEBUG
@@ -40,7 +41,7 @@
 #endif
 
 
-struct svn_editor3_t
+struct svn_editor3p_t
 {
   void *baton;
 
@@ -49,7 +50,7 @@ struct svn_editor3_t
   void *cancel_baton;
 
   /* The callback functions.  */
-  svn_editor3_cb_funcs_t funcs;
+  svn_editor3p_cb_funcs_t funcs;
 
   /* This pool is used as the scratch_pool for all callbacks.  */
   apr_pool_t *scratch_pool;
@@ -66,7 +67,7 @@ struct svn_editor3_t
 
 #define START_CALLBACK(editor)                       \
   do {                                               \
-    svn_editor3_t *editor__tmp_e = (editor);          \
+    svn_editor3p_t *editor__tmp_e = (editor);          \
     SVN_ERR_ASSERT(!editor__tmp_e->within_callback); \
     editor__tmp_e->within_callback = TRUE;           \
   } while (0)
@@ -86,14 +87,14 @@ struct svn_editor3_t
 #endif /* ENABLE_ORDERING_CHECK */
 
 
-svn_editor3_t *
-svn_editor3_create(const svn_editor3_cb_funcs_t *editor_funcs,
-                   void *editor_baton,
-                   svn_cancel_func_t cancel_func,
-                   void *cancel_baton,
-                   apr_pool_t *result_pool)
+svn_editor3p_t *
+svn_editor3p_create(const svn_editor3p_cb_funcs_t *editor_funcs,
+                    void *editor_baton,
+                    svn_cancel_func_t cancel_func,
+                    void *cancel_baton,
+                    apr_pool_t *result_pool)
 {
-  svn_editor3_t *editor = apr_pcalloc(result_pool, sizeof(*editor));
+  svn_editor3p_t *editor = apr_pcalloc(result_pool, sizeof(*editor));
 
   editor->funcs = *editor_funcs;
   editor->baton = editor_baton;
@@ -112,14 +113,14 @@ svn_editor3_create(const svn_editor3_cb_
 
 
 void *
-svn_editor3__get_baton(const svn_editor3_t *editor)
+svn_editor3p__get_baton(const svn_editor3p_t *editor)
 {
   return editor->baton;
 }
 
 
 static svn_error_t *
-check_cancel(svn_editor3_t *editor)
+check_cancel(svn_editor3p_t *editor)
 {
   svn_error_t *err = NULL;
 
@@ -172,10 +173,10 @@ check_cancel(svn_editor3_t *editor)
  */
 
 svn_error_t *
-svn_editor3_mk(svn_editor3_t *editor,
-               svn_node_kind_t new_kind,
-               svn_editor3_txn_path_t parent_loc,
-               const char *new_name)
+svn_editor3p_mk(svn_editor3p_t *editor,
+                svn_node_kind_t new_kind,
+                svn_editor3_txn_path_t parent_loc,
+                const char *new_name)
 {
   /* SVN_ERR_ASSERT(...); */
 
@@ -186,14 +187,14 @@ svn_editor3_mk(svn_editor3_t *editor,
 }
 
 svn_error_t *
-svn_editor3_cp(svn_editor3_t *editor,
+svn_editor3p_cp(svn_editor3p_t *editor,
 #ifdef SVN_EDITOR3_WITH_COPY_FROM_THIS_REV
-               svn_editor3_txn_path_t from_loc,
+                svn_editor3_txn_path_t from_loc,
 #else
-               svn_pathrev_t from_loc,
+                svn_pathrev_t from_loc,
 #endif
-               svn_editor3_txn_path_t parent_loc,
-               const char *new_name)
+                svn_editor3_txn_path_t parent_loc,
+                const char *new_name)
 {
   /* SVN_ERR_ASSERT(...); */
 
@@ -204,10 +205,10 @@ svn_editor3_cp(svn_editor3_t *editor,
 }
 
 svn_error_t *
-svn_editor3_mv(svn_editor3_t *editor,
-               svn_pathrev_t from_loc,
-               svn_editor3_txn_path_t new_parent_loc,
-               const char *new_name)
+svn_editor3p_mv(svn_editor3p_t *editor,
+                svn_pathrev_t from_loc,
+                svn_editor3_txn_path_t new_parent_loc,
+                const char *new_name)
 {
   /* SVN_ERR_ASSERT(...); */
 
@@ -219,10 +220,10 @@ svn_editor3_mv(svn_editor3_t *editor,
 
 #ifdef SVN_EDITOR3_WITH_RESURRECTION
 svn_error_t *
-svn_editor3_res(svn_editor3_t *editor,
-                svn_pathrev_t from_loc,
-                svn_editor3_txn_path_t parent_loc,
-                const char *new_name)
+svn_editor3p_res(svn_editor3p_t *editor,
+                 svn_pathrev_t from_loc,
+                 svn_editor3_txn_path_t parent_loc,
+                 const char *new_name)
 {
   /* SVN_ERR_ASSERT(...); */
 
@@ -234,8 +235,8 @@ svn_editor3_res(svn_editor3_t *editor,
 #endif
 
 svn_error_t *
-svn_editor3_rm(svn_editor3_t *editor,
-               svn_editor3_txn_path_t loc)
+svn_editor3p_rm(svn_editor3p_t *editor,
+                svn_editor3_txn_path_t loc)
 {
   /* SVN_ERR_ASSERT(...); */
 
@@ -246,9 +247,9 @@ svn_editor3_rm(svn_editor3_t *editor,
 }
 
 svn_error_t *
-svn_editor3_put(svn_editor3_t *editor,
-                svn_editor3_txn_path_t loc,
-                const svn_element_content_t *new_content)
+svn_editor3p_put(svn_editor3p_t *editor,
+                 svn_editor3_txn_path_t loc,
+                 const svn_element_content_t *new_content)
 {
   /* SVN_ERR_ASSERT(...); */
 
@@ -259,175 +260,8 @@ svn_editor3_put(svn_editor3_t *editor,
 }
 
 
-/*
- * ========================================================================
- * Editor for Commit (independent per-node changes; node-id addressing)
- * ========================================================================
- */
-
-#define VALID_NODE_KIND(kind) ((kind) != svn_node_unknown && (kind) != svn_node_none)
-#define VALID_EID(eid) ((eid) >= 0)
-#define VALID_NAME(name) ((name) && (name)[0] && svn_relpath_is_canonical(name))
-#define VALID_CONTENT(content) ((content) && VALID_NODE_KIND((content)->kind))
-#define VALID_EL_REV_ID(el_rev) (el_rev && el_rev->branch && VALID_EID(el_rev->eid))
-
-#define VERIFY(method, expr) \
-  if (! (expr)) \
-    return svn_error_createf(SVN_ERR_BRANCHING, NULL, \
-                             _("svn_editor3_%s: validation (%s) failed"), \
-                             #method, #expr)
-
-svn_error_t *
-svn_editor3_add(svn_editor3_t *editor,
-                svn_branch_eid_t *local_eid_p,
-                svn_node_kind_t new_kind,
-                svn_branch_instance_t *branch,
-                svn_branch_eid_t new_parent_eid,
-                const char *new_name,
-                const svn_element_content_t *new_content)
-{
-  int eid = -1;
-
-  SVN_ERR_ASSERT(VALID_NODE_KIND(new_kind));
-  SVN_ERR_ASSERT(VALID_EID(new_parent_eid));
-  SVN_ERR_ASSERT(VALID_NAME(new_name));
-  SVN_ERR_ASSERT(VALID_CONTENT(new_content));
-  SVN_ERR_ASSERT(new_content->kind == new_kind);
-
-  DO_CALLBACK(editor, cb_add,
-              6(&eid, new_kind,
-                branch, new_parent_eid, new_name,
-                new_content));
-
-  SVN_ERR_ASSERT(VALID_EID(eid));
-
-  /* We allow the output pointer to be null, here, so that implementations
-     may assume their output pointer is non-null. */
-  if (local_eid_p)
-    *local_eid_p = eid;
-
-  return SVN_NO_ERROR;
-}
-
-svn_error_t *
-svn_editor3_instantiate(svn_editor3_t *editor,
-                        svn_branch_instance_t *branch,
-                        svn_branch_eid_t local_eid,
-                        svn_branch_eid_t new_parent_eid,
-                        const char *new_name,
-                        const svn_element_content_t *new_content)
-{
-  SVN_ERR_ASSERT(VALID_EID(local_eid));
-  SVN_ERR_ASSERT(VALID_EID(new_parent_eid));
-  SVN_ERR_ASSERT(VALID_NAME(new_name));
-  SVN_ERR_ASSERT(VALID_CONTENT(new_content));
-  VERIFY(instantiate, new_parent_eid != local_eid);
-  /* TODO: verify this element does not exist (in initial state) */
-
-  DO_CALLBACK(editor, cb_instantiate,
-              5(branch, local_eid,
-                new_parent_eid, new_name,
-                new_content));
-  return SVN_NO_ERROR;
-}
-
-svn_error_t *
-svn_editor3_copy_one(svn_editor3_t *editor,
-                     const svn_branch_el_rev_id_t *src_el_rev,
-                     svn_branch_instance_t *branch,
-                     svn_branch_eid_t local_eid,
-                     svn_branch_eid_t new_parent_eid,
-                     const char *new_name,
-                     const svn_element_content_t *new_content)
-{
-  SVN_ERR_ASSERT(VALID_EID(local_eid));
-  SVN_ERR_ASSERT(VALID_EL_REV_ID(src_el_rev));
-  SVN_ERR_ASSERT(VALID_EID(new_parent_eid));
-  SVN_ERR_ASSERT(VALID_NAME(new_name));
-  SVN_ERR_ASSERT(! new_content || VALID_CONTENT(new_content));
-  /* TODO: verify source element exists (in a committed rev) */
-
-  DO_CALLBACK(editor, cb_copy_one,
-              6(src_el_rev,
-                branch, local_eid,
-                new_parent_eid, new_name,
-                new_content));
-
-  return SVN_NO_ERROR;
-}
-
-svn_error_t *
-svn_editor3_copy_tree(svn_editor3_t *editor,
-                      const svn_branch_el_rev_id_t *src_el_rev,
-                      svn_branch_instance_t *branch,
-                      svn_branch_eid_t new_parent_eid,
-                      const char *new_name)
-{
-  SVN_ERR_ASSERT(VALID_EL_REV_ID(src_el_rev));
-  SVN_ERR_ASSERT(VALID_EID(new_parent_eid));
-  SVN_ERR_ASSERT(VALID_NAME(new_name));
-  /* TODO: verify source element exists (in a committed rev) */
-
-  DO_CALLBACK(editor, cb_copy_tree,
-              4(src_el_rev,
-                branch, new_parent_eid, new_name));
-
-  return SVN_NO_ERROR;
-}
-
-svn_error_t *
-svn_editor3_delete(svn_editor3_t *editor,
-                   svn_revnum_t since_rev,
-                   svn_branch_instance_t *branch,
-                   svn_branch_eid_t eid)
-{
-  SVN_ERR_ASSERT(VALID_EID(eid));
-  SVN_ERR_ASSERT(eid != branch->sibling_defn->root_eid);
-  /* TODO: verify this element exists (in initial state) */
-
-  DO_CALLBACK(editor, cb_delete,
-              3(since_rev, branch, eid));
-
-  return SVN_NO_ERROR;
-}
-
-svn_error_t *
-svn_editor3_alter(svn_editor3_t *editor,
-                  svn_revnum_t since_rev,
-                  svn_branch_instance_t *branch,
-                  svn_branch_eid_t eid,
-                  svn_branch_eid_t new_parent_eid,
-                  const char *new_name,
-                  const svn_element_content_t *new_content)
-{
-  SVN_ERR_ASSERT(VALID_EID(eid));
-  SVN_ERR_ASSERT(VALID_EID(new_parent_eid));
-  SVN_ERR_ASSERT(VALID_NAME(new_name));
-  SVN_ERR_ASSERT(! new_content || VALID_CONTENT(new_content));
-  VERIFY(alter, new_parent_eid != eid);
-  /* TODO: verify this element exists (in initial state) */
-
-  DO_CALLBACK(editor, cb_alter,
-              6(since_rev, branch, eid,
-                new_parent_eid, new_name,
-                new_content));
-
-  return SVN_NO_ERROR;
-}
-
-svn_error_t *
-svn_editor3_sequence_point(svn_editor3_t *editor)
-{
-  SHOULD_NOT_BE_FINISHED(editor);
-
-  DO_CALLBACK(editor, cb_sequence_point,
-              0());
-
-  return SVN_NO_ERROR;
-}
-
 svn_error_t *
-svn_editor3_complete(svn_editor3_t *editor)
+svn_editor3p_complete(svn_editor3p_t *editor)
 {
   SHOULD_NOT_BE_FINISHED(editor);
 
@@ -440,7 +274,7 @@ svn_editor3_complete(svn_editor3_t *edit
 }
 
 svn_error_t *
-svn_editor3_abort(svn_editor3_t *editor)
+svn_editor3p_abort(svn_editor3p_t *editor)
 {
   SHOULD_NOT_BE_FINISHED(editor);
 
@@ -453,23 +287,6 @@ svn_editor3_abort(svn_editor3_t *editor)
 }
 
 
-/*
- * ===================================================================
- * Minor data types
- * ===================================================================
- */
-
-svn_editor3_txn_path_t
-svn_editor3_txn_path_dup(svn_editor3_txn_path_t p,
-                         apr_pool_t *result_pool)
-{
-  /* The object P is passed by value so we can modify it in place */
-  p.peg = svn_pathrev_dup(p.peg, result_pool);
-  p.relpath = apr_pstrdup(result_pool, p.relpath);
-  return p;
-}
-
-
 #ifdef SVN_DEBUG
 
 /*
@@ -481,7 +298,7 @@ svn_editor3_txn_path_dup(svn_editor3_txn
 
 typedef struct wrapper_baton_t
 {
-  svn_editor3_t *wrapped_editor;
+  svn_editor3p_t *wrapped_editor;
 
   /* debug printing stream */
   svn_stream_t *debug_stream;
@@ -529,23 +346,6 @@ txn_path_str(svn_editor3_txn_path_t loc,
                       peg_path_str(loc.peg, result_pool), loc.relpath);
 }
 
-/* Return a human-readable string representation of EL_REV. */
-static const char *
-el_rev_str(const svn_branch_el_rev_id_t *el_rev,
-           apr_pool_t *result_pool)
-{
-  return apr_psprintf(result_pool, "r%ldb%de%d",
-                      el_rev->rev, el_rev->branch->sibling_defn->bid, el_rev->eid);
-}
-
-/* Return a human-readable string representation of EID. */
-static const char *
-eid_str(svn_branch_eid_t eid,
-         apr_pool_t *result_pool)
-{
-  return apr_psprintf(result_pool, "%d", eid);
-}
-
 static svn_error_t *
 wrap_mk(void *baton,
         svn_node_kind_t new_kind,
@@ -558,8 +358,8 @@ wrap_mk(void *baton,
   dbg(eb, scratch_pool, "mk(k=%s, p=%s, n=%s)",
       svn_node_kind_to_word(new_kind),
       txn_path_str(parent_loc, scratch_pool), new_name);
-  SVN_ERR(svn_editor3_mk(eb->wrapped_editor,
-                         new_kind, parent_loc, new_name));
+  SVN_ERR(svn_editor3p_mk(eb->wrapped_editor,
+                          new_kind, parent_loc, new_name));
   return SVN_NO_ERROR;
 }
 
@@ -579,8 +379,8 @@ wrap_cp(void *baton,
   dbg(eb, scratch_pool, "cp(f=%s, p=%s, n=%s)",
       peg_path_str(from_loc, scratch_pool),
       txn_path_str(parent_loc, scratch_pool), new_name);
-  SVN_ERR(svn_editor3_cp(eb->wrapped_editor,
-                         from_loc, parent_loc, new_name));
+  SVN_ERR(svn_editor3p_cp(eb->wrapped_editor,
+                          from_loc, parent_loc, new_name));
   return SVN_NO_ERROR;
 }
 
@@ -596,8 +396,8 @@ wrap_mv(void *baton,
   dbg(eb, scratch_pool, "mv(f=%s, p=%s, n=%s)",
       peg_path_str(from_loc, scratch_pool),
       txn_path_str(new_parent_loc, scratch_pool), new_name);
-  SVN_ERR(svn_editor3_mv(eb->wrapped_editor,
-                         from_loc, new_parent_loc, new_name));
+  SVN_ERR(svn_editor3p_mv(eb->wrapped_editor,
+                          from_loc, new_parent_loc, new_name));
   return SVN_NO_ERROR;
 }
 
@@ -614,8 +414,8 @@ wrap_res(void *baton,
   dbg(eb, scratch_pool, "res(f=%s, p=%s, n=%s)",
       peg_path_str(from_loc, scratch_pool),
       txn_path_str(parent_loc, scratch_pool), new_name);
-  SVN_ERR(svn_editor3_res(eb->wrapped_editor,
-                          from_loc, parent_loc, new_name));
+  SVN_ERR(svn_editor3p_res(eb->wrapped_editor,
+                           from_loc, parent_loc, new_name));
   return SVN_NO_ERROR;
 }
 #endif
@@ -629,8 +429,8 @@ wrap_rm(void *baton,
 
   dbg(eb, scratch_pool, "rm(%s)",
       txn_path_str(loc, scratch_pool));
-  SVN_ERR(svn_editor3_rm(eb->wrapped_editor,
-                         loc));
+  SVN_ERR(svn_editor3p_rm(eb->wrapped_editor,
+                          loc));
   return SVN_NO_ERROR;
 }
 
@@ -644,138 +444,8 @@ wrap_put(void *baton,
 
   dbg(eb, scratch_pool, "put(%s)",
       txn_path_str(loc, scratch_pool));
-  SVN_ERR(svn_editor3_put(eb->wrapped_editor,
-                          loc, new_content));
-  return SVN_NO_ERROR;
-}
-
-static svn_error_t *
-wrap_add(void *baton,
-         svn_branch_eid_t *local_eid,
-         svn_node_kind_t new_kind,
-         svn_branch_instance_t *branch,
-         svn_branch_eid_t new_parent_eid,
-         const char *new_name,
-         const svn_element_content_t *new_content,
-         apr_pool_t *scratch_pool)
-{
-  wrapper_baton_t *eb = baton;
-
-  dbg(eb, scratch_pool, "... : add(k=%s, p=%s, n=%s, c=...)",
-      svn_node_kind_to_word(new_kind),
-      eid_str(new_parent_eid, scratch_pool), new_name);
-  SVN_ERR(svn_editor3_add(eb->wrapped_editor,
-                          local_eid, new_kind,
-                          branch, new_parent_eid, new_name, new_content));
-  return SVN_NO_ERROR;
-}
-
-static svn_error_t *
-wrap_instantiate(void *baton,
-                 svn_branch_instance_t *branch,
-                 svn_branch_eid_t local_eid,
-                 svn_branch_eid_t new_parent_eid,
-                 const char *new_name,
-                 const svn_element_content_t *new_content,
-                 apr_pool_t *scratch_pool)
-{
-  wrapper_baton_t *eb = baton;
-
-  dbg(eb, scratch_pool, "%s : instantiate(p=%s, n=%s, c=...)",
-      eid_str(local_eid, scratch_pool),
-      eid_str(new_parent_eid, scratch_pool), new_name);
-  SVN_ERR(svn_editor3_instantiate(eb->wrapped_editor,
-                                  branch, local_eid,
-                                  new_parent_eid, new_name, new_content));
-  return SVN_NO_ERROR;
-}
-
-static svn_error_t *
-wrap_copy_one(void *baton,
-              const svn_branch_el_rev_id_t *src_el_rev,
-              svn_branch_instance_t *branch,
-              svn_branch_eid_t local_eid,
-              svn_branch_eid_t new_parent_eid,
-              const char *new_name,
-              const svn_element_content_t *new_content,
-              apr_pool_t *scratch_pool)
-{
-  wrapper_baton_t *eb = baton;
-
-  dbg(eb, scratch_pool, "%s : copy_one(f=%s, p=%s, n=%s, c=...)",
-      eid_str(local_eid, scratch_pool), el_rev_str(src_el_rev, scratch_pool),
-      eid_str(new_parent_eid, scratch_pool), new_name);
-  SVN_ERR(svn_editor3_copy_one(eb->wrapped_editor,
-                               src_el_rev,
-                               branch, local_eid,
-                               new_parent_eid, new_name, new_content));
-  return SVN_NO_ERROR;
-}
-
-static svn_error_t *
-wrap_copy_tree(void *baton,
-               const svn_branch_el_rev_id_t *src_el_rev,
-               svn_branch_instance_t *branch,
-               svn_branch_eid_t new_parent_eid,
-               const char *new_name,
-               apr_pool_t *scratch_pool)
-{
-  wrapper_baton_t *eb = baton;
-
-  dbg(eb, scratch_pool, "... : copy_tree(f=%s, p=%s, n=%s)",
-      el_rev_str(src_el_rev, scratch_pool),
-      eid_str(new_parent_eid, scratch_pool), new_name);
-  SVN_ERR(svn_editor3_copy_tree(eb->wrapped_editor,
-                                src_el_rev,
-                                branch, new_parent_eid, new_name));
-  return SVN_NO_ERROR;
-}
-
-static svn_error_t *
-wrap_delete(void *baton,
-            svn_revnum_t since_rev,
-            svn_branch_instance_t *branch,
-            svn_branch_eid_t eid,
-            apr_pool_t *scratch_pool)
-{
-  wrapper_baton_t *eb = baton;
-
-  dbg(eb, scratch_pool, "%s : delete()",
-      eid_str(eid, scratch_pool));
-  SVN_ERR(svn_editor3_delete(eb->wrapped_editor,
-                             since_rev, branch, eid));
-  return SVN_NO_ERROR;
-}
-
-static svn_error_t *
-wrap_alter(void *baton,
-           svn_revnum_t since_rev,
-           svn_branch_instance_t *branch,
-           svn_branch_eid_t eid,
-           svn_branch_eid_t new_parent_eid,
-           const char *new_name,
-           const svn_element_content_t *new_content,
-           apr_pool_t *scratch_pool)
-{
-  wrapper_baton_t *eb = baton;
-
-  dbg(eb, scratch_pool, "%s : alter(p=%s, n=%s, c=...)",
-      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,
-                            new_parent_eid, new_name, new_content));
-  return SVN_NO_ERROR;
-}
-
-static svn_error_t *
-wrap_sequence_point(void *baton,
-                    apr_pool_t *scratch_pool)
-{
-  wrapper_baton_t *eb = baton;
-
-  dbg(eb, scratch_pool, "sequence_point()");
-  SVN_ERR(svn_editor3_sequence_point(eb->wrapped_editor));
+  SVN_ERR(svn_editor3p_put(eb->wrapped_editor,
+                           loc, new_content));
   return SVN_NO_ERROR;
 }
 
@@ -786,7 +456,7 @@ wrap_complete(void *baton,
   wrapper_baton_t *eb = baton;
 
   dbg(eb, scratch_pool, "complete()");
-  SVN_ERR(svn_editor3_complete(eb->wrapped_editor));
+  SVN_ERR(svn_editor3p_complete(eb->wrapped_editor));
   return SVN_NO_ERROR;
 }
 
@@ -797,16 +467,16 @@ wrap_abort(void *baton,
   wrapper_baton_t *eb = baton;
 
   dbg(eb, scratch_pool, "abort()");
-  SVN_ERR(svn_editor3_abort(eb->wrapped_editor));
+  SVN_ERR(svn_editor3p_abort(eb->wrapped_editor));
   return SVN_NO_ERROR;
 }
 
 svn_error_t *
-svn_editor3__get_debug_editor(svn_editor3_t **editor_p,
-                              svn_editor3_t *wrapped_editor,
-                              apr_pool_t *result_pool)
+svn_editor3p__get_debug_editor(svn_editor3p_t **editor_p,
+                               svn_editor3p_t *wrapped_editor,
+                               apr_pool_t *result_pool)
 {
-  static const svn_editor3_cb_funcs_t wrapper_funcs = {
+  static const svn_editor3p_cb_funcs_t wrapper_funcs = {
     wrap_mk,
     wrap_cp,
     wrap_mv,
@@ -815,13 +485,6 @@ svn_editor3__get_debug_editor(svn_editor
 #endif
     wrap_rm,
     wrap_put,
-    wrap_add,
-    wrap_instantiate,
-    wrap_copy_one,
-    wrap_copy_tree,
-    wrap_delete,
-    wrap_alter,
-    wrap_sequence_point,
     wrap_complete,
     wrap_abort
   };
@@ -841,9 +504,9 @@ svn_editor3__get_debug_editor(svn_editor
     eb->prefix = apr_pstrdup(result_pool, "DBG: ");
   }
 
-  *editor_p = svn_editor3_create(&wrapper_funcs, eb,
-                                 NULL, NULL, /* cancellation */
-                                 result_pool);
+  *editor_p = svn_editor3p_create(&wrapper_funcs, eb,
+                                  NULL, NULL, /* cancellation */
+                                  result_pool);
 
   return SVN_NO_ERROR;
 }

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=1663306&r1=1663305&r2=1663306&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 Mon Mar  2 13:56:06
2015
@@ -1041,9 +1041,9 @@ 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_editor3p__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_repos/commit.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_repos/commit.c?rev=1663306&r1=1663305&r2=1663306&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_repos/commit.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_repos/commit.c Mon Mar  2 13:56:06
2015
@@ -997,10 +997,10 @@ 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,
-                                    repos_url,
-                                    svn_relpath_canonicalize(eb->base_path, pool),
-                                    fetch_func, eb, pool, pool));
+  SVN_ERR(svn_editor3p__insert_shims(editor, edit_baton, *editor, *edit_baton,
+                                     repos_url,
+                                     svn_relpath_canonicalize(eb->base_path, pool),
+                                     fetch_func, eb, pool, pool));
 
   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=1663306&r1=1663305&r2=1663306&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c (original)
+++ subversion/branches/move-tracking-2/subversion/svnmover/svnmover.c Mon Mar  2 13:56:06
2015
@@ -56,7 +56,7 @@
 
 #include "private/svn_cmdline_private.h"
 #include "private/svn_subr_private.h"
-#include "private/svn_editor3.h"
+#include "private/svn_editor3e.h"
 #include "private/svn_ra_private.h"
 #include "private/svn_string_private.h"
 #include "private/svn_sorts_private.h"



Mime
View raw message