[MERGE] Fixes for 'bzr annotate'

[John Arbash Meinel]

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

There are 2 simple bugs in 'bzr annotate' right now.

It seems that Martin didn't actually restore the fast-path when we were
sorting out the issues with stacking. He accidentally left in a shortcut
with:

if True or len(self._knit._fallback_vfs) > 0:

This made a significant difference in 'bzr annotate' time for files that
are modified often. (56s down to 16s on my test file.)

I'm still trying to figure out why 'annotate' gives a wrong result when
the parent_ids are swapped. I don't see a particular reason for it in
'bzrlib.annotate.reannotate()' it should be order independent.

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

iEYEARECAAYFAkj4utQACgkQJdeBCYSNAANEhwCgol/u3EU4wvKRu88YlDMWqsJd
oGsAnRGXRSJfZoUv0I8mQ7c2bAJ+MYfu
=Vztp
-----END PGP SIGNATURE-----
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: annotate_cleanups.patch
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20081017/0364fd86/attachment.diff