Author: julianfoad
Date: Thu Dec 10 15:31:34 2009
New Revision: 889296
URL: http://svn.apache.org/viewvc?rev=889296&view=rev
Log:
Rename some "rev" arguments to distinguish what revision they refer to.
A follow-up to r884659.
* subversion/libsvn_fs/fs-loader.h
(fs_vtable_t): In "begin_obliteration_txn", rename "rev" to "replacing_rev"
for clarity.
* subversion/libsvn_fs_base/revs-txns.c
(begin_txn_args): Rename "rev" to "base_rev" for clarity.
(txn_body_begin_txn, svn_fs_base__begin_txn): Adjust accordingly.
(svn_fs_base__begin_obliteration_txn): Rename "rev" to "replacing_rev" for
clarity.
* subversion/libsvn_fs_base/revs-txns.h
(svn_fs_base__begin_obliteration_txn): Rename "rev" to "replacing_rev" for
clarity.
Modified:
subversion/trunk/subversion/libsvn_fs/fs-loader.h
subversion/trunk/subversion/libsvn_fs_base/revs-txns.c
subversion/trunk/subversion/libsvn_fs_base/revs-txns.h
Modified: subversion/trunk/subversion/libsvn_fs/fs-loader.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs/fs-loader.h?rev=889296&r1=889295&r2=889296&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs/fs-loader.h (original)
+++ subversion/trunk/subversion/libsvn_fs/fs-loader.h Thu Dec 10 15:31:34 2009
@@ -168,7 +168,8 @@
svn_revnum_t rev, apr_uint32_t flags,
apr_pool_t *pool);
svn_error_t *(*begin_obliteration_txn)(svn_fs_txn_t **txn_p, svn_fs_t *fs,
- svn_revnum_t rev, apr_pool_t *pool);
+ svn_revnum_t replacing_rev,
+ apr_pool_t *pool);
svn_error_t *(*open_txn)(svn_fs_txn_t **txn, svn_fs_t *fs,
const char *name, apr_pool_t *pool);
svn_error_t *(*purge_txn)(svn_fs_t *fs, const char *txn_id,
Modified: subversion/trunk/subversion/libsvn_fs_base/revs-txns.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_base/revs-txns.c?rev=889296&r1=889295&r2=889296&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_base/revs-txns.c (original)
+++ subversion/trunk/subversion/libsvn_fs_base/revs-txns.c Thu Dec 10 15:31:34
2009
@@ -649,7 +649,7 @@
struct begin_txn_args
{
svn_fs_txn_t **txn_p;
- svn_revnum_t rev;
+ svn_revnum_t base_rev;
apr_uint32_t flags;
};
@@ -661,7 +661,7 @@
const svn_fs_id_t *root_id;
const char *txn_id;
- SVN_ERR(svn_fs_base__rev_get_root(&root_id, trail->fs, args->rev,
+ SVN_ERR(svn_fs_base__rev_get_root(&root_id, trail->fs, args->base_rev,
trail, trail->pool));
SVN_ERR(svn_fs_bdb__create_txn(&txn_id, trail->fs, root_id,
trail, trail->pool));
@@ -688,7 +688,7 @@
SVN_ERR(txn_body_change_txn_prop(&cpargs, trail));
}
- *args->txn_p = make_txn(trail->fs, txn_id, args->rev, trail->pool);
+ *args->txn_p = make_txn(trail->fs, txn_id, args->base_rev, trail->pool);
return SVN_NO_ERROR;
}
@@ -699,14 +699,14 @@
const svn_fs_id_t *root_id;
const char *txn_id;
- SVN_ERR(svn_fs_base__rev_get_root(&root_id, trail->fs, args->rev,
+ SVN_ERR(svn_fs_base__rev_get_root(&root_id, trail->fs, args->base_rev,
trail, trail->pool));
SVN_ERR(svn_fs_bdb__create_txn(&txn_id, trail->fs, root_id,
trail, trail->pool));
/* ### No need for "CHECK_OOD" and "CHECK_LOCKS" like the non-oblit case? */
- *args->txn_p = make_txn(trail->fs, txn_id, args->rev, trail->pool);
+ *args->txn_p = make_txn(trail->fs, txn_id, args->base_rev, trail->pool);
return SVN_NO_ERROR;
}
@@ -729,7 +729,7 @@
SVN_ERR(svn_fs__check_fs(fs, TRUE));
args.txn_p = &txn;
- args.rev = rev;
+ args.base_rev = rev;
args.flags = flags;
SVN_ERR(svn_fs_base__retry_txn(fs, txn_body_begin_txn, &args, FALSE, pool));
@@ -750,7 +750,7 @@
svn_error_t *
svn_fs_base__begin_obliteration_txn(svn_fs_txn_t **txn_p,
svn_fs_t *fs,
- svn_revnum_t rev,
+ svn_revnum_t replacing_rev,
apr_pool_t *pool)
{
svn_fs_txn_t *txn;
@@ -759,7 +759,7 @@
SVN_ERR(svn_fs__check_fs(fs, TRUE));
args.txn_p = &txn;
- args.rev = rev;
+ args.base_rev = replacing_rev - 1;
args.flags = 0;
SVN_ERR(svn_fs_base__retry_txn(fs, txn_body_begin_obliteration_txn, &args,
FALSE, pool));
Modified: subversion/trunk/subversion/libsvn_fs_base/revs-txns.h
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_base/revs-txns.h?rev=889296&r1=889295&r2=889296&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_base/revs-txns.h (original)
+++ subversion/trunk/subversion/libsvn_fs_base/revs-txns.h Thu Dec 10 15:31:34
2009
@@ -188,10 +188,11 @@
apr_pool_t *pool);
/* Begin a new transaction in filesystem FS, to replace an existing
- revision REV. The new transaction is returned in *TXN_P. Allocate
- the new transaction structure from POOL. */
+ revision REPLACING_REV. The new transaction is returned in *TXN_P.
+ Allocate the new transaction structure from POOL. */
svn_error_t *svn_fs_base__begin_obliteration_txn(svn_fs_txn_t **txn_p,
- svn_fs_t *fs, svn_revnum_t
rev,
+ svn_fs_t *fs,
+ svn_revnum_t replacing_rev,
apr_pool_t *pool);
svn_error_t *svn_fs_base__open_txn(svn_fs_txn_t **txn, svn_fs_t *fs,
