subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hwri...@apache.org
Subject svn commit: r1325039 - in /subversion/trunk/subversion: include/ libsvn_client/ libsvn_delta/ libsvn_ra_neon/ libsvn_ra_serf/ libsvn_ra_svn/ libsvn_repos/ libsvn_wc/ svnrdump/ tests/cmdline/
Date Wed, 11 Apr 2012 22:04:22 GMT
Author: hwright
Date: Wed Apr 11 22:04:21 2012
New Revision: 1325039

URL: http://svn.apache.org/viewvc?rev=1325039&view=rev
Log:
Ev2 shims: finish using repos_relpaths internally in the Ev2 shims.  Now, all
the paths provided to an Ev2 editor are repos relative, rather than some
arbitrary root.  This leaves 1 outstanding test failure when ev2 is enabled.

* subversion/libsvn_ra_svn/editorp.c,
  subversion/libsvn_repos/commit.c,
  subversion/libsvn_repos/dump.c,
  subversion/libsvn_wc/status.c,
  subversion/libsvn_wc/diff_editor.c,
  subversion/libsvn_wc/update_editor.c,
  subversion/libsvn_client/export.c,
  subversion/libsvn_client/repos_diff.c,
  subversion/libsvn_ra_neon/commit.c,
  subversion/svnrdump/dump_editor.c,
  subversion/libsvn_ra_serf/commit.c:
    Update various shim constructors.

* subversion/libsvn_repos/commit.c
  (svn_repos_get_commit_editor5): Provide a real base path to the shims.

* subversion/libsvn_delta/compat.c
  (ev2_edit_baton): Store the base relpath.
  (ev2_dir_baton): Rename a member for clarity.
  (map_to_relpath): Remove.
  (map_to_repos_relpath): Pre-pend the base path to get a repos_relpath.
  (ev2_open_root): Use the base path for the root path.
  (ev2_delete_entry, ev2_add_diretory, ev2_open_directory, ev2_absent_directory,
   ev2_add_file, ev2_open_file, ev2_absent_file): Map paths to repos relpaths.
  (delta_from_editor, editor_from_delta): Take and stash the given base path. 
  (build): Remove the base path from the incoming relpath, so as to
    correctly drive the underlying Ev1 editor.
  (svn_editor__insert_shims): Take, manipulate, and the pass down the base path.

* subversion/include/svn_delta.h
  (svn_editor__insert_shims): Add base_dir param.

Modified:
    subversion/trunk/subversion/include/svn_delta.h
    subversion/trunk/subversion/libsvn_client/export.c
    subversion/trunk/subversion/libsvn_client/repos_diff.c
    subversion/trunk/subversion/libsvn_delta/compat.c
    subversion/trunk/subversion/libsvn_ra_neon/commit.c
    subversion/trunk/subversion/libsvn_ra_serf/commit.c
    subversion/trunk/subversion/libsvn_ra_svn/editorp.c
    subversion/trunk/subversion/libsvn_repos/commit.c
    subversion/trunk/subversion/libsvn_repos/dump.c
    subversion/trunk/subversion/libsvn_wc/diff_editor.c
    subversion/trunk/subversion/libsvn_wc/status.c
    subversion/trunk/subversion/libsvn_wc/update_editor.c
    subversion/trunk/subversion/svnrdump/dump_editor.c
    subversion/trunk/subversion/tests/cmdline/diff_tests.py

Modified: subversion/trunk/subversion/include/svn_delta.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_delta.h?rev=1325039&r1=1325038&r2=1325039&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_delta.h (original)
+++ subversion/trunk/subversion/include/svn_delta.h Wed Apr 11 22:04:21 2012
@@ -1171,6 +1171,7 @@ svn_editor__insert_shims(const svn_delta
                          const svn_delta_editor_t *deditor_in,
                          void *dedit_baton_in,
                          const char *repos_root,
+                         const char *base_dir,
                          svn_delta_shim_callbacks_t *shim_callbacks,
                          apr_pool_t *result_pool,
                          apr_pool_t *scratch_pool);

