Author: hwright
Date: Wed Apr 11 16:06:58 2012
New Revision: 1324837
URL: http://svn.apache.org/viewvc?rev=1324837&view=rev
Log:
Don't rationalize Ev2 shim callback paths when committing. This leaves many
Ev2 tests broken, but it's the Right thing to do.
* subversion/libsvn_repos/commit.c
(rationalize_shim_path): Remove.
(fetch_props_func, fetch_base_func, fetch_kind_func): Don't call the above.
Modified:
subversion/trunk/subversion/libsvn_repos/commit.c
Modified: subversion/trunk/subversion/libsvn_repos/commit.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/commit.c?rev=1324837&r1=1324836&r2=1324837&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_repos/commit.c (original)
+++ subversion/trunk/subversion/libsvn_repos/commit.c Wed Apr 11 16:06:58 2012
@@ -783,33 +783,6 @@ abort_edit(void *edit_baton,
static svn_error_t *
-rationalize_shim_path(const char **fs_path,
- struct edit_baton *eb,
- const char *path,
- apr_pool_t *result_pool,
- apr_pool_t *scratch_pool)
-{
- if (svn_path_is_url(path))
- {
- /* This is a copyfrom URL. */
- path = svn_uri_skip_ancestor(eb->repos_url, path, scratch_pool);
- *fs_path = svn_fspath__canonicalize(path, scratch_pool);
- }
- else
- {
- /* This is a base-relative path. */
- if (path[0] != '/')
- /* Get an absolute path for use in the FS. */
- *fs_path = svn_fspath__join(eb->base_path, path, scratch_pool);
- else
- *fs_path = path;
- }
-
- return SVN_NO_ERROR;
-}
-
-
-static svn_error_t *
fetch_props_func(apr_hash_t **props,
void *baton,
const char *path,
@@ -821,7 +794,6 @@ fetch_props_func(apr_hash_t **props,
svn_fs_root_t *fs_root;
svn_error_t *err;
- SVN_ERR(rationalize_shim_path(&path, eb, path, scratch_pool, scratch_pool));
SVN_ERR(svn_fs_revision_root(&fs_root, eb->fs,
svn_fs_txn_base_revision(eb->txn),
scratch_pool));
@@ -852,7 +824,6 @@ fetch_kind_func(svn_kind_t *kind,
if (!SVN_IS_VALID_REVNUM(base_revision))
base_revision = svn_fs_txn_base_revision(eb->txn);
- SVN_ERR(rationalize_shim_path(&path, eb, path, scratch_pool, scratch_pool));
SVN_ERR(svn_fs_revision_root(&fs_root, eb->fs, base_revision, scratch_pool));
SVN_ERR(svn_fs_check_path(&node_kind, fs_root, path, scratch_pool));
@@ -879,7 +850,6 @@ fetch_base_func(const char **filename,
if (!SVN_IS_VALID_REVNUM(base_revision))
base_revision = svn_fs_txn_base_revision(eb->txn);
- SVN_ERR(rationalize_shim_path(&path, eb, path, scratch_pool, scratch_pool));
SVN_ERR(svn_fs_revision_root(&fs_root, eb->fs, base_revision, scratch_pool));
err = svn_fs_file_contents(&contents, fs_root, path, scratch_pool);
