[MERGE] log --long --verbose displays deltas for merge revisions

[Kent Gibson]

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



John Arbash Meinel wrote:
> John Arbash Meinel has voted +0.
> Status is now: Waiting
> Comment:
> As I understand it, this just changes 'log -v' to include the deltas
> for merged revisions as well as mainline. Is that correct?
>
> The only thing preventing it from being +1 is that we really need a
> show_log test for it.
>
> For details, see:
> http://bundlebuggy.aaronbentley.com/request/%3C4641D6F1.4050103%40gmail.com%3E
>
>
Here is a bundle that includes some tests.

There is a test to check that the deltas are provided in merge revisions
if the LogFormatter supports it (test_deltas_in_merge_revisions).
There is a test to check that the LongLogFormatter includes the deltas
of the merge revisions in the output
(test_verbose_merge_revisions_contain_deltas).

I got a little carried away and did a little refactoring of
tests/test_log.py and tests/blackbox/test_log.py while I was in there.
I grouped the tests in tests/test_log.py based on what they are testing
- - show_log or the various LogFormatters.
I moved test_merges_are_indented_by_level from blackbox to
tests/test_log.py since it is really a test of the LongLogFormatter.
I also wanted the LongLogFormatter tests to more precisely test the
generated log against the expected log, which I did by normalizing the
generated log.
I also replaced several calls to assertEquals with assertEqualDiff to
ease debugging.

Finally, I removed some commented out code in checkDelta (none of the
paths used in the tests include separators anyway), and re-instated one
commented out checkDelta which seemed like a valid enough part of the
test to me.

(John - sorry about the dupe - this time I'm using the right address)

Cheers,
Kent.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFGd+XZgoxTFTi1P8QRAsCvAJ92gvcq5Tyy0eJuWoMR3N/ueWvS9wCdECcx
ZsiNSJqYcAwWVy+5tAIYL5M=
=nAKZ
-----END PGP SIGNATURE-----

-------------- next part --------------
A non-text attachment was scrubbed...
Name: merge_deltas_b.patch
Type: text/x-patch
Size: 32489 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070619/e0ea094a/attachment-0001.bin