[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Transaction vtable includes uncallable get_mergeinfo

From: Daniel Rall <dlr_at_finemaltcoding.com>
Date: 2007-08-23 03:56:21 CEST

On Aug 22, 2007, at 9:09 AM, Malcolm Rowe wrote:

> Hello all,
>
> I notice that txn_vtable_t includes a get_mergeinfo() function that
> was
> (presumably) intended to retrieve all the mergeinfo set by a given
> transaction (or something like that). Anyway, it's currently
> unused --
> there's no way to call that vtable entry.
>
> Is it intended for some yet-to-be-written mergeinfo functionality,
> or is
> it vestigal? If the latter, I'd like to remove it (that, or fix the
> implementation in FSFS, which can now throw ENOENT errors that I doubt
> were intended).

This vtable entry was introduced on the merge-tracking branch:

------------------------------------------------------------------------
r21528 | dlr | 2006-09-18 10:38:24 -0700 (Mon, 18 Sep 2006) | 15 lines

Expose a transaction merge info retrieval API so that the newborn
libsvn_fs_util module can consume and index the merge info.

* subversion/libsvn_fs/fs-loader.h
   (struct txn_vtable_t): Add 'get_mergeinfo' hook.

* subversion/libsvn_fs_base/revs-txns.c
   (txn_vtable): Set 'NULL' as placeholder for 'get_mergeinfo' hook.

* subversion/libsvn_fs_fs/fs_fs.c
   (txn_vtable): Set 'svn_fs_fs__txn_mergeinfo' for the
'get_mergeinfo' hook.

Patch by: Kamesh Jayachandran <kamesh@collab.net>
(Tweaked by me.)

------------------------------------------------------------------------

I believe that the only vtable entry that we're currently using is
the one called by svn_fs_get_mergeinfo(), which is the one from the
root_vtable_t (e.g. in libsvn_fs_fs/tree.c, which delegates to
svn_fs_mergeinfo__get_mergeinfo).

While it looks like we still need the transaction-specific mergeinfo
retrieval code from libsvn_fs_fs/fs_fs.c, I can't see any reason for
it to be part of the vtable any more. Kamesh, do you concur?

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Aug 23 03:47:10 2007

This is an archived mail posted to the Subversion Dev mailing list.