Author: hwright
Date: Fri Apr 13 19:32:41 2012
New Revision: 1325914
URL: http://svn.apache.org/viewvc?rev=1325914&view=rev
Log:
On the ev2-export branch:
Normalize the base_relpath for each shim individually, so direct callers get
the benefit.
* subversion/libsvn_delta/compat.c
(svn_delta__delta_from_editor, svn_delta__editor_from_delta):
Normalize the base_relpath here...
(svn_editor__insert_shims): ...instead of here.
Modified:
subversion/branches/ev2-export/subversion/libsvn_delta/compat.c
Modified: subversion/branches/ev2-export/subversion/libsvn_delta/compat.c
URL:
http://svn.apache.org/viewvc/subversion/branches/ev2-export/subversion/libsvn_delta/compat.c?rev=1325914&r1=1325913&r2=1325914&view=diff
==============================================================================
--- subversion/branches/ev2-export/subversion/libsvn_delta/compat.c (original)
+++ subversion/branches/ev2-export/subversion/libsvn_delta/compat.c Fri Apr 13
19:32:41 2012
@@ -1087,6 +1087,11 @@ svn_delta__delta_from_editor(const svn_d
};
struct ev2_edit_baton *eb = apr_pcalloc(pool, sizeof(*eb));
+ if (!base_relpath)
+ base_relpath = "";
+ else if (base_relpath[0] == '/')
+ base_relpath += 1;
+
eb->editor = editor;
eb->changes = apr_hash_make(pool);
eb->paths = apr_hash_make(pool);
@@ -2019,6 +2024,11 @@ svn_delta__editor_from_delta(svn_editor_
struct svn_delta__extra_baton *extra_baton = apr_pcalloc(result_pool,
sizeof(*extra_baton));
+ if (!base_relpath)
+ base_relpath = "";
+ else if (base_relpath[0] == '/')
+ base_relpath += 1;
+
eb->deditor = deditor;
eb->dedit_baton = dedit_baton;
eb->edit_pool = result_pool;
@@ -2111,11 +2121,6 @@ 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(svn_delta__editor_from_delta(&editor, &exb,
&unlock_func, &unlock_baton,
deditor_in, dedit_baton_in,
