valis for bazaar-ng

[Aaron Bentley]

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

Tez Kamihira wrote:

> In Martin's line, I can see "annotate3.patch" and "annotate4.patch"
> written by Aaron. If those patches have same ability as my work, I
> don't want to make another wheel, but if they handle only current
> active lines, I think my work still has some meaning and I'd like to
> sophisticate it.

No, the annotate algorithm I have doesn't track deleted lines, just the
ones that are active in the indicated revision.  You can find it in
plugin form here:
http://panoramicfeedback.com/opensource/bzrtools/

(note: that is a bzr branch-- Apache hides the .bzr directory by
default, and it looks as though that's unfixable.  Any suggestions?)

My annotate works backwards from the current revision, so it can do
partial annotation, if that's all you want.

The next challenge for annotation is the fact that revisions in bzr can
have multiple predecessors.  When you merge another branch, the revision
you create has a predecessor in both branches.  And it's also
conceivable that a line could be introduced twice-- once in each line of
descent.  For example, both branches could apply the same external patch.

Last I heard, Martin had partially implemented that multiple predecessors.

Unfortunately, you may not always have all predecessors from the other
branch available, if they were brought in by changesets.

The other thing I want to do with the annotate code is cache the
annotations, because they're currently re-calculated every time, which
can be expensive.  Unfortunately, since predecessors may be added at a
later date, this data can become stale.

I have no objections whatsoever if you want to take over annotation
work.  The bzr annotate code was just a quick port of the Fai annotate
code, which was already nicely abstracted.

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

iD8DBQFCypGS0F+nu1YWqI0RArpAAJ4pFXdmbcz8LYvhrnhT3KQdKw0BFgCeM/O9
aRHglCELLGrmqD2a4fmKYKY=
=jXf4
-----END PGP SIGNATURE-----