Daniel Shahaf wrote:
> Author: danielsh
> Date: Sat Jan 3 22:33:05 2009
> New Revision: 35023
>
> Log:
> Properly fix the 'ffd->min_unpacked_rev may get out of date' issue
> originally patched in r35011.
>
> * subversion/libsvn_fs_fs/fs_fs.c
> (read_min_unpacked_rev, update_min_unpacked_rev):
> Add declarations.
> (path_rev_packed, path_rev):
> Add assertions.
> (svn_fs_fs__path_rev_absolute):
> If the rev file isn't found, check if it had just been packed, and
> try the pack file in that case.
> (open_pack_or_rev_file):
> Revert r35011, the logic is now in svn_fs_fs__path_rev_absolute().
> (commit_body, svn_fs_fs__set_revision_proplist):
> Update calls to svn_fs_fs__path_rev_absolute().
>
> * subversion/libsvn_fs_fs/fs_fs.h
> (svn_fs_fs__path_rev_absolute):
> Change return type and add 'path' parameter.
>
> * subversion/libsvn_fs_fs/lock.c
> (write_digest_file):
> Update calls to svn_fs_fs__path_rev_absolute().
>
> Modified:
> trunk/subversion/libsvn_fs_fs/fs_fs.c
> trunk/subversion/libsvn_fs_fs/fs_fs.h
> trunk/subversion/libsvn_fs_fs/lock.c
>
> Modified: trunk/subversion/libsvn_fs_fs/fs_fs.c
> URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_fs_fs/fs_fs.c?pathrev=35023&r1=35022&r2=35023
> ==============================================================================
> --- trunk/subversion/libsvn_fs_fs/fs_fs.c Sat Jan 3 22:27:22 2009 (r35022)
> +++ trunk/subversion/libsvn_fs_fs/fs_fs.c Sat Jan 3 22:33:05 2009 (r35023)
> @@ -126,6 +126,16 @@ static txn_vtable_t txn_vtable = {
> svn_fs_fs__change_txn_props
> };
>
> +/* Declarations. */
> +
> +static svn_error_t *
> +read_min_unpacked_rev(svn_revnum_t *min_unpacked_rev,
> + const char *path,
> + apr_pool_t *pool);
> +
> +static svn_error_t *
> +update_min_unpacked_rev(svn_fs_t *fs, apr_pool_t *pool);
> +
> /* Pathname helper functions */
>
> /* Return TRUE is REV is packed in FS, FALSE otherwise. */
> @@ -180,6 +190,8 @@ path_rev_packed(svn_fs_t *fs, svn_revnum
> fs_fs_data_t *ffd = fs->fsap_data;
>
> assert(ffd->max_files_per_dir);
> + assert(is_packed_rev(fs, rev));
We're not using assert() anymore, but SVN_ASSERT(), assuming the method returns
an svn_error_t *.
Regards,
Blair
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1002246
Received on 2009-01-04 14:23:28 CET