[MERGE] annotate uncommitted changes

[John Arbash Meinel]

> Each of the three callables has pretty unique functionality:
> 
> WorkingTree.annotate_iter gets the basis annotation and determines
> whether to just return it or to reannotate.
> 
> reannotate gets an annotation against the basis, and if there's more
> than one parent, gets more annotations and merges them.
> 
> _reannotate annotates against a single parent.
> 
> Splitting them out as three callables enhances readability and
> testability.  Hanging reannotate off WorkingTree doesn't make sense
> because the operation of reannotation has nothing to do with
> WorkingTrees.  In fact, it's possible to use the reannotate code to
> generate annotations from scratch.  Which might or might not be
> desirable for an SVNRevisionTree.  (SVN does provide annotations, it's
> just that from a bzr perspective, these annotations are wrong because
> they only annotate against basis.)
> 
>> So, conditional +1, I'll update BB.
> 
> Thanks for the review.  I've updated and submitted.
> 
> Aaron

Sounds like a good justification to me. Good job overall.

John
=:->