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 2016/01/30 16:33:36 UTC
svn commit: r1727716 - in /subversion/trunk/subversion/libsvn_fs_x: fs.h
transaction.c transaction.h tree.c
Author: stefan2
Date: Sat Jan 30 15:33:35 2016
New Revision: 1727716
URL: http://svn.apache.org/viewvc?rev=1727716&view=rev
Log:
Cleanse FSX changed paths lists code from the renmants of noderev_id.
* subversion/libsvn_fs_x/fs.h
(svn_fs_x__change_t): Remove noderev ID element entirely.
* subversion/libsvn_fs_x/transaction.h
(svn_fs_x__add_change): ID parameter is no longer used.
* subversion/libsvn_fs_x/transaction.c
(svn_fs_x__add_change): Update.
* subversion/libsvn_fs_x/tree.c
(add_change): Update caller.
(x_change_node_prop,
x_make_dir,
x_delete_node,
copy_helper,
x_make_file,
apply_textdelta,
apply_text): Update respective next caller level.
Modified:
subversion/trunk/subversion/libsvn_fs_x/fs.h
subversion/trunk/subversion/libsvn_fs_x/transaction.c
subversion/trunk/subversion/libsvn_fs_x/transaction.h
subversion/trunk/subversion/libsvn_fs_x/tree.c
Modified: subversion/trunk/subversion/libsvn_fs_x/fs.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/fs.h?rev=1727716&r1=1727715&r2=1727716&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/fs.h (original)
+++ subversion/trunk/subversion/libsvn_fs_x/fs.h Sat Jan 30 15:33:35 2016
@@ -526,9 +526,6 @@ typedef struct svn_fs_x__change_t
/* Path of the change. */
svn_string_t path;
- /* node revision id of changed path */
- svn_fs_x__id_t noderev_id;
-
/* See svn_fs_path_change2_t for a description for the remaining elements.
*/
svn_fs_path_change_kind_t change_kind;
Modified: subversion/trunk/subversion/libsvn_fs_x/transaction.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/transaction.c?rev=1727716&r1=1727715&r2=1727716&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/transaction.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/transaction.c Sat Jan 30 15:33:35 2016
@@ -1932,7 +1932,6 @@ svn_error_t *
svn_fs_x__add_change(svn_fs_t *fs,
svn_fs_x__txn_id_t txn_id,
const char *path,
- const svn_fs_x__id_t *id,
svn_fs_path_change_kind_t change_kind,
svn_boolean_t text_mod,
svn_boolean_t prop_mod,
Modified: subversion/trunk/subversion/libsvn_fs_x/transaction.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/transaction.h?rev=1727716&r1=1727715&r2=1727716&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/transaction.h (original)
+++ subversion/trunk/subversion/libsvn_fs_x/transaction.h Sat Jan 30 15:33:35 2016
@@ -167,9 +167,9 @@ svn_fs_x__set_entry(svn_fs_t *fs,
apr_pool_t *scratch_pool);
/* Add a change to the changes record for filesystem FS in transaction
- TXN_ID. Mark path PATH, having noderev-id ID, as changed according to
- the type in CHANGE_KIND. If the text representation was changed set
- TEXT_MOD to TRUE, and likewise for PROP_MOD as well as MERGEINFO_MOD.
+ TXN_ID. Mark path PATH as changed according to the type in
+ CHANGE_KIND. If the text representation was changed set TEXT_MOD
+ to TRUE, and likewise for PROP_MOD as well as MERGEINFO_MOD.
If this change was the result of a copy, set COPYFROM_REV and
COPYFROM_PATH to the revision and path of the copy source, otherwise
they should be set to SVN_INVALID_REVNUM and NULL. Perform any
@@ -178,7 +178,6 @@ svn_error_t *
svn_fs_x__add_change(svn_fs_t *fs,
svn_fs_x__txn_id_t txn_id,
const char *path,
- const svn_fs_x__id_t *id,
svn_fs_path_change_kind_t change_kind,
svn_boolean_t text_mod,
svn_boolean_t prop_mod,
Modified: subversion/trunk/subversion/libsvn_fs_x/tree.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_x/tree.c?rev=1727716&r1=1727715&r2=1727716&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_x/tree.c (original)
+++ subversion/trunk/subversion/libsvn_fs_x/tree.c Sat Jan 30 15:33:35 2016
@@ -224,18 +224,16 @@ parent_path_relpath(svn_fs_x__dag_path_t
/* Add a change to the changes table in FS, keyed on transaction id
TXN_ID, and indicated that a change of kind CHANGE_KIND occurred on
- PATH (whose node revision id is--or was, in the case of a
- deletion--NODEREV_ID), and optionally that TEXT_MODs, PROP_MODs or
- MERGEINFO_MODs occurred. If the change resulted from a copy,
- COPYFROM_REV and COPYFROM_PATH specify under which revision and path
- the node was copied from. If this was not part of a copy, COPYFROM_REV
- should be SVN_INVALID_REVNUM. Use SCRATCH_POOL for temporary allocations.
+ PATH, and optionally that TEXT_MODs, PROP_MODs or MERGEINFO_MODs
+ occurred. If the change resulted from a copy, COPYFROM_REV and
+ COPYFROM_PATH specify under which revision and path the node was
+ copied from. If this was not part of a copy, COPYFROM_REV should
+ be SVN_INVALID_REVNUM. Use SCRATCH_POOL for temporary allocations.
*/
static svn_error_t *
add_change(svn_fs_t *fs,
svn_fs_x__txn_id_t txn_id,
const char *path,
- const svn_fs_x__id_t *noderev_id,
svn_fs_path_change_kind_t change_kind,
svn_boolean_t text_mod,
svn_boolean_t prop_mod,
@@ -248,8 +246,7 @@ add_change(svn_fs_t *fs,
return svn_fs_x__add_change(fs, txn_id,
svn_fs__canonicalize_abspath(path,
scratch_pool),
- noderev_id, change_kind,
- text_mod, prop_mod, mergeinfo_mod,
+ change_kind, text_mod, prop_mod, mergeinfo_mod,
node_kind, copyfrom_rev, copyfrom_path,
scratch_pool);
}
@@ -573,7 +570,6 @@ x_change_node_prop(svn_fs_root_t *root,
/* Make a record of this modification in the changes table. */
SVN_ERR(add_change(root->fs, txn_id, path,
- svn_fs_x__dag_get_id(dag_path->node),
svn_fs_path_change_modify, FALSE, TRUE, mergeinfo_mod,
svn_fs_x__dag_node_kind(dag_path->node),
SVN_INVALID_REVNUM, NULL, subpool));
@@ -1446,7 +1442,7 @@ x_make_dir(svn_fs_root_t *root,
svn_fs_x__update_dag_cache(sub_dir);
/* Make a record of this modification in the changes table. */
- SVN_ERR(add_change(root->fs, txn_id, path, svn_fs_x__dag_get_id(sub_dir),
+ SVN_ERR(add_change(root->fs, txn_id, path,
svn_fs_path_change_add, FALSE, FALSE, FALSE,
svn_node_dir, SVN_INVALID_REVNUM, NULL, subpool));
@@ -1506,7 +1502,6 @@ x_delete_node(svn_fs_root_t *root,
/* Make a record of this modification in the changes table. */
SVN_ERR(add_change(root->fs, txn_id, path,
- svn_fs_x__dag_get_id(dag_path->node),
svn_fs_path_change_delete, FALSE, FALSE, FALSE, kind,
SVN_INVALID_REVNUM, NULL, subpool));
@@ -1643,8 +1638,7 @@ copy_helper(svn_fs_root_t *from_root,
/* Make a record of this modification in the changes table. */
SVN_ERR(svn_fs_x__get_dag_node(&new_node, to_root, to_path,
scratch_pool, scratch_pool));
- SVN_ERR(add_change(to_root->fs, txn_id, to_path,
- svn_fs_x__dag_get_id(new_node), kind, FALSE,
+ SVN_ERR(add_change(to_root->fs, txn_id, to_path, kind, FALSE,
FALSE, FALSE, svn_fs_x__dag_node_kind(from_node),
from_root->rev, from_canonpath, scratch_pool));
}
@@ -1784,7 +1778,7 @@ x_make_file(svn_fs_root_t *root,
svn_fs_x__update_dag_cache(child);
/* Make a record of this modification in the changes table. */
- SVN_ERR(add_change(root->fs, txn_id, path, svn_fs_x__dag_get_id(child),
+ SVN_ERR(add_change(root->fs, txn_id, path,
svn_fs_path_change_add, TRUE, FALSE, FALSE,
svn_node_file, SVN_INVALID_REVNUM, NULL, subpool));
@@ -1992,7 +1986,6 @@ apply_textdelta(void *baton,
/* Make a record of this modification in the changes table. */
return add_change(tb->root->fs, txn_id, tb->path,
- svn_fs_x__dag_get_id(tb->node),
svn_fs_path_change_modify, TRUE, FALSE, FALSE,
svn_node_file, SVN_INVALID_REVNUM, NULL, scratch_pool);
}
@@ -2133,7 +2126,6 @@ apply_text(void *baton,
/* Make a record of this modification in the changes table. */
return add_change(tb->root->fs, txn_id, tb->path,
- svn_fs_x__dag_get_id(tb->node),
svn_fs_path_change_modify, TRUE, FALSE, FALSE,
svn_node_file, SVN_INVALID_REVNUM, NULL, scratch_pool);
}