[MERGE][1.0] New annotate merge that performs well on packs

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

John Arbash Meinel wrote:
> John Arbash Meinel has voted comment.
> Status is now: Semi-approved
> Comment:
> So are you saying that even though knits have the annotations already
> cached, it just ignores them?

Yes, this code is designed to not care whether you have annotations.

> Certainly things like this:
> +        a_ancestry = set(vf.get_ancestry(a_rev))
> +        b_ancestry = set(vf.get_ancestry(b_rev))
> +        self.uncommon = a_ancestry.symmetric_difference(b_ancestry)
> 
> Are ones we want to avoid in the future, but until our Graph support is
> better about giving us the "symmetric_difference" directly, this is
> probably fine for now.

Fully agreed that we want to avoid this in the future.

> Which means that you don't care about the topological order of the
> ancestry. But you *don't* use "get_ancestry(rev_id, topo_sorted=False)"

Okay, I can tweak that.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFHVE4E0F+nu1YWqI0RAqP/AJ9592/S/SVwJyUqcrzw35Ltsvi0jACeMs1h
CF2rVzBXIw0uoguNC1Tkpaw=
=JK/g
-----END PGP SIGNATURE-----