At file:///net/bigmamac/Volumes/home/vila/src/bzr/cases/3232-spurious-conflict/
------------------------------------------------------------
revno: 3881
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Vincent Ladeuil <[EMAIL PROTECTED]>
branch nick: log-s-v
timestamp: Thu 2008-12-11 08:12:28 +0100
message:
Restrict '-v' change to log --short only.
* bzrlib/tests/blackbox/test_log.py:
(TestLog.test_log_long_verbose,
TestLog.test_log_long_verbose_verbose): Update tests to reflect
--long ignoring verbosity level.
* bzrlib/log.py:
(LongLogFormatter.log_revision): Ignore verbosity level to
preserve compatibility.
=== modified file 'bzrlib/log.py'
--- a/bzrlib/log.py 2008-12-09 08:57:33 +0000
+++ b/bzrlib/log.py 2008-12-11 07:12:28 +0000
@@ -817,8 +817,9 @@
for l in message.split('\n'):
to_file.write(indent + ' %s\n' % (l,))
if revision.delta is not None:
+ # We don't respect delta_format for compatibility
revision.delta.show(to_file, self.show_ids, indent=indent,
- short_status=self.delta_format==1)
+ short_status=False)
class ShortLogFormatter(LogFormatter):
=== modified file 'bzrlib/tests/blackbox/test_log.py'
--- a/bzrlib/tests/blackbox/test_log.py 2008-12-05 12:35:15 +0000
+++ b/bzrlib/tests/blackbox/test_log.py 2008-12-11 07:12:28 +0000
@@ -236,14 +236,16 @@
def test_log_long_verbose(self):
self._prepare()
log = self.run_bzr(['log', '--long', '-v', '-r', '1'])[0]
- # Check that we use the short status format and not the regular one
- self.assertContainsRe(log, '(?m)^A hello.txt$')
- self.assertNotContainsRe(log, '(?m)^added:$')
+ # Check that we use the long status format, ignoring the verbosity
+ # level
+ self.assertNotContainsRe(log, '(?m)^A hello.txt$')
+ self.assertContainsRe(log, '(?m)^added:$')
def test_log_long_verbose_verbose(self):
self._prepare()
log = self.run_bzr(['log', '--long', '-vv', '-r', '1'])[0]
- # Check that we use the long status format and not the short one
+ # Check that we use the long status format, ignoring the verbosity
+ # level
self.assertNotContainsRe(log, '(?m)^A hello.txt$')
self.assertContainsRe(log, '(?m)^added:$')
--
bazaar-commits mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/bazaar-commits
