[MERGE] 'bzr annotate' shows dotted revnos and --show-ids

[John Arbash Meinel]

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

The attached patch updates 'bzr annotate' in 2 ways. First, it shows
dotted revnos by default, instead of showing 'merge'. Second, it allows
you to specify --show-ids and it will display revision ids instead of
revnos.

It ends up changing the alignment slightly, because while using it, this
seemed to be the best alignment for the different options. I'm also
attaching some of the new annotation output so people can get a feel for
it. If you want something interesting, try doing annotate on NEWS...

Attached is an annotation of the first 30 lines NEWS from bzr
originally, and then with the new dotted form, and then with --show-ids.
It should be pretty obvious which is which if you look at the texts.

Comments? It should be possible to add something like --merge-points,
which would show the point where the change was merged into the current
mainline, but I'll have to think about that for a bit.

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

iD8DBQFFgIxZJdeBCYSNAAMRAvx5AJ9O1+5txfJGl4IgKosO2T3lnJQjSwCguG3j
SKsedaXsVi/gatXe1hW3KbI=
=evV8
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: annotate_show_ids.patch
Type: text/x-patch
Size: 64484 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20061213/8ee8aa5a/attachment.bin 
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: annotate_original.txt
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20061213/8ee8aa5a/attachment.txt 
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: annotate_dotted.txt
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20061213/8ee8aa5a/attachment-0001.txt 
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: annotate_ids.txt
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20061213/8ee8aa5a/attachment-0002.txt