[MERGE] Fixes for 'bzr annotate'

[John Arbash Meinel]

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

Vincent Ladeuil wrote:
>>>>>> "john" == John Arbash Meinel <john at arbash-meinel.com> writes:
> 
>     john> There are 2 simple bugs in 'bzr annotate' right now.
>     john> It seems that Martin didn't actually restore the
>     john> fast-path when we were sorting out the issues with
>     john> stacking. He accidentally left in a shortcut with:
> 
>     john> if True or len(self._knit._fallback_vfs) > 0:
> 
> Since that activates a faster code path for annotate it may be
> worth mentioning some numbers at least here on the list (I don't
> remember if that can close a bug or two).
> 
> BB:approve
> 
>         Vincent
> 

So for mysql's "sql/sql-parse.cc" it takes the time on my machine from
"60s" down to "16s". I don't think it is an open bug, though.

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

iEYEARECAAYFAkj40l8ACgkQJdeBCYSNAAPQ2gCgrLSLGILrVxuuBwTRbhmzvZZG
/pQAnAqeURKNezOxqI+Zhns0XeGz/hAH
=NR+p
-----END PGP SIGNATURE-----