Modified: subversion/trunk/subversion/libsvn_client/export.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/export.c?rev=1325039&r1=1325038&r2=1325039&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/export.c (original)
+++ subversion/trunk/subversion/libsvn_client/export.c Wed Apr 11 22:04:21 2012
@@ -1236,7 +1236,8 @@ svn_client_export5(svn_revnum_t *result_
 
           SVN_ERR(svn_editor__insert_shims(&export_editor, &edit_baton,
                                            export_editor, edit_baton,
-                                           NULL, shim_callbacks, pool, pool));
+                                           NULL, NULL, shim_callbacks,
+                                           pool, pool));
 
           /* Manufacture a basic 'report' to the update reporter. */
           SVN_ERR(svn_ra_do_update2(ra_session,

Modified: subversion/trunk/subversion/libsvn_client/repos_diff.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/repos_diff.c?rev=1325039&r1=1325038&r2=1325039&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/repos_diff.c (original)
+++ subversion/trunk/subversion/libsvn_client/repos_diff.c Wed Apr 11 22:04:21 2012
@@ -1464,7 +1464,7 @@ svn_client__get_diff_editor(const svn_de
   shim_callbacks->fetch_baton = eb;
 
   SVN_ERR(svn_editor__insert_shims(editor, edit_baton, *editor, *edit_baton,
-                                   NULL, shim_callbacks,
+                                   NULL, NULL, shim_callbacks,
                                    result_pool, result_pool));
 
   return SVN_NO_ERROR;

Modified: subversion/trunk/subversion/libsvn_delta/compat.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_delta/compat.c?rev=1325039&r1=1325038&r2=1325039&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_delta/compat.c (original)
+++ subversion/trunk/subversion/libsvn_delta/compat.c Wed Apr 11 22:04:21 2012
@@ -140,6 +140,7 @@ struct ev2_edit_baton
 
   /* For calculating relpaths from Ev1 copyfrom urls. */
   const char *repos_root;
+  const char *base_relpath;
 
   apr_pool_t *edit_pool;
   struct extra_baton *exb;
@@ -164,7 +165,7 @@ struct ev2_dir_baton
   const char *path;
   svn_revnum_t base_revision;
 
-  const char *copyfrom_path;
+  const char *copyfrom_relpath;
   svn_revnum_t copyfrom_rev;
 };
 
@@ -598,31 +599,10 @@ run_ev2_actions(struct ev2_edit_baton *e
 
 
 static const char *
-map_to_relpath(struct ev2_edit_baton *eb,
-               const char *path_or_url,
-               apr_pool_t *result_pool)
-{
-  if (svn_relpath_is_canonical(path_or_url))
-    return apr_pstrdup(result_pool, path_or_url);
-
-#ifdef SVN_DEBUG
-  SVN_DBG(("path='%s'\n", path_or_url));
-#endif
-
-  /* ### do something here  */
-
-  return path_or_url;
-}
-
-
-static const char *
 map_to_repos_relpath(struct ev2_edit_baton *eb,
                      const char *path_or_url,
                      apr_pool_t *result_pool)
 {
-  if (svn_relpath_is_canonical(path_or_url))
-    return apr_pstrdup(result_pool, path_or_url);
-
 #ifdef SVN_DEBUG
   SVN_DBG(("repos_path='%s'\n", path_or_url));
 #endif
@@ -633,10 +613,10 @@ map_to_repos_relpath(struct ev2_edit_bat
     }
   else
     {
-      if (path_or_url[0] == '/')
-        return path_or_url + 1;
-      else
-        return path_or_url;
+      return svn_relpath_join(eb->base_relpath,
+                              path_or_url[0] == '/'
+                                    ? path_or_url + 1 : path_or_url,
+                              result_pool);
     }
 }
 
@@ -665,7 +645,7 @@ ev2_open_root(void *edit_baton,
   struct ev2_edit_baton *eb = edit_baton;
 
   db->eb = eb;
-  db->path = "";
+  db->path = apr_pstrdup(eb->edit_pool, eb->base_relpath);
   db->base_revision = base_revision;
 
   *root_baton = db;
@@ -684,7 +664,7 @@ ev2_delete_entry(const char *path,
 {
   struct ev2_dir_baton *pb = parent_baton;
   svn_revnum_t *revnum = apr_palloc(pb->eb->edit_pool, sizeof(*revnum));
-  const char *relpath = map_to_relpath(pb->eb, path, scratch_pool);
+  const char *relpath = map_to_repos_relpath(pb->eb, path, scratch_pool);
   struct change_node *change = locate_change(pb->eb, relpath);
 
   if (SVN_IS_VALID_REVNUM(revision))
@@ -723,7 +703,7 @@ ev2_add_directory(const char *path,
   apr_pool_t *scratch_pool = result_pool;
   struct ev2_dir_baton *pb = parent_baton;
   struct ev2_dir_baton *cb = apr_pcalloc(result_pool, sizeof(*cb));
-  const char *relpath = map_to_relpath(pb->eb, path, scratch_pool);
+  const char *relpath = map_to_repos_relpath(pb->eb, path, scratch_pool);
   struct change_node *change = locate_change(pb->eb, relpath);
 
   /* ### assert that RESTRUCTURE is NONE or DELETE?  */
@@ -742,11 +722,11 @@ ev2_add_directory(const char *path,
       *kind = svn_kind_dir;
       SVN_ERR(add_action(pb->eb, relpath, ACTION_ADD, kind));
 
-      if (pb->copyfrom_path)
+      if (pb->copyfrom_relpath)
         {
           const char *name = svn_relpath_basename(relpath, scratch_pool);
-          cb->copyfrom_path = svn_relpath_join(pb->copyfrom_path, name,
-                                               result_pool);
+          cb->copyfrom_relpath = svn_relpath_join(pb->copyfrom_relpath, name,
+                                                  result_pool);
           cb->copyfrom_rev = pb->copyfrom_rev;
         }
     }
@@ -763,7 +743,7 @@ ev2_add_directory(const char *path,
       args->copyfrom_rev = change->copyfrom_rev;
       SVN_ERR(add_action(pb->eb, relpath, ACTION_COPY, args));
 
-      cb->copyfrom_path = change->copyfrom_path;
+      cb->copyfrom_relpath = change->copyfrom_path;
       cb->copyfrom_rev = change->copyfrom_rev;
     }
 
@@ -781,19 +761,19 @@ ev2_open_directory(const char *path,
   apr_pool_t *scratch_pool = result_pool;
   struct ev2_dir_baton *pb = parent_baton;
   struct ev2_dir_baton *db = apr_pcalloc(result_pool, sizeof(*db));
-  const char *relpath = map_to_relpath(pb->eb, path, scratch_pool);
+  const char *relpath = map_to_repos_relpath(pb->eb, path, scratch_pool);
 
   db->eb = pb->eb;
   db->path = apr_pstrdup(result_pool, relpath);
   db->base_revision = base_revision;
 
-  if (pb->copyfrom_path)
+  if (pb->copyfrom_relpath)
     {
       /* We are inside a copy. */
       const char *name = svn_relpath_basename(relpath, scratch_pool);
 
-      db->copyfrom_path = svn_relpath_join(pb->copyfrom_path, name,
-                                           result_pool);
+      db->copyfrom_relpath = svn_relpath_join(pb->copyfrom_relpath, name,
+                                              result_pool);
       db->copyfrom_rev = pb->copyfrom_rev;
     }
 
@@ -829,7 +809,7 @@ ev2_absent_directory(const char *path,
 {
   struct ev2_dir_baton *pb = parent_baton;
   svn_kind_t *kind = apr_palloc(pb->eb->edit_pool, sizeof(*kind));
-  const char *relpath = map_to_relpath(pb->eb, path, scratch_pool);
+  const char *relpath = map_to_repos_relpath(pb->eb, path, scratch_pool);
 
   *kind = svn_kind_dir;
   SVN_ERR(add_action(pb->eb, relpath, ACTION_ADD_ABSENT, kind));
@@ -849,7 +829,7 @@ ev2_add_file(const char *path,
   apr_pool_t *scratch_pool = result_pool;
   struct ev2_file_baton *fb = apr_pcalloc(result_pool, sizeof(*fb));
   struct ev2_dir_baton *pb = parent_baton;
-  const char *relpath = map_to_relpath(pb->eb, path, scratch_pool);
+  const char *relpath = map_to_repos_relpath(pb->eb, path, scratch_pool);
   struct change_node *change = locate_change(pb->eb, relpath);
 
   /* ### assert that RESTRUCTURE is NONE or DELETE?  */
@@ -905,23 +885,24 @@ ev2_open_file(const char *path,
   apr_pool_t *scratch_pool = result_pool;
   struct ev2_file_baton *fb = apr_pcalloc(result_pool, sizeof(*fb));
   struct ev2_dir_baton *pb = parent_baton;
-  const char *relpath = map_to_relpath(pb->eb, path, scratch_pool);
+  const char *relpath = map_to_repos_relpath(pb->eb, path, scratch_pool);
 
   fb->eb = pb->eb;
   fb->path = apr_pstrdup(result_pool, relpath);
   fb->base_revision = base_revision;
 
-  if (pb->copyfrom_path)
+  if (pb->copyfrom_relpath)
     {
       /* We're in a copied directory, so the delta base is going to be
          based up on the copy source. */
       const char *name = svn_relpath_basename(relpath, scratch_pool);
-      const char *copyfrom_path = svn_relpath_join(pb->copyfrom_path, name,
-                                                   scratch_pool);
+      const char *copyfrom_relpath = svn_relpath_join(pb->copyfrom_relpath,
+                                                      name,
+                                                      scratch_pool);
 
       SVN_ERR(fb->eb->fetch_base_func(&fb->delta_base,
                                       fb->eb->fetch_base_baton,
-                                      copyfrom_path, pb->copyfrom_rev,
+                                      copyfrom_relpath, pb->copyfrom_rev,
                                       result_pool, scratch_pool));
     }
   else
@@ -1042,7 +1023,7 @@ ev2_absent_file(const char *path,
 {
   struct ev2_dir_baton *pb = parent_baton;
   svn_kind_t *kind = apr_palloc(pb->eb->edit_pool, sizeof(*kind));
-  const char *relpath = map_to_relpath(pb->eb, path, scratch_pool);
+  const char *relpath = map_to_repos_relpath(pb->eb, path, scratch_pool);
 
   *kind = svn_kind_file;
   SVN_ERR(add_action(pb->eb, relpath, ACTION_ADD_ABSENT, kind));
@@ -1102,6 +1083,7 @@ delta_from_editor(const svn_delta_editor
                   void *unlock_baton,
                   svn_boolean_t *found_abs_paths,
                   const char *repos_root,
+                  const char *base_relpath,
                   svn_delta_fetch_props_func_t fetch_props_func,
                   void *fetch_props_baton,
                   svn_delta_fetch_base_func_t fetch_base_func,
@@ -1139,6 +1121,7 @@ delta_from_editor(const svn_delta_editor
   *eb->found_abs_paths = FALSE;
   eb->exb = exb;
   eb->repos_root = apr_pstrdup(pool, repos_root);
+  eb->base_relpath = apr_pstrdup(pool, base_relpath);
 
   eb->fetch_props_func = fetch_props_func;
   eb->fetch_props_baton = fetch_props_baton;
@@ -1198,6 +1181,7 @@ struct editor_baton
   struct operation root;
   svn_boolean_t *make_abs_paths;
   const char *repos_root;
+  const char *base_relpath;
 
   apr_hash_t *paths;
   apr_pool_t *edit_pool;
@@ -1267,7 +1251,7 @@ build(struct editor_baton *eb,
       svn_revnum_t head,
       apr_pool_t *scratch_pool)
 {
-  apr_array_header_t *path_bits = svn_path_decompose(relpath, scratch_pool);
+  apr_array_header_t *path_bits;
   const char *path_so_far = "";
   struct operation *operation = &eb->root;
   int i;
@@ -1276,10 +1260,13 @@ build(struct editor_baton *eb,
   SVN_ERR_ASSERT((props && action == ACTION_PROPSET)
                 || (!props && action != ACTION_PROPSET) );
 
+  relpath = svn_relpath_skip_ancestor(eb->base_relpath, relpath);
+
   /* Look for any previous operations we've recognized for PATH.  If
      any of PATH's ancestors have not yet been traversed, we'll be
      creating OP_OPEN operations for them as we walk down PATH's path
      components. */
+  path_bits = svn_path_decompose(relpath, scratch_pool);
   for (i = 0; i < path_bits->nelts; ++i)
     {
       const char *path_bit = APR_ARRAY_IDX(path_bits, i, const char *);
@@ -1304,7 +1291,10 @@ build(struct editor_baton *eb,
                                      scratch_pool, scratch_pool));
       else
         SVN_ERR(eb->fetch_props_func(&current_props, eb->fetch_props_baton,
-                                     relpath, rev, scratch_pool,
+                                     svn_relpath_join(eb->base_relpath,
+                                                      relpath,
+                                                      scratch_pool),
+                                     rev, scratch_pool,
                                      scratch_pool));
 
       SVN_ERR(svn_prop_diffs(&propdiffs, props, current_props, scratch_pool));
@@ -2013,6 +2003,7 @@ editor_from_delta(svn_editor_t **editor_
                   void *dedit_baton,
                   svn_boolean_t *send_abs_paths,
                   const char *repos_root,
+                  const char *base_relpath,
                   svn_cancel_func_t cancel_func,
                   void *cancel_baton,
                   svn_delta_fetch_kind_func_t fetch_kind_func,
@@ -2047,6 +2038,7 @@ editor_from_delta(svn_editor_t **editor_
   eb->edit_pool = result_pool;
   eb->paths = apr_hash_make(result_pool);
   eb->repos_root = apr_pstrdup(result_pool, repos_root);
+  eb->base_relpath = apr_pstrdup(result_pool, base_relpath);
 
   eb->fetch_kind_func = fetch_kind_func;
   eb->fetch_kind_baton = fetch_kind_baton;
@@ -2099,6 +2091,7 @@ svn_editor__insert_shims(const svn_delta
                          const svn_delta_editor_t *deditor_in,
                          void *dedit_baton_in,
                          const char *repos_root,
+                         const char *base_relpath,
                          svn_delta_shim_callbacks_t *shim_callbacks,
                          apr_pool_t *result_pool,
                          apr_pool_t *scratch_pool)
@@ -2132,9 +2125,14 @@ svn_editor__insert_shims(const svn_delta
   SVN_ERR_ASSERT(shim_callbacks->fetch_props_func != NULL);
   SVN_ERR_ASSERT(shim_callbacks->fetch_base_func != NULL);
 
+  if (!base_relpath)
+    base_relpath = "";
+  else if (base_relpath[0] == '/')
+    base_relpath += 1;
+
   SVN_ERR(editor_from_delta(&editor, &exb, &unlock_func, &unlock_baton,
                             deditor_in, dedit_baton_in,
-                            found_abs_paths, repos_root,
+                            found_abs_paths, repos_root, base_relpath,
                             NULL, NULL,
                             shim_callbacks->fetch_kind_func,
                             shim_callbacks->fetch_baton,
@@ -2144,7 +2142,7 @@ svn_editor__insert_shims(const svn_delta
   SVN_ERR(delta_from_editor(deditor_out, dedit_baton_out, editor,
                             unlock_func, unlock_baton,
                             found_abs_paths,
-                            repos_root,
+                            repos_root, base_relpath,
                             shim_callbacks->fetch_props_func,
                             shim_callbacks->fetch_baton,
                             shim_callbacks->fetch_base_func,

Modified: subversion/trunk/subversion/libsvn_ra_neon/commit.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_neon/commit.c?rev=1325039&r1=1325038&r2=1325039&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_neon/commit.c (original)
+++ subversion/trunk/subversion/libsvn_ra_neon/commit.c Wed Apr 11 22:04:21 2012
@@ -1620,7 +1620,8 @@ svn_error_t * svn_ra_neon__get_commit_ed
   *edit_baton = cc;
 
   SVN_ERR(svn_editor__insert_shims(editor, edit_baton, *editor, *edit_baton,
-                                   NULL, ras->shim_callbacks, pool, pool));
+                                   NULL, NULL, ras->shim_callbacks,
+                                   pool, pool));
 
   return SVN_NO_ERROR;
 }

Modified: subversion/trunk/subversion/libsvn_ra_serf/commit.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_serf/commit.c?rev=1325039&r1=1325038&r2=1325039&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_serf/commit.c (original)
+++ subversion/trunk/subversion/libsvn_ra_serf/commit.c Wed Apr 11 22:04:21 2012
@@ -2369,8 +2369,8 @@ svn_ra_serf__get_commit_editor(svn_ra_se
   *edit_baton = ctx;
 
   SVN_ERR(svn_editor__insert_shims(ret_editor, edit_baton, *ret_editor,
-                                   *edit_baton, NULL, session->shim_callbacks,
-                                   pool, pool));
+                                   *edit_baton, NULL, NULL,
+                                   session->shim_callbacks, pool, pool));
 
   return SVN_NO_ERROR;
 }

Modified: subversion/trunk/subversion/libsvn_ra_svn/editorp.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_svn/editorp.c?rev=1325039&r1=1325038&r2=1325039&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_svn/editorp.c (original)
+++ subversion/trunk/subversion/libsvn_ra_svn/editorp.c Wed Apr 11 22:04:21 2012
@@ -437,7 +437,7 @@ void svn_ra_svn_get_editor(const svn_del
   *edit_baton = eb;
 
   svn_error_clear(svn_editor__insert_shims(editor, edit_baton, *editor,
-                                           *edit_baton, NULL,
+                                           *edit_baton, NULL, NULL,
                                            conn->shim_callbacks,
                                            pool, pool));
 }

Modified: subversion/trunk/subversion/libsvn_repos/commit.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/commit.c?rev=1325039&r1=1325038&r2=1325039&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_repos/commit.c (original)
+++ subversion/trunk/subversion/libsvn_repos/commit.c Wed Apr 11 22:04:21 2012
@@ -951,7 +951,8 @@ svn_repos_get_commit_editor5(const svn_d
   shim_callbacks->fetch_baton = eb;
 
   SVN_ERR(svn_editor__insert_shims(editor, edit_baton, *editor, *edit_baton,
-                                   eb->repos_url, shim_callbacks, pool, pool));
+                                   eb->repos_url, eb->base_path,
+                                   shim_callbacks, pool, pool));
 
   return SVN_NO_ERROR;
 }

Modified: subversion/trunk/subversion/libsvn_repos/dump.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/dump.c?rev=1325039&r1=1325038&r2=1325039&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_repos/dump.c (original)
+++ subversion/trunk/subversion/libsvn_repos/dump.c Wed Apr 11 22:04:21 2012
@@ -1009,7 +1009,7 @@ get_dump_editor(const svn_delta_editor_t
   shim_callbacks->fetch_baton = eb;
 
   SVN_ERR(svn_editor__insert_shims(editor, edit_baton, *editor, *edit_baton,
-                                   NULL, shim_callbacks, pool, pool));
+                                   NULL, NULL, shim_callbacks, pool, pool));
 
   return SVN_NO_ERROR;
 }

Modified: subversion/trunk/subversion/libsvn_wc/diff_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/diff_editor.c?rev=1325039&r1=1325038&r2=1325039&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/diff_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/diff_editor.c Wed Apr 11 22:04:21 2012
@@ -1946,7 +1946,7 @@ svn_wc__get_diff_editor(const svn_delta_
 
 
   SVN_ERR(svn_editor__insert_shims(editor, edit_baton, *editor, *edit_baton,
-                                   NULL, shim_callbacks,
+                                   NULL, NULL, shim_callbacks,
                                    result_pool, scratch_pool));
 
   return SVN_NO_ERROR;

Modified: subversion/trunk/subversion/libsvn_wc/status.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/status.c?rev=1325039&r1=1325038&r2=1325039&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/status.c (original)
+++ subversion/trunk/subversion/libsvn_wc/status.c Wed Apr 11 22:04:21 2012
@@ -2588,7 +2588,7 @@ svn_wc__get_status_editor(const svn_delt
   shim_callbacks->fetch_baton = sfb;
 
   SVN_ERR(svn_editor__insert_shims(editor, edit_baton, *editor, *edit_baton,
-                                   NULL, shim_callbacks,
+                                   NULL, NULL, shim_callbacks,
                                    result_pool, scratch_pool));
 
   return SVN_NO_ERROR;

Modified: subversion/trunk/subversion/libsvn_wc/update_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/update_editor.c?rev=1325039&r1=1325038&r2=1325039&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/update_editor.c (original)
+++ subversion/trunk/subversion/libsvn_wc/update_editor.c Wed Apr 11 22:04:21 2012
@@ -4996,7 +4996,7 @@ make_editor(svn_revnum_t *target_revisio
   shim_callbacks->fetch_baton = sfb;
 
   SVN_ERR(svn_editor__insert_shims(editor, edit_baton, *editor, *edit_baton,
-                                   NULL, shim_callbacks,
+                                   NULL, NULL, shim_callbacks,
                                    result_pool, scratch_pool));
 
   return SVN_NO_ERROR;

Modified: subversion/trunk/subversion/svnrdump/dump_editor.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svnrdump/dump_editor.c?rev=1325039&r1=1325038&r2=1325039&view=diff
==============================================================================
--- subversion/trunk/subversion/svnrdump/dump_editor.c (original)
+++ subversion/trunk/subversion/svnrdump/dump_editor.c Wed Apr 11 22:04:21 2012
@@ -1063,7 +1063,7 @@ svn_rdump__get_dump_editor(const svn_del
   shim_callbacks->fetch_baton = eb;
 
   SVN_ERR(svn_editor__insert_shims(editor, edit_baton, *editor, *edit_baton,
-                                   NULL, shim_callbacks, pool, pool));
+                                   NULL, NULL, shim_callbacks, pool, pool));
 
   return SVN_NO_ERROR;
 }

Modified: subversion/trunk/subversion/tests/cmdline/diff_tests.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/diff_tests.py?rev=1325039&r1=1325038&r2=1325039&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/diff_tests.py (original)
+++ subversion/trunk/subversion/tests/cmdline/diff_tests.py Wed Apr 11 22:04:21 2012
@@ -1782,6 +1782,7 @@ def diff_prop_on_named_dir(sbox):
 
   svntest.actions.run_and_verify_svn(None, None, [],
                                      'propdel', 'p', 'A')
+
   svntest.actions.run_and_verify_svn(None, None, [],
                                      'ci', '-m', '')
 



Mime
View raw message