subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1682018 - in /subversion/branches/move-tracking-2/subversion: include/private/ libsvn_delta/ libsvn_ra/ libsvn_ra_local/ libsvn_repos/ libsvn_wc/
Date Wed, 27 May 2015 13:30:22 GMT
Author: julianfoad
Date: Wed May 27 13:30:21 2015
New Revision: 1682018

URL: http://svn.apache.org/r1682018
Log:
On the 'move-tracking-2' branch: Remove the 'editor3p' code.

That form of editor is not something I currently see as having a future. It
is presently only a distraction from the main direction of this branch.

Keep a framework of editor shims in place, but whereas the editor3p shims
were implemented in both directions, the editor3e shims are currently only
implemented from an ev3 driver to an ev1 consumer.

* subversion/include/private/svn_editor3p.h,
  subversion/libsvn_delta/compat3p.c,
  subversion/libsvn_delta/editor3p.c,
    Delete these files.

* subversion/include/private/svn_editor3e.h,
  subversion/libsvn_delta/compat3e.c
  (svn_editor3__ev3_from_delta_for_commit): Renamed from
    'svn_delta__ev3_from_delta_for_commit2'.
  (svn_editor3__delta_from_ev3_for_commit,
   svn_editor3__shim_connector_t,
   svn_editor3__insert_shims,
   svn_editor3__set_target_revision_func_t,
   svn_update_editor3_t,
   svn_editor3__ev3_from_delta_for_update,
   svn_editor3__delta_from_ev3_for_update): New, reflecting similar things in
    editor3p, but mostly unimplemented as yet.

* subversion/include/private/svn_delta_private.h
  No longer include "svn_editor3p.h". (It was only there to provide a kind
  of backward-compatibility convenience anyway.)

* subversion/include/private/svn_ra_private.h
  No longer include "svn_editor3p.h".

* subversion/include/private/svn_wc_private.h
  Include "svn_editor3e.h" instead of "svn_editor3p.h".

* subversion/libsvn_ra_local/ra_plugin.c
  (svn_ra_local__do_update_ev3,
   svn_ra_local__do_switch_ev3): Use editor3e shims instead of editor3p.

* subversion/libsvn_ra/ra_loader.c
  (svn_ra_get_commit_editor_ev3,
   svn_ra_get_commit_editor3): Same.

* subversion/libsvn_repos/commit.c
  (svn_repos_get_commit_editor5): Same.

* subversion/libsvn_wc/deprecated.c
  (svn_wc_get_update_editor4): Same.

* subversion/libsvn_wc/update_editor.c
  (make_editor3,
   svn_wc__get_switch_editor): Same.

Removed:
    subversion/branches/move-tracking-2/subversion/include/private/svn_editor3p.h
    subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3p.c
    subversion/branches/move-tracking-2/subversion/libsvn_delta/editor3p.c
Modified:
    subversion/branches/move-tracking-2/subversion/include/private/svn_delta_private.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/include/private/svn_wc_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

Modified: subversion/branches/move-tracking-2/subversion/include/private/svn_delta_private.h
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/include/private/svn_delta_private.h?rev=1682018&r1=1682017&r2=1682018&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/include/private/svn_delta_private.h (original)
+++ subversion/branches/move-tracking-2/subversion/include/private/svn_delta_private.h Wed
May 27 13:30:21 2015
@@ -33,7 +33,6 @@
 #include "svn_error.h"
 #include "svn_delta.h"
 #include "svn_editor.h"
-#include "svn_editor3p.h"
 
 #ifdef __cplusplus
 extern "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=1682018&r1=1682017&r2=1682018&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 13:30:21 2015
@@ -1175,7 +1175,7 @@ typedef struct svn_editor3__shim_connect
  * allocations.
  */
 svn_error_t *
