svn commit: r1462407 - /subversion/branches/verify-at-commit/subversion/libsvn_fs_fs/fs_fs.c

[da...@apache.org]

Author: danielsh
Date: Fri Mar 29 05:46:45 2013
New Revision: 1462407

URL: http://svn.apache.org/r1462407
Log:
On the verify-as-commit branch:

Make the verification logic conditional: specifically, for now, make it enabled
iff built as maintainer mode.

* subversion/libsvn_fs_fs/fs_fs.c
  (verify_as_revision_before_current_plus_plus):
    Short-circuit in maintainer mode.

Modified:
    subversion/branches/verify-at-commit/subversion/libsvn_fs_fs/fs_fs.c

Modified: subversion/branches/verify-at-commit/subversion/libsvn_fs_fs/fs_fs.c
URL: http://svn.apache.org/viewvc/subversion/branches/verify-at-commit/subversion/libsvn_fs_fs/fs_fs.c?rev=1462407&r1=1462406&r2=1462407&view=diff
==============================================================================
--- subversion/branches/verify-at-commit/subversion/libsvn_fs_fs/fs_fs.c (original)
+++ subversion/branches/verify-at-commit/subversion/libsvn_fs_fs/fs_fs.c Fri Mar 29 05:46:45 2013
@@ -8273,13 +8273,12 @@ verify_as_revision_before_current_plus_p
                                             svn_revnum_t new_rev,
                                             apr_pool_t *pool)
 {
+#ifdef SVN_DEBUG
   fs_fs_data_t *ffd = fs->fsap_data;
   svn_fs_t *ft; /* fs++ == ft */
   svn_fs_root_t *root;
   fs_fs_data_t *ft_ffd;
 
-  /* ### TODO: make this logic conditional */
-
   SVN_ERR_ASSERT(ffd->svn_fs_open_);
 
   SVN_ERR(ffd->svn_fs_open_(&ft, fs->path,
@@ -8294,6 +8293,7 @@ verify_as_revision_before_current_plus_p
   SVN_ERR_ASSERT(root->is_txn_root == FALSE && root->rev == new_rev);
   SVN_ERR_ASSERT(ft_ffd->youngest_rev_cache == new_rev);
   SVN_ERR(svn_fs_fs__verify_root(root, pool));
+#endif /* SVN_DEBUG */
 
   return SVN_NO_ERROR;
 }