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

[Robert Collins]

On Mon, 2008-07-07 at 09:52 -0500, John Arbash Meinel wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
> 
> Martin Pool wrote:
> > I added this additional patch to make test_annotate pass in the
> > "named-nograph-knit-pack) case, where get_parents returns None as the
> > parents of all requested revisions.
> > 
> > This patch is not quite satisfactory because it seems like a bit of a
> > hack when the code is not being clear about just what should be
> > expected in these values.  Feedback would be very welcome.
> 
> You mean get_parent_map() not get_parents(), or is this a layering issue?
> get_parent_map() should be returning nothing for entries that are not present,
> not None.
> If we have one that is returning None, I think we should change it, so that we
> don't have lots of hackery in all of our callers.

No, Martin means the nograph case. packs have versioned files that have
*no graph*. The entries are present, but their parents are not () or
(NULL_REVISION,). signatures are an example of this.

-Rob
-- 
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/20080708/5568002f/attachment.pgp