subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hwri...@apache.org
Subject svn commit: r1228555 - /subversion/trunk/subversion/libsvn_wc/diff_editor.c
Date Sat, 07 Jan 2012 02:56:49 GMT
Author: hwright
Date: Sat Jan  7 02:56:49 2012
New Revision: 1228555

URL: http://svn.apache.org/viewvc?rev=1228555&view=rev
Log:
Ev2 shims: Add appropriate callbacks for the working copy diff editor.

Current number of failing Ev2 tests: 300

* subversion/libsvn_wc/diff_editor.c
  (svn_wc_get_diff_editor6): Use the library-supplied shim fetching functions.

Modified:
    subversion/trunk/subversion/libsvn_wc/diff_editor.c

Modified: subversion/trunk/subversion/libsvn_wc/diff_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/diff_editor.c?rev=1228555&r1=1228554&r2=1228555&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/diff_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/diff_editor.c Sat Jan  7 02:56:49 2012
@@ -1880,6 +1880,7 @@ svn_wc_get_diff_editor6(const svn_delta_
   void *inner_baton;
   svn_delta_editor_t *tree_editor;
   const svn_delta_editor_t *inner_editor;
+  struct svn_wc__shim_fetch_baton_t *sfb;
   svn_delta_shim_callbacks_t *shim_callbacks =
                                 svn_delta_shim_callbacks_default(result_pool);
 
@@ -1933,6 +1934,19 @@ svn_wc_get_diff_editor6(const svn_delta_
                                             edit_baton,
                                             result_pool));
 
+  sfb = apr_palloc(result_pool, sizeof(*sfb));
+  sfb->db = wc_ctx->db;
+  sfb->base_abspath = eb->anchor_abspath;
+  sfb->fetch_base = FALSE;
+
+  shim_callbacks->fetch_kind_func = svn_wc__fetch_kind_func;
+  shim_callbacks->fetch_kind_baton = sfb;
+  shim_callbacks->fetch_props_func = svn_wc__fetch_props_func;
+  shim_callbacks->fetch_props_baton = sfb;
+  shim_callbacks->fetch_base_func = svn_wc__fetch_base_func;
+  shim_callbacks->fetch_base_baton = sfb;
+
+
   SVN_ERR(svn_editor__insert_shims(editor, edit_baton, *editor, *edit_baton,
                                    shim_callbacks, result_pool, scratch_pool));
 



Mime
View raw message