[MERGE] Redo annotate more simply, using just the public interfaces for VersionedFiles.

Robert Collins robertc at robertcollins.net
Wed Jul 2 05:30:39 BST 2008

On Wed, 2008-07-02 at 00:14 -0400, Martin Pool wrote:
> Martin Pool has voted tweak.
> Status is now: Conditionally approved
> Comment:
> So this is certainly simpler, which was nice.
>  From your previous conversation with John it was not clear to me whether
> this would be slower or not:
> >> It will be slower primarily because we can't use the cached matching
> >> blocks. So we have to re-diff every file.
> >
> >There is self._extract_matching_blocks. Oh, the optimiser is missing
> >there on knits - I'll do a patch to reinstate that today. But bundle
> >generation uses that for make_mpdiffs and is still totally generic.
> It looks like it might be.  Maybe we should measure this on a regular
> pack repository and if necessary special-case it for non-stacked
> repositories?

Sounds reasonable. John - do you have a bench for annotate?

> This smells like it should be a separate named method, maybe on the 
> knit?


> Aside from that if you think the performance tradeoff is reasonable it's
> ok with me.

Well, working >> not working I guess :P. But yes, lets check its not a
total disaster before merging.

GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080702/b2c2212d/attachment-0001.pgp 

More information about the bazaar mailing list