You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2010/02/09 11:11:29 UTC
svn commit: r907989 - in /subversion/trunk/subversion: libsvn_fs_base/dag.c
libsvn_fs_base/reps-strings.h libsvn_fs_base/revs-txns.c
libsvn_fs_base/tree.c libsvn_ra/ra_loader.h libsvn_ra_local/ra_plugin.c
Author: julianfoad
Date: Tue Feb 9 10:11:29 2010
New Revision: 907989
URL: http://svn.apache.org/viewvc?rev=907989&view=rev
Log:
Fix up some comments.
* subversion/libsvn_fs_base/dag.c
(svn_fs_base__dag_finalize_edits): Fix typos.
* subversion/libsvn_fs_base/reps-strings.h
(svn_fs_base__get_mutable_rep): Clarify.
* subversion/libsvn_fs_base/revs-txns.c
(get_txn): Correct a mistake.
* subversion/libsvn_fs_base/tree.c
(svn_fs_base__commit_obliteration_txn): Add some useful comments and
remove an obsolete one.
* subversion/libsvn_ra_local/ra_plugin.c
(svn_ra_local__obliterate_path_rev): Add a cross-reference to where the
doc string can be found.
* subversion/libsvn_ra/ra_loader.h
(svn_ra__vtable_t): Add a cross-reference to where the doc string can be
found.
Modified:
subversion/trunk/subversion/libsvn_fs_base/dag.c
subversion/trunk/subversion/libsvn_fs_base/reps-strings.h
subversion/trunk/subversion/libsvn_fs_base/revs-txns.c
subversion/trunk/subversion/libsvn_fs_base/tree.c
subversion/trunk/subversion/libsvn_ra/ra_loader.h
subversion/trunk/subversion/libsvn_ra_local/ra_plugin.c
Modified: subversion/trunk/subversion/libsvn_fs_base/dag.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_base/dag.c?rev=907989&r1=907988&r2=907989&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_base/dag.c (original)
+++ subversion/trunk/subversion/libsvn_fs_base/dag.c Tue Feb 9 10:11:29 2010
@@ -1335,8 +1335,8 @@
SVN_ERR(svn_fs_base__delete_rep_if_mutable(fs, old_data_key, txn_id,
trail, pool));
- /* If we've got a discardable rep (probably because we ended us
- re-using a preexisting one). Throw out the discardable rep. */
+ /* If we've got a discardable rep (probably because we ended up
+ re-using a preexisting one), throw out the discardable rep. */
if (useless_data_key)
SVN_ERR(svn_fs_base__delete_rep_if_mutable(fs, useless_data_key,
txn_id, trail, pool));
Modified: subversion/trunk/subversion/libsvn_fs_base/reps-strings.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_base/reps-strings.h?rev=907989&r1=907988&r2=907989&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_base/reps-strings.h (original)
+++ subversion/trunk/subversion/libsvn_fs_base/reps-strings.h Tue Feb 9 10:11:29 2010
@@ -38,14 +38,14 @@
-/* Get or create a mutable representation in FS, store the new rep's
- key in *NEW_REP_KEY.
+/* Get or create a mutable representation in FS, and set *NEW_REP_KEY to its
+ key.
TXN_ID is the id of the Subversion transaction under which this occurs.
- If REP_KEY is already a mutable representation, set *NEW_REP_KEY to
- REP_KEY, else set *NEW_REP_KEY to a brand new rep key allocated in
- POOL. */
+ If REP_KEY is not null and is already a mutable representation, set
+ *NEW_REP_KEY to REP_KEY, else create a brand new rep and set *NEW_REP_KEY
+ to its key, allocated in POOL. */
svn_error_t *svn_fs_base__get_mutable_rep(const char **new_rep_key,
const char *rep_key,
svn_fs_t *fs,
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=907989&r1=907988&r2=907989&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_base/revs-txns.c (original)
+++ subversion/trunk/subversion/libsvn_fs_base/revs-txns.c Tue Feb 9 10:11:29 2010
@@ -56,8 +56,8 @@
/* Set *txn_p to a transaction object allocated in POOL for the
transaction in FS whose id is TXN_ID. If EXPECT_DEAD is set, this
transaction must be a dead one, else an error is returned. If
- EXPECT_DEAD is not set, an error is thrown if the transaction is
- *not* dead. */
+ EXPECT_DEAD is not set, the transaction must *not* be a dead one,
+ else an error is returned. */
static svn_error_t *
get_txn(transaction_t **txn_p,
svn_fs_t *fs,
Modified: subversion/trunk/subversion/libsvn_fs_base/tree.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_fs_base/tree.c?rev=907989&r1=907988&r2=907989&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_fs_base/tree.c (original)
+++ subversion/trunk/subversion/libsvn_fs_base/tree.c Tue Feb 9 10:11:29 2010
@@ -2796,6 +2796,7 @@
{
struct commit_args commit_args;
+ /* Commit the replacement transaction. */
/* We do not need a re-try loop like the (catch up to head, try to
* commit) loop that svn_fs_base__commit_txn() uses, because the only
* concurrent changes that can affect this old revision are other
@@ -2806,7 +2807,9 @@
SVN_ERR(svn_fs_base__retry_txn(txn->fs, txn_body_commit_obliteration,
&commit_args, FALSE, pool));
- /* return svn_error_create(SVN_ERR_UNSUPPORTED_FEATURE, NULL, NULL); */
+ /* Remove the old txn and any unreferenced data attached to it. */
+ /* ### ... */
+
return SVN_NO_ERROR;
}
Modified: subversion/trunk/subversion/libsvn_ra/ra_loader.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra/ra_loader.h?rev=907989&r1=907988&r2=907989&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra/ra_loader.h (original)
+++ subversion/trunk/subversion/libsvn_ra/ra_loader.h Tue Feb 9 10:11:29 2010
@@ -258,6 +258,7 @@
svn_revnum_t end_revision,
svn_revnum_t *revision_deleted,
apr_pool_t *pool);
+ /* See svn_ra__obliterate() for details. */
svn_error_t *(*obliterate_path_rev)(svn_ra_session_t *session,
svn_revnum_t revision,
const char *path,
Modified: subversion/trunk/subversion/libsvn_ra_local/ra_plugin.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_ra_local/ra_plugin.c?rev=907989&r1=907988&r2=907989&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_ra_local/ra_plugin.c (original)
+++ subversion/trunk/subversion/libsvn_ra_local/ra_plugin.c Tue Feb 9 10:11:29 2010
@@ -1424,6 +1424,7 @@
return SVN_NO_ERROR;
}
+/* Implements svn_ra__vtable_t.obliterate_path_rev. */
static svn_error_t *
svn_ra_local__obliterate_path_rev(svn_ra_session_t *session,
svn_revnum_t revision,