[MERGE] annotation policies

[John Arbash Meinel]

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

John Arbash Meinel wrote:
| John Arbash Meinel wrote:
| | I've been working on allowing multiple annotation policies to be
| | selected at run
| | time. Probably the hardest part for me is to get a decent way of testing
| | all of
| | them. So I'd like some feedback about what I've done to date, before I
| | go too
| | much father.
| |
|
| This is just an extension of the earlier patch, which now implements a
| couple
| more types, which might show what I was thinking about earlier.
|
| John
| =:->
|
|

I did a quick hack to get this exposed at the command line, and for performance,
this is what I get:

$ time bzr annotate --show-ids --policy=merge-node >/dev/null
real    0m36.322s

$ time bzr annotate --show-ids --policy=right-heads >/dev/null
real    0m32.693s

$ time bzr annotate --show-ids --policy=simple-right >/dev/null
real    0m21.906s

$ time bzr annotate --show-ids --policy=no-merge >/dev/null
real    0m13.132s

So nice to see that my recommended switch (right-heads) is indeed a tiny bit
faster, I'm not sure if the others are strictly worth it or not. Though
simple-right is tempting, and no-merge serves a different purpose.

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkhQY7gACgkQJdeBCYSNAAO0XwCeMlW+bHTZzxVKaHIPsmlz1H6k
AuEAoJk/otPNTQsasyZUrUyvoUWsYSNh
=3in/
-----END PGP SIGNATURE-----