-svn_delta__ev3_from_delta_for_commit2(
+svn_editor3__ev3_from_delta_for_commit(
                         svn_editor3_t **editor_p,
                         svn_editor3__shim_connector_t **shim_connector,
                         const svn_delta_editor_t *deditor,
@@ -1190,6 +1190,114 @@ svn_delta__ev3_from_delta_for_commit2(
                         apr_pool_t *result_pool,
                         apr_pool_t *scratch_pool);
 
+/* Return a delta editor in DEDITOR/DEDITOR_BATON which will drive EDITOR.
+ *
+ * REPOS_ROOT_URL is the repository root URL, and BASE_RELPATH is the
+ * relative path within the repository of the root directory of the edit.
+ * (An Ev1 edit must be rooted at a directory, not at a file.)
+ *
+ * FETCH_FUNC/FETCH_BATON is a callback by which the shim may retrieve the
+ * original or copy-from kind/properties/text for a path being committed.
+ *
+ * SHIM_CONNECTOR can be used to enable a more exact round-trip conversion
+ * from an Ev1 drive to Ev3 and back to Ev1. It must live for the lifetime
+ * of the edit. It may be null if not wanted.
+ *
+ * Allocate the new editor in RESULT_POOL, which may become large and must
+ * live for the lifetime of the edit. Use SCRATCH_POOL for temporary
+ * allocations.
+ */
+svn_error_t *
+svn_editor3__delta_from_ev3_for_commit(
+                        const svn_delta_editor_t **deditor,
+                        void **dedit_baton,
+                        svn_editor3_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,
+                        apr_pool_t *result_pool,
+                        apr_pool_t *scratch_pool);
+
+/* Return in NEW_DEDITOR/NEW_DETIT_BATON a delta editor that wraps
+ * OLD_DEDITOR/OLD_DEDIT_BATON, inserting a pair of shims that convert
+ * Ev1 to Ev3 and back to Ev1.
+ *
+ * REPOS_ROOT_URL is the repository root URL, and BASE_RELPATH is the
+ * relative path within the repository of the root directory of the edit.
+ *
+ * FETCH_FUNC/FETCH_BATON is a callback by which the shim may retrieve the
+ * original or copy-from kind/properties/text for a path being committed.
+ */
+svn_error_t *
+svn_editor3__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,
+                        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)(
+  void *baton,
+  svn_revnum_t target_revision,
+  apr_pool_t *scratch_pool);
+
+/* An update (or switch) editor.
+ *
+ * This consists of a plain Ev3 editor and the additional methods or
+ * resources needed for use as an update or switch editor.
+ */
+typedef struct svn_update_editor3_t {
+  /* The basic editor. */
+  svn_editor3_t *editor;
+
+  /* A method to communicate the target revision of the update (or switch),
+   * 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;
+  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_update_editor3_t **editor_p,
+                        const svn_delta_editor_t *deditor,
+                        void *dedit_baton,
+                        svn_branch_revision_root_t *branching_txn,
+                        const char *repos_root_url,
+                        const char *base_repos_relpath,
+                        svn_editor3__shim_fetch_func_t fetch_func,
+                        void *fetch_baton,
+                        svn_cancel_func_t cancel_func,
+                        void *cancel_baton,
+                        apr_pool_t *result_pool,
+                        apr_pool_t *scratch_pool);
+
+/* Like svn_delta__delta_from_ev3_for_commit() but for an update editor.
+ */
+svn_error_t *
+svn_editor3__delta_from_ev3_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,
+                        void *fetch_baton,
+                        apr_pool_t *result_pool,
+                        apr_pool_t *scratch_pool);
+
 
 #ifdef __cplusplus
 }

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=1682018&r1=1682017&r2=1682018&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 Wed May
27 13:30:21 2015
@@ -34,7 +34,6 @@
 #include "svn_delta.h"
 #include "svn_editor.h"
 #include "svn_io.h"
-#include "private/svn_editor3p.h"
 #include "private/svn_editor3e.h"
 
 #ifdef __cplusplus

