[MERGE] New log formats controlling the display of merge revisions

[Ian Clatworthy]

This patch changes the default log formatting so that merge
revisions are not displayed. The old 'long' format is now called
'long+' instead. Matching 'short+' and 'line+' formats are also
provided for consistency.

As a side effect of this patch, the default performance of
log has improved to be the same as 'log --short' is now.

Future performance improvements are under development separately.
FWIW, given our current UI, the display of merge revisions is
O(history) so switching the default format to be one that
doesn't do this by default is desirable so that the majority
of users gain those pending performance benefits.

My main concern landing this change is related to how we
do FILE filtering. Right now, we only display revisions
changing a FILE directly, not those that changed a file
vs a merge. (OTOH, if merge revisions are displayed, we get the
filtering right.) If we want to change that behaviour, I'll put
together a separate patch (and land it before landing this).

Ian C.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: new-log-formats.patch
Type: text/x-diff
Size: 38824 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20090115/05784d1b/attachment-0001.bin