display of merged revisions in loggerhead and log

[Michael Hudson]

Note that I'm replying to a mail from several months ago here.

The topic was how to make it apparent that the committer of a merge 
revision didn't necessarily do all the work being merged.

Martin Pool wrote:
> On 7/17/07, Michael Hudson <michael.hudson at canonical.com> wrote:
>> I don't really have a good answer to this.  Maybe you could list all
>> authors who committed to the branch being merged since it diverged from
>> mainline?
> 
> You could try what gmail does, and show, on one line, the first name
> (or userid) of the people who contributed to a merge, truncated with
> elipsis if there are more than about four.  I'm not sure I'd like it
> but it would be interesting.

I actually got around to having a hack at this this morning.  I've 
attached two screenshots of my efforts.  The first does something like 
what Martin suggests, though it doesn't restrict itself to first names. 
  Perhaps it should, because the main problem with it is that it takes 
up too much horizontal space.  This attempt is also extremely hacky, it 
wouldn't be appropriate for branches which didn't work like bzr.dev.

The second just adds a "Branch authors" field to the information that 
drops down when you click the arrow next to a revision.  This seems like 
a better bet, probably.

Currently the code for this is using find_differences, which I've been 
warned isn't necessarily accurate -- but it's certainly fast, which 
doing things with get_ancestry() isn't.  Are the situations where it's 
wrong likely to arise in practice for what I'm doing here (basically 
"find_differences(revid, get_revision(revid).parent_ids[0])")?

Cheers,
mwh
-------------- next part --------------
A non-text attachment was scrubbed...
Name: hacked_up_changelog_view.png
Type: image/png
Size: 152649 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080306/0c47e94e/attachment-0002.png 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: hacked_up_changelog_view_2.png
Type: image/png
Size: 111033 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080306/0c47e94e/attachment-0003.png