You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2014/10/28 20:30:31 UTC
svn commit: r1634956 - in /subversion/trunk/subversion/libsvn_fs_x: ./ tree.c
Author: stefan2
Date: Tue Oct 28 19:30:31 2014
New Revision: 1634956
URL: http://svn.apache.org/r1634956
Log:
Sync FSX with FSFS:
Merge r1601633, r1604720, r1604794, r1615356, r1628764 from libsvn_fs_fs
and resolve a few simple text conflicts caused by renamed functions.
These are various code simplifications as well as style and formatting
cleanups in tree.c.
Modified:
subversion/trunk/subversion/libsvn_fs_x/ (props changed)
subversion/trunk/subversion/libsvn_fs_x/tree.c
Propchange: subversion/trunk/subversion/libsvn_fs_x/
------------------------------------------------------------------------------
Merged /subversion/trunk/subversion/libsvn_fs_fs:r1601633,1604720,1604794,1615356,1628764
Modified: subversion/trunk/subversion/libsvn_fs_x/tree.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/tree.c?rev=1634956&r1=1634955&r2=1634956&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/tree.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/tree.c Tue Oct 28 19:30:31 2014
@@ -395,7 +395,9 @@ cache_lookup( fs_x_dag_cache_t *cache
/* 2nd level cache */
/* Find and return the DAG node cache for ROOT and the key that
- should be used for PATH. */
+ should be used for PATH.
+
+ Pool will only be used for allocating a new keys if necessary */
static void
locate_cache(svn_cache__t **cache,
const char **key,
@@ -406,15 +408,20 @@ locate_cache(svn_cache__t **cache,
if (root->is_txn_root)
{
fs_txn_root_data_t *frd = root->fsap_data;
- if (cache) *cache = frd->txn_node_cache;
- if (key && path) *key = path;
+
+ if (cache)
+ *cache = frd->txn_node_cache;
+ if (key && path)
+ *key = path;
}
else
{
fs_x_data_t *ffd = root->fs->fsap_data;
- if (cache) *cache = ffd->rev_node_cache;
- if (key && path) *key
- = svn_fs_x__combine_number_and_string(root->rev, path, pool);
+
+ if (cache)
+ *cache = ffd->rev_node_cache;
+ if (key && path)
+ *key = svn_fs_x__combine_number_and_string(root->rev, path, pool);
}
}
@@ -1044,7 +1051,7 @@ open_path(parent_path_t **parent_path_p,
if (flags & open_path_node_only)
{
- /* Shortcut: the caller only wan'ts the final DAG node. */
+ /* Shortcut: the caller only wants the final DAG node. */
parent_path->node = child;
}
else
@@ -1509,7 +1516,7 @@ x_change_node_prop(svn_fs_root_t *root,
parent_path_t *parent_path;
apr_hash_t *proplist;
svn_fs_x__txn_id_t txn_id;
- svn_boolean_t modeinfo_mod = FALSE;
+ svn_boolean_t mergeinfo_mod = FALSE;
if (! root->is_txn_root)
return SVN_FS__NOT_TXN(root);
@@ -1553,7 +1560,7 @@ x_change_node_prop(svn_fs_root_t *root,
(value != NULL), pool));
}
- modeinfo_mod = TRUE;
+ mergeinfo_mod = TRUE;
}
/* Set the property. */
@@ -1566,7 +1573,7 @@ x_change_node_prop(svn_fs_root_t *root,
/* Make a record of this modification in the changes table. */
return add_change(root->fs, txn_id, path,
svn_fs_x__dag_get_id(parent_path->node),
- svn_fs_path_change_modify, FALSE, TRUE, modeinfo_mod,
+ svn_fs_path_change_modify, FALSE, TRUE, mergeinfo_mod,
svn_fs_x__dag_node_kind(parent_path->node),
SVN_INVALID_REVNUM, NULL, pool);
}
@@ -2452,27 +2459,15 @@ x_same_p(svn_boolean_t *same_p,
return SVN_NO_ERROR;
}
-/* Type to select the various behavioral modes of copy_helper.
- */
-typedef enum copy_type_t
-{
- /* add without history */
- copy_type_plain_add,
-
- /* add with history */
- copy_type_add_with_history
-} copy_type_t;
-
/* Copy the node at FROM_PATH under FROM_ROOT to TO_PATH under
- TO_ROOT. COPY_TYPE determines whether then the copy is recorded in
- the copies table and whether it is being marked as a move.
- Perform temporary allocations in POOL. */
+ TO_ROOT. If PRESERVE_HISTORY is set, then the copy is recorded in
+ the copies table. Perform temporary allocations in POOL. */
static svn_error_t *
copy_helper(svn_fs_root_t *from_root,
const char *from_path,
svn_fs_root_t *to_root,
const char *to_path,
- copy_type_t copy_type,
+ svn_boolean_t preserve_history,
apr_pool_t *pool)
{
dag_node_t *from_node;
@@ -2558,7 +2553,7 @@ copy_helper(svn_fs_root_t *from_root,
SVN_ERR(svn_fs_x__dag_copy(to_parent_path->parent->node,
to_parent_path->entry,
from_node,
- copy_type != copy_type_plain_add,
+ preserve_history,
from_root->rev,
from_canonpath,
txn_id, pool));
@@ -2617,7 +2612,7 @@ x_copy(svn_fs_root_t *from_root,
to_root,
svn_fs__canonicalize_abspath(to_path,
pool),
- copy_type_add_with_history, pool));
+ TRUE, pool));
}
@@ -2635,7 +2630,7 @@ x_revision_link(svn_fs_root_t *from_root
path = svn_fs__canonicalize_abspath(path, pool);
return svn_error_trace(copy_helper(from_root, path, to_root, path,
- copy_type_plain_add, pool));
+ FALSE, pool));
}