[MERGE] annotate uncommitted changes

[Aaron Bentley]

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

This revision adds a new Tree.annotate_iter interface.  This allows
uncommitted changes to be annotated.

Current annotate implementations annotate the last revision, but this
allows them to show the file exactly as it currently is, with line
numbers matched up and everything.

It's also a higher-level interface, so it doesn't require the caller to
know about weaves and transactions.

Since it can operate on uncommited files, it can be used by knit merge,
which cannot currently operate on files with uncommitted changes.

I have implemented support for this new UI in my version of gannotate:
http://panoramicfeedback.com/opensource/bzr/repo/plugins/bzr-gtk/

Vincent Ladeuil wrote:
> No problem. I didn't because Aaron was the author of both the
> versions and I didn't want to step on his toes. If it's not a
> problem for him, I'll give it a try (Aaron, do not hesitate to
> let your toes yell or give useful suggestions ;).

I have not implemented it in annotate, so if you'd like to do that, feel
free.

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

iD8DBQFFgu7g0F+nu1YWqI0RAr0xAJ96/UJVftVSPPYRJbrGQw+zVRiZkgCeIbLJ
sfwDowrEse9ApdwX2IE7vV8=
=4Idz
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: annotate-uncommitted.patch
Type: text/x-patch
Size: 6193 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20061215/b7fed376/attachment.bin