subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hwri...@apache.org
Subject svn commit: r1231358 - /subversion/branches/ev2-export/subversion/libsvn_client/export.c
Date Fri, 13 Jan 2012 22:28:09 GMT
Author: hwright
Date: Fri Jan 13 22:28:09 2012
New Revision: 1231358

URL: http://svn.apache.org/viewvc?rev=1231358&view=rev
Log:
On the ev2-editor branch:
Insert out own shim layer, rather than the generic one.

* subversion/libsvn_client/export.c
  (get_editor): Manually insert the Ev2 shims.

Modified:
    subversion/branches/ev2-export/subversion/libsvn_client/export.c

Modified: subversion/branches/ev2-export/subversion/libsvn_client/export.c
URL: http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/libsvn_client/export.c?rev=1231358&r1=1231357&r2=1231358&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/libsvn_client/export.c (original)
+++ subversion/branches/ev2-export/subversion/libsvn_client/export.c Fri Jan 13 22:28:09 2012
@@ -1080,6 +1080,10 @@ get_editor(const svn_delta_editor_t **ex
   svn_delta_editor_t *editor = svn_delta_default_editor(result_pool);
   svn_delta_shim_callbacks_t *shim_callbacks =
                                 svn_delta_shim_callbacks_default(result_pool);
+  svn_editor_t *editorv2;
+  struct svn_delta__extra_baton *exb;
+  svn_boolean_t *found_abs_paths = apr_palloc(result_pool,
+                                              sizeof(*found_abs_paths));
 
   editor->set_target_revision = set_target_revision;
   editor->open_root = open_root;
@@ -1103,9 +1107,20 @@ get_editor(const svn_delta_editor_t **ex
   shim_callbacks->fetch_base_func = fetch_base_func;
   shim_callbacks->fetch_baton = eb;
 
-  SVN_ERR(svn_editor__insert_shims(export_editor, edit_baton,
-                                   *export_editor, *edit_baton,
-                                   shim_callbacks, result_pool, scratch_pool));
+  SVN_ERR(svn_delta__editor_from_delta(&editorv2, &exb, *export_editor,
+                            *edit_baton, found_abs_paths, NULL, NULL,
+                            shim_callbacks->fetch_kind_func,
+                            shim_callbacks->fetch_baton,
+                            shim_callbacks->fetch_props_func,
+                            shim_callbacks->fetch_baton,
+                            result_pool, scratch_pool));
+  SVN_ERR(svn_delta__delta_from_editor(export_editor, edit_baton,
+                            editorv2, found_abs_paths,
+                            shim_callbacks->fetch_props_func,
+                            shim_callbacks->fetch_baton,
+                            shim_callbacks->fetch_base_func,
+                            shim_callbacks->fetch_baton,
+                            exb, result_pool));
 
   return SVN_NO_ERROR;
 }



Mime
View raw message