Modified: subversion/branches/move-tracking-2/subversion/include/private/svn_wc_private.h
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/include/private/svn_wc_private.h?rev=1682018&r1=1682017&r2=1682018&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/include/private/svn_wc_private.h (original)
+++ subversion/branches/move-tracking-2/subversion/include/private/svn_wc_private.h Wed May
27 13:30:21 2015
@@ -40,7 +40,7 @@
 #include "svn_types.h"
 #include "svn_wc.h"
 #include "private/svn_diff_tree.h"
-#include "private/svn_editor3p.h"
+#include "private/svn_editor3e.h"
 
 #ifdef __cplusplus
 extern "C" {

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=1682018&r1=1682017&r2=1682018&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 13:30:21
2015
@@ -55,6 +55,127 @@ peg_path_str(svn_pathrev_t loc,
 
 /*
  * ========================================================================
+ * Configuration Options
+ * ========================================================================
+ */
+
+/* Features that are not wanted for this commit editor shim but may be
+ * wanted in a similar but different shim such as for an update editor. */
+/* #define SHIM_WITH_ADD_ABSENT */
+/* #define SHIM_WITH_UNLOCK */
+
+/* The Ev2 shim ran the accumulated actions during abort... But why?
+ * If we don't, then aborting and re-opening a commit txn doesn't find
+ * all the previous changes, so tests/libsvn_repos/repos-test 12 fails.
+ */
+/* #define SHIM_WITH_ACTIONS_DURING_ABORT */
+
+/* Whether to support switching from relative to absolute paths in the
+ * Ev1 methods. */
+/* #define SHIM_WITH_ABS_PATHS */
+
+
+/*
+ * ========================================================================
+ * Shim Connector
+ * ========================================================================
+ *
+ * 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
+{
+  /* Set to true if and when an Ev1 receiving shim receives an absolute
+   * path (prefixed with '/') from the delta edit, and causes the Ev1
+   * sending shim to send absolute paths.
+   * ### NOT IMPLEMENTED
+   */
+#ifdef SHIM_WITH_ABS_PATHS
+  svn_boolean_t *ev1_absolute_paths;
+#endif
+
+  /* The Ev1 set_target_revision and start_edit methods, respectively, will
+   * call the TARGET_REVISION_FUNC and START_EDIT_FUNC callbacks, if non-null.
+   * 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;
+
+  /* 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
+   * going to modify that directory. (If it does modify it, then it will
+   * pass in the appropriate base revision at that time.) If null
+   * or if the driver does not call it, then the Ev1
+   * open_root() method will be called with SVN_INVALID_REVNUM as the base
+   * revision parameter.
+   */
+  svn_delta__start_edit_func_t start_edit_func;
+
+#ifdef SHIM_WITH_UNLOCK
+  /* A callback which will be called when an unlocking action is received.
+     (For update editors?) */
+  svn_delta__unlock_func_t unlock_func;
+#endif
+
+  void *baton;
+};
+
+svn_error_t *
+svn_editor3__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,
+                        void *fetch_baton,
+                        apr_pool_t *result_pool,
+                        apr_pool_t *scratch_pool)
+{
+#if 0
+  svn_editor3_t *editor3;
+  svn_editor3__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(
+                        &editor3,
+                        &shim_connector,
+                        old_deditor, old_dedit_baton,
+                        branching_txn,
+                        repos_root, base_relpath,
+                        fetch_func, fetch_baton,
+                        NULL, NULL /*cancel*/,
+                        result_pool, scratch_pool));
+#ifdef SVN_DEBUG
+  /*SVN_ERR(svn_editor3__get_debug_editor(&editor3, editor3, result_pool));*/
+#endif
+  SVN_ERR(svn_editor3__delta_from_ev3_for_commit(
+                        new_deditor, new_dedit_baton,
+                        editor3,
+                        repos_root, base_relpath,
+                        fetch_func, fetch_baton,
+                        shim_connector,
+                        result_pool, scratch_pool));
+#ifdef SVN_DEBUG
+  /*SVN_ERR(svn_delta__get_debug_editor(new_deditor, new_dedit_baton,
+                                      *new_deditor, *new_dedit_baton,
+                                      "[IN]  ", result_pool));*/
+#endif
+#else
+  *new_deditor = old_deditor;
+  *new_dedit_baton = old_dedit_baton;
+#endif
+  return SVN_NO_ERROR;
+}
+
+
+/*
+ * ========================================================================
  * Buffering the Delta Editor Changes
  * ========================================================================
  */
