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/12/16 07:39:51 UTC
svn commit: r1645858 - in
/subversion/branches/fsx-id/subversion/libsvn_fs_x: dag.c transaction.c
transaction.h
Author: stefan2
Date: Tue Dec 16 06:39:51 2014
New Revision: 1645858
URL: http://svn.apache.org/r1645858
Log:
On the fsx-id branch:
Remove the svn_fs_t parameter from svn_fs_x__create_successor.
* subversion/libsvn_fs_x/transaction.h
(svn_fs_x__create_successor): Remove the OLD_ID parameter.
* subversion/libsvn_fs_x/transaction.c
(svn_fs_x__create_successor): Replace the former OLD_ID with the
precessor info provided by the noderev.
* subversion/libsvn_fs_x/dag.c
(svn_fs_x__dag_clone_child,
svn_fs_x__dag_copy): Update caller.
Modified:
subversion/branches/fsx-id/subversion/libsvn_fs_x/dag.c
subversion/branches/fsx-id/subversion/libsvn_fs_x/transaction.c
subversion/branches/fsx-id/subversion/libsvn_fs_x/transaction.h
Modified: subversion/branches/fsx-id/subversion/libsvn_fs_x/dag.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx-id/subversion/libsvn_fs_x/dag.c?rev=1645858&r1=1645857&r2=1645858&view=diff
==============================================================================
--- subversion/branches/fsx-id/subversion/libsvn_fs_x/dag.c (original)
+++ subversion/branches/fsx-id/subversion/libsvn_fs_x/dag.c Tue Dec 16 06:39:51 2014
@@ -793,7 +793,6 @@ svn_fs_x__dag_clone_child(dag_node_t **c
noderev->created_path = svn_fspath__join(parent_path, name, pool);
SVN_ERR(svn_fs_x__create_successor(&new_node_id, fs,
- noderev->predecessor_id,
noderev, copy_id, txn_id, pool));
/* Replace the ID in the parent's ENTRY list with the ID which
@@ -1299,7 +1298,7 @@ svn_fs_x__dag_copy(dag_node_t *to_node,
/* Set the copyroot equal to our own id. */
to_noderev->copyroot_path = NULL;
- SVN_ERR(svn_fs_x__create_successor(&id, fs, src_id, to_noderev,
+ SVN_ERR(svn_fs_x__create_successor(&id, fs, to_noderev,
©_id, txn_id, pool));
}
Modified: subversion/branches/fsx-id/subversion/libsvn_fs_x/transaction.c
URL: http://svn.apache.org/viewvc/subversion/branches/fsx-id/subversion/libsvn_fs_x/transaction.c?rev=1645858&r1=1645857&r2=1645858&view=diff
==============================================================================
--- subversion/branches/fsx-id/subversion/libsvn_fs_x/transaction.c (original)
+++ subversion/branches/fsx-id/subversion/libsvn_fs_x/transaction.c Tue Dec 16 06:39:51 2014
@@ -2457,7 +2457,6 @@ svn_fs_x__set_contents(svn_stream_t **st
svn_error_t *
svn_fs_x__create_successor(const svn_fs_id_t **new_id_p,
svn_fs_t *fs,
- const svn_fs_id_t *old_idp,
node_revision_t *new_noderev,
const svn_fs_x__id_part_t *copy_id,
svn_fs_x__txn_id_t txn_id,
@@ -2465,13 +2464,14 @@ svn_fs_x__create_successor(const svn_fs_
{
const svn_fs_id_t *id;
apr_uint64_t number;
+ const svn_fs_x__id_part_t *node_id
+ = svn_fs_x__id_node_id(new_noderev->predecessor_id);
if (! copy_id)
- copy_id = svn_fs_x__id_copy_id(old_idp);
+ copy_id = svn_fs_x__id_copy_id(new_noderev->predecessor_id);
SVN_ERR(allocate_item_index(&number, fs, txn_id, pool));
- id = svn_fs_x__id_txn_create(svn_fs_x__id_node_id(old_idp), copy_id,
- txn_id, number, pool);
+ id = svn_fs_x__id_txn_create(node_id, copy_id, txn_id, number, pool);
new_noderev->id = id;
Modified: subversion/branches/fsx-id/subversion/libsvn_fs_x/transaction.h
URL: http://svn.apache.org/viewvc/subversion/branches/fsx-id/subversion/libsvn_fs_x/transaction.h?rev=1645858&r1=1645857&r2=1645858&view=diff
==============================================================================
--- subversion/branches/fsx-id/subversion/libsvn_fs_x/transaction.h (original)
+++ subversion/branches/fsx-id/subversion/libsvn_fs_x/transaction.h Tue Dec 16 06:39:51 2014
@@ -210,7 +210,7 @@ svn_fs_x__set_contents(svn_stream_t **st
apr_pool_t *pool);
/* Create a node revision in FS which is an immediate successor of
- OLD_ID, whose contents are NEW_NR. Set *NEW_ID_P to the new node
+ NEW_NODEREV's predecessor. Set *NEW_ID_P to the new node
revision's ID. Use POOL for any temporary allocation.
COPY_ID, if non-NULL, is a key into the `copies' table, and
@@ -226,7 +226,6 @@ svn_fs_x__set_contents(svn_stream_t **st
svn_error_t *
svn_fs_x__create_successor(const svn_fs_id_t **new_id_p,
svn_fs_t *fs,
- const svn_fs_id_t *old_idp,
node_revision_t *new_noderev,
const svn_fs_x__id_part_t *copy_id,
svn_fs_x__txn_id_t txn_id,