subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stef...@apache.org
Subject svn commit: r1661416 - /subversion/branches/fsx-1.10/subversion/libsvn_fs_x/tree.c
Date Sat, 21 Feb 2015 17:53:59 GMT
Author: stefan2
Date: Sat Feb 21 17:53:59 2015
New Revision: 1661416

URL: http://svn.apache.org/r1661416
Log:
On the fsx-1.10 branch:
Because the FSX DAG walkers have their own path normalization logic,
callers don't have to canonicalize the input paths anymore.

* subversion/libsvn_fs_x/tree.c
  (x_change_node_prop,
   x_make_dir,
   x_delete_node,
   x_make_file,
   x_closest_copy,
   x_node_origin_rev,
   get_mergeinfo_for_path_internal): Remove unncessary calls to
                                     svn_fs__canonicalize_abspath.

Modified:
    subversion/branches/fsx-1.10/subversion/libsvn_fs_x/tree.c

Modified: subversion/branches/fsx-1.10/subversion/libsvn_fs_x/tree.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx-1.10/subversion/libsvn_fs_x/tree.c?rev=1661416&r1=1661415&r2=1661416&view=diff
==============================================================================
--- subversion/branches/fsx-1.10/subversion/libsvn_fs_x/tree.c (original)
+++ subversion/branches/fsx-1.10/subversion/libsvn_fs_x/tree.c Sat Feb 21 17:53:59 2015
@@ -517,7 +517,6 @@ x_change_node_prop(svn_fs_root_t *root,
     return SVN_FS__NOT_TXN(root);
   txn_id = svn_fs_x__root_txn_id(root);
 
-  path = svn_fs__canonicalize_abspath(path, subpool);
   SVN_ERR(svn_fs_x__get_dag_path(&dag_path, root, path, 0, TRUE, subpool));
 
   /* Check (non-recursively) to see if path is locked; if so, check
@@ -1394,7 +1393,6 @@ x_make_dir(svn_fs_root_t *root,
   svn_fs_x__txn_id_t txn_id = svn_fs_x__root_txn_id(root);
   apr_pool_t *subpool = svn_pool_create(scratch_pool);
 
-  path = svn_fs__canonicalize_abspath(path, subpool);
   SVN_ERR(svn_fs_x__get_dag_path(&dag_path, root, path,
                                  svn_fs_x__dag_path_last_optional,
                                  TRUE, subpool));
@@ -1452,7 +1450,6 @@ x_delete_node(svn_fs_root_t *root,
     return SVN_FS__NOT_TXN(root);
 
   txn_id = svn_fs_x__root_txn_id(root);
-  path = svn_fs__canonicalize_abspath(path, subpool);
   SVN_ERR(svn_fs_x__get_dag_path(&dag_path, root, path, 0, TRUE, subpool));
   kind = svn_fs_x__dag_node_kind(dag_path->node);
 
@@ -1734,7 +1731,6 @@ x_make_file(svn_fs_root_t *root,
   svn_fs_x__txn_id_t txn_id = svn_fs_x__root_txn_id(root);
   apr_pool_t *subpool = svn_pool_create(scratch_pool);
 
-  path = svn_fs__canonicalize_abspath(path, subpool);
   SVN_ERR(svn_fs_x__get_dag_path(&dag_path, root, path,
                                  svn_fs_x__dag_path_last_optional,
                                  TRUE, subpool));
@@ -2430,7 +2426,6 @@ x_closest_copy(svn_fs_root_t **root_p,
   *root_p = NULL;
   *path_p = NULL;
 
-  path = svn_fs__canonicalize_abspath(path, scratch_pool);
   SVN_ERR(svn_fs_x__get_dag_path(&dag_path, root, path, 0, FALSE,
                                  scratch_pool));
 
@@ -2505,8 +2500,6 @@ x_node_origin_rev(svn_revnum_t *revision
   svn_fs_x__id_t node_id;
   dag_node_t *node;
 
-  path = svn_fs__canonicalize_abspath(path, scratch_pool);
-
   SVN_ERR(svn_fs_x__get_dag_node(&node, root, path, scratch_pool));
   node_id = *svn_fs_x__dag_get_node_id(node);
 
@@ -2907,8 +2900,6 @@ get_mergeinfo_for_path_internal(svn_merg
   apr_hash_t *proplist;
   svn_string_t *mergeinfo_string;
 
-  path = svn_fs__canonicalize_abspath(path, scratch_pool);
-
   SVN_ERR(svn_fs_x__get_dag_path(&dag_path, rev_root, path, 0, FALSE,
                                  scratch_pool));
 



Mime
View raw message