[MERGE] Support logging single merge revisions with short and line log formatters.
Kent Gibson
warthog618 at gmail.com
Sat Nov 17 10:50:28 GMT 2007
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
This patch adds support for logging single merge revisions using the
short and line log formatters.
e.g.
$ bzr log --line -r 2978.3.1
2978.3.1: Kent Gibson 2007-11-12 Return an error if the revisionspec
contain...
and
$ bzr log --short -r 2978.3.1
2978.3.1 Kent Gibson 2007-11-12
Return an error if the revisionspec contains merge revisions,
but the log formatter doesn't support them.
The patch was inspired by John's review of one of my recent bug fix
patches.
It's being a bit lazy, but the tests are basically just a cut and
paste of other tests. The log tests, both core and blackbox, are ripe
for a bit of rationalisation to allow the tests to share building the
workingtree or even the workingtree instance itself, but I'd rather
put that off until a subsequent patch. Any suggestions along those
lines are welcome.
There are also a couple of minor tidy ups in there - removed some
unused imports from _show_log and moved the test_short_log_with_merges
test from the TestLineLogFormatter to TestShortLogFormatter.
Cheers,
Kent.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFHPsd0goxTFTi1P8QRAmi1AKDafZTay2FtFqUkFehu2O+HGv9OrACgoC7D
U37tp91xumzBXmc1M7iu5Gs=
=5g6r
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: bzr-mail-ppglmz.patch
Type: text/x-patch
Size: 15503 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20071117/0f2b481e/attachment-0001.bin
More information about the bazaar
mailing list