@@ -301,6 +422,68 @@ delete_subtree(apr_hash_t *changes,
 
 /*
  * ===================================================================
+ * Commit Editor converter to join a v1 driver to a v3 consumer
+ * ===================================================================
+ *
+ * ...
+ */
+
+svn_error_t *
+svn_editor3__delta_from_ev3_for_commit(
+                        const svn_delta_editor_t **deditor,
+                        void **dedit_baton,
+                        svn_editor3_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,
+                        apr_pool_t *result_pool,
+                        apr_pool_t *scratch_pool)
+{
+  /* ### ... */
+
+  return SVN_NO_ERROR;
+}
+
+svn_error_t *
+svn_editor3__delta_from_ev3_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,
+                        void *fetch_baton,
+                        apr_pool_t *result_pool,
+                        apr_pool_t *scratch_pool)
+{
+  svn_editor3__shim_connector_t *shim_connector
+    = apr_pcalloc(result_pool, sizeof(*shim_connector));
+
+  shim_connector->target_revision_func = update_editor->set_target_revision_func;
+  shim_connector->baton = update_editor->set_target_revision_baton;
+#ifdef SHIM_WITH_ABS_PATHS
+  shim_connector->ev1_absolute_paths /*...*/;
+#endif
+
+  SVN_ERR(svn_editor3__delta_from_ev3_for_commit(
+                        deditor, dedit_baton,
+                        update_editor->editor,
+                        repos_root_url, base_repos_relpath,
+                        fetch_func, fetch_baton,
+                        shim_connector,
+                        result_pool, scratch_pool));
+  /*SVN_ERR(svn_delta__get_debug_editor(deditor, dedit_baton,
+                                      *deditor, *dedit_baton,
+                                      "[UP>1] ", result_pool));*/
+
+  return SVN_NO_ERROR;
+}
+
+
+/*
+ * ===================================================================
  * Commit Editor converter to join a v3 driver to a v1 consumer
  * ===================================================================
  *
@@ -1594,7 +1777,7 @@ editor3_abort(void *baton,
 }
 
 svn_error_t *
-svn_delta__ev3_from_delta_for_commit2(
+svn_editor3__ev3_from_delta_for_commit(
                         svn_editor3_t **editor_p,
                         svn_editor3__shim_connector_t **shim_connector,
                         const svn_delta_editor_t *deditor,
@@ -1666,3 +1849,51 @@ svn_delta__ev3_from_delta_for_commit2(
 
   return SVN_NO_ERROR;
 }
+
+svn_error_t *
+svn_editor3__ev3_from_delta_for_update(
+                        svn_update_editor3_t **update_editor_p,
+                        const svn_delta_editor_t *deditor,
+                        void *dedit_baton,
+                        svn_branch_revision_root_t *branching_txn,
+                        const char *repos_root_url,
+                        const char *base_repos_relpath,
+                        svn_editor3__shim_fetch_func_t fetch_func,
+                        void *fetch_baton,
+                        svn_cancel_func_t cancel_func,
+                        void *cancel_baton,
+                        apr_pool_t *result_pool,
+                        apr_pool_t *scratch_pool)
+{
+  svn_update_editor3_t *update_editor
+    = apr_pcalloc(result_pool, sizeof(*update_editor));
+  svn_editor3__shim_connector_t *shim_connector;
+
+  SVN_DBG(("svn_delta__ev3_from_delta_for_update(base='%s')...",
+           base_repos_relpath));
+
+  /*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(
+                        &update_editor->editor,
+                        &shim_connector,
+                        deditor, dedit_baton,
+                        branching_txn, repos_root_url, base_repos_relpath,
+                        fetch_func, fetch_baton,
+                        cancel_func, cancel_baton,
+                        result_pool, scratch_pool));
+
+  update_editor->set_target_revision_func = shim_connector->target_revision_func;
+  update_editor->set_target_revision_baton = shim_connector->baton;
+  /* shim_connector->start_edit_func = open_root_ev3; */
+#ifdef SHIM_WITH_ABS_PATHS
+  update_editor->ev1_absolute_paths /*...*/;
+#endif
+#ifdef SHIM_WITH_UNLOCK
+  update_editor->unlock_func = do_unlock;
+#endif
+
+  *update_editor_p = update_editor;
+  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=1682018&r1=1682017&r2=1682018&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 Wed May 27 13:30:21
2015
@@ -1031,7 +1031,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_delta__ev3_from_delta_for_commit2(
+    SVN_ERR(svn_editor3__ev3_from_delta_for_commit(
                         editor,
                         &shim_connector,
                         deditor, dedit_baton, branching_txn,
@@ -1070,9 +1070,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_editor3p__insert_shims(editor, edit_baton, *editor, *edit_baton,
-                                       repos_root_url, base_relpath,
-                                       svn_ra_fetch, fbb, pool, pool));
+    SVN_ERR(svn_editor3__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=1682018&r1=1682017&r2=1682018&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 Wed May 27
13:30:21 2015
@@ -1077,7 +1077,7 @@ svn_ra_local__do_update_ev3(svn_ra_sessi
   void *update_baton;
 
   fb->session = session;
-  SVN_ERR(svn_delta__delta_from_ev3_for_update(
+  SVN_ERR(svn_editor3__delta_from_ev3_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_delta__delta_from_ev3_for_update(
+  SVN_ERR(svn_editor3__delta_from_ev3_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=1682018&r1=1682017&r2=1682018&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_repos/commit.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_repos/commit.c Wed May 27 13:30:21
2015
@@ -46,7 +46,7 @@
 #include "private/svn_fspath.h"
 #include "private/svn_fs_private.h"
 #include "private/svn_repos_private.h"
-#include "private/svn_delta_private.h"
+#include "private/svn_editor3e.h"
 
 
 
@@ -1050,10 +1050,10 @@ svn_repos_get_commit_editor5(const svn_d
   *edit_baton = eb;
   *editor = e;
 
-  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));
+  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));
 
   return SVN_NO_ERROR;
 }

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=1682018&r1=1682017&r2=1682018&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_wc/deprecated.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_wc/deprecated.c Wed May 27 13:30:21
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_delta__delta_from_ev3_for_update(
+  SVN_ERR(svn_editor3__delta_from_ev3_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=1682018&r1=1682017&r2=1682018&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 Wed May 27 13:30:21
2015
@@ -5108,9 +5108,10 @@ 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_delta__ev3_from_delta_for_update(
+    SVN_ERR(svn_editor3__ev3_from_delta_for_update(
                         editor,
                         inner_editor, inner_baton,
+                        NULL /* ### branching_txn */,
                         repos_root, anchor_repos_relpath,
                         svn_wc__fetch_func, sfb,
                         cancel_func, cancel_baton,
@@ -5638,7 +5639,7 @@ svn_wc__get_switch_editor(const svn_delt
   sfb->base_rrpath = anchor_repos_relpath;
   sfb->fetch_base = TRUE;
 
-  SVN_ERR(svn_delta__delta_from_ev3_for_update(
+  SVN_ERR(svn_editor3__delta_from_ev3_for_update(
                       editor, edit_baton,
                       editor3,
                       repos_root, anchor_repos_relpath,



Mime
View raw message