subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hwri...@apache.org
Subject svn commit: r1227883 - /subversion/trunk/subversion/libsvn_repos/commit.c
Date Thu, 05 Jan 2012 22:49:00 GMT
Author: hwright
Date: Thu Jan  5 22:49:00 2012
New Revision: 1227883

URL: http://svn.apache.org/viewvc?rev=1227883&view=rev
Log:
When committing through the Ev2 shims, be sure we properly construct the path
to be use when fetching data from the FS.

Current number of Ev2 test failures: 459

* subversion/libsvn_repos/commit.c
  (prop_fetch_func, kind_fetch_func, fetch_base_func): Use the base_path to
    create a FS-absolute path for fetching the required information.

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=1227883&r1=1227882&r2=1227883&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_repos/commit.c (original)
+++ subversion/trunk/subversion/libsvn_repos/commit.c Thu Jan  5 22:49:00 2012
@@ -793,6 +793,10 @@ prop_fetch_func(apr_hash_t **props,
   svn_fs_root_t *fs_root;
   svn_error_t *err;
 
+  if (path[0] != '/')
+    /* Get an absolute path for use in the FS. */
+    path = svn_fspath__join(eb->base_path, path, scratch_pool);
+
   SVN_ERR(svn_fs_revision_root(&fs_root, eb->fs,
                                svn_fs_txn_base_revision(eb->txn),
                                scratch_pool));
@@ -818,6 +822,10 @@ kind_fetch_func(svn_kind_t *kind,
   struct edit_baton *eb = baton;
   svn_node_kind_t node_kind;
 
+  if (path[0] != '/')
+    /* Get an absolute path for use in the FS. */
+    path = svn_fspath__join(eb->base_path, path, scratch_pool);
+
   SVN_ERR(svn_fs_check_path(&node_kind, eb->txn_root, path, scratch_pool));
   *kind = svn__kind_from_node_kind(node_kind, FALSE);
 
@@ -838,6 +846,10 @@ fetch_base_func(const char **filename,
   svn_fs_root_t *fs_root;
   svn_error_t *err;
 
+  if (path[0] != '/')
+    /* Get an absolute path for use in the FS. */
+    path = svn_fspath__join(eb->base_path, path, scratch_pool);
+
   SVN_ERR(svn_fs_revision_root(&fs_root, eb->fs,
                                svn_fs_txn_base_revision(eb->txn),
                                scratch_pool));



Mime
View raw message