At file:///net/bigmamac/Volumes/home/vila/src/bzr/cases/3232-spurious-conflict/
------------------------------------------------------------
revno: 3889
revision-id: [email protected]
parent: [email protected]
committer: Vincent Ladeuil <[email protected]>
branch nick: log-deep
timestamp: Thu 2008-12-11 18:02:50 +0100
message:
log --deep warns if used without file.
* bzrlib/tests/blackbox/test_log.py:
(TestLogFileDeep.test_log_deep_without_file_warns): New test.
* bzrlib/builtins.py:
(cmd_log.run): Oops, _path_filter should always be defined.
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py 2008-12-11 15:41:02 +0000
+++ b/bzrlib/builtins.py 2008-12-11 17:02:50 +0000
@@ -1879,6 +1879,7 @@
if log_format is None:
log_format = log.log_formatter_registry.get_default(b)
+ _path_filter = None
if specific_file_id or specific_file_path:
if deep:
def only_that_file(path, file_id):
@@ -1889,7 +1890,6 @@
else:
def only_that_file(path, file_id):
return file_id == specific_file_id
- _path_filter = None
delta_filter = only_that_file
else:
delta_filter = None
=== modified file 'bzrlib/tests/blackbox/test_log.py'
--- a/bzrlib/tests/blackbox/test_log.py 2008-12-11 15:41:02 +0000
+++ b/bzrlib/tests/blackbox/test_log.py 2008-12-11 17:02:50 +0000
@@ -588,7 +588,9 @@
self.assertContainsRe(log, '(?sm)^ +2 joe.*D f1\n.*^ +1 joe.*A f1\n')
self.assertNotContainsRe(log, '(?sm)^ +3 joe')
+ def test_log_deep_without_file_warns(self):
+ log, err = self.run_bzr(['log', '--deep'])
+ self.assertEquals('No file specified, --deep ignored\n', err)
# tests for:
-# --deep warning if no file specified
# -- filter out already merged revisions a la
_filter_revisions_touching_file_id
--
bazaar-commits mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/bazaar-commits
