Just thought I'd save someone some grunt work, so I fixed issue #1522
by spelling out txn in all error messages. This is my first patch, so
I welcome any feedback.
-Josh
--------------------------------
Fix issue #1522: Spell out "txn" as "transaction" in error messages.
* subversion/libsvn_fs/bdb/txn-table.c: spelled "txn"->"transaction"
* subversion/libsvn_fs/fs.c: spelled "txn"->"transaction"
* subversion/libsvn_fs/tree.c: spelled "txn"->"transaction"
* subversion/libsvn_repos/commit.c: spelled "txn"->"transaction"
* subversion/libsvn_repos/load.c: spelled "txn"->"transaction"
* subversion/mod_dav_svn/activity.c: spelled "txn"->"transaction"
* subversion/mod_dav_svn/repos.c: spelled "txn"->"transaction"
* subversion/mod_dav_svn/version.c: spelled "txn"->"transaction"
Index: subversion/libsvn_fs/tree.c
===================================================================
--- subversion/libsvn_fs/tree.c (revision 7295)
+++ subversion/libsvn_fs/tree.c (working copy)
@@ -2636,7 +2636,8 @@
svn_string_t *id_str = svn_fs_unparse_id (y_rev_root_id, trail->pool);
return svn_error_createf
(SVN_ERR_FS_TXN_OUT_OF_DATE, NULL,
- "txn '%s' out of date w.r.t. revision '%s'", txn_name, id_str->data);
+ "transaction '%s' out of date w.r.t. revision '%s'",
+ txn_name, id_str->data);
}
/* Else, commit the txn. */
Index: subversion/libsvn_fs/bdb/txn-table.c
===================================================================
--- subversion/libsvn_fs/bdb/txn-table.c (revision 7295)
+++ subversion/libsvn_fs/bdb/txn-table.c (working copy)
@@ -112,7 +112,7 @@
/* Get the current value associated with the `next-key' key in the table. */
svn_fs__trail_debug (trail, "transactions", "get");
- SVN_ERR (BDB_WRAP (fs, "allocating new txn ID (getting 'next-key')",
+ SVN_ERR (BDB_WRAP (fs, "allocating new transaction ID (getting 'next-key')",
fs->transactions->get (fs->transactions, trail->db_txn,
&query,
svn_fs__result_dbt (&result),
@@ -131,7 +131,7 @@
db_err = fs->transactions->put (fs->transactions, trail->db_txn,
&query, &result, 0);
- SVN_ERR (BDB_WRAP (fs, "bumping next txn key", db_err));
+ SVN_ERR (BDB_WRAP (fs, "bumping next transaction key", db_err));
return SVN_NO_ERROR;
}
Index: subversion/libsvn_fs/fs.c
===================================================================
--- subversion/libsvn_fs/fs.c (revision 7295)
+++ subversion/libsvn_fs/fs.c (working copy)
@@ -184,10 +184,10 @@
db_strerror (db_err));
else
{
- printf ("*** DB txn stats, right before closing env:\n");
- printf (" Number of txns currently active: %d\n",
+ printf ("*** DB transaction stats, right before closing env:\n");
+ printf (" Number of transactions currently active: %d\n",
t->st_nactive);
- printf (" Max number of active txns at any one time: %d\n",
+ printf (" Max number of active transactions at any one time: %d\n",
t->st_maxnactive);
printf (" Number of transactions that have begun: %d\n",
t->st_nbegins);
@@ -199,7 +199,7 @@
t->st_region_wait);
printf (" Number of times a thread didn't need to wait: %d\n",
t->st_region_nowait);
- printf ("*** End DB txn stats.\n\n");
+ printf ("*** End DB transaction stats.\n\n");
}
/* Print transaction statistics for this DB env. */
Index: subversion/mod_dav_svn/version.c
===================================================================
--- subversion/mod_dav_svn/version.c (revision 7295)
+++ subversion/mod_dav_svn/version.c (working copy)
@@ -69,7 +69,7 @@
if (serr)
return dav_svn_convert_err(serr, HTTP_INTERNAL_SERVER_ERROR,
"Error setting auto-log-message on "
- "auto-checked-out resource's txn.");
+ "auto-checked-out resource's transaction.");
return NULL;
}
@@ -282,8 +282,8 @@
resource->info->root.txn, resource->pool);
if (serr != NULL)
return dav_svn_convert_err(serr, HTTP_INTERNAL_SERVER_ERROR,
- "Could not open the (txn) root of the "
- "repository");
+ "Could not open the (transaction) root "
+ "of the repository");
return NULL;
}
@@ -441,7 +441,8 @@
{
/* ### correct HTTP error? */
return dav_svn_convert_err(serr, HTTP_INTERNAL_SERVER_ERROR,
- "Could not get created-rev of txn node.");
+ "Could not get created-rev of "
+ "transaction node.");
}
/* If txn_created_rev is invalid, that means it's already
Index: subversion/mod_dav_svn/repos.c
===================================================================
--- subversion/mod_dav_svn/repos.c (revision 7295)
+++ subversion/mod_dav_svn/repos.c (working copy)
@@ -671,7 +671,7 @@
if (serr != NULL)
{
return dav_svn_convert_err(serr, HTTP_INTERNAL_SERVER_ERROR,
- "Could not open the (txn) root of the "
+ "Could not open the (transaction) root of the "
"repository");
}
Index: subversion/mod_dav_svn/activity.c
===================================================================
--- subversion/mod_dav_svn/activity.c (revision 7295)
+++ subversion/mod_dav_svn/activity.c (working copy)
@@ -122,7 +122,7 @@
apr_dbm_freedatum(dbm, value);
apr_dbm_close(dbm);
return dav_svn_convert_err(serr, HTTP_INTERNAL_SERVER_ERROR,
- "could not abort txn.");
+ "could not abort transaction.");
}
}
else if (serr->apr_err == SVN_ERR_FS_TRANSACTION_NOT_MUTABLE)
@@ -134,7 +134,7 @@
apr_dbm_freedatum(dbm, value);
apr_dbm_close(dbm);
return dav_svn_convert_err(serr, HTTP_INTERNAL_SERVER_ERROR,
- "could not open txn.");
+ "could not open transaction.");
}
/* Finally, we remove the activity from the activities database. */
Index: subversion/libsvn_repos/load.c
===================================================================
--- subversion/libsvn_repos/load.c (revision 7295)
+++ subversion/libsvn_repos/load.c (working copy)
@@ -671,7 +671,8 @@
if (pb->outstream)
svn_stream_printf (pb->outstream, pool,
- "<<< Started new txn, based on original revision %"
+ "<<< Started new transaction, based on "
+ "original revision %"
SVN_REVNUM_T_FMT "\n", rb->rev);
}
Index: subversion/libsvn_repos/commit.c
===================================================================
--- subversion/libsvn_repos/commit.c (revision 7295)
+++ subversion/libsvn_repos/commit.c (working copy)
@@ -112,7 +112,8 @@
out_of_date (const char *path, const char *txn_name)
{
return svn_error_createf (SVN_ERR_FS_TXN_OUT_OF_DATE, NULL,
- "out of date: '%s' in txn '%s'", path, txn_name);
+ "out of date: '%s' in transaction '%s'",
+ path, txn_name);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 4 20:41:04 2003