1
# Copyright (C) 2006-2010 Canonical Ltd
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
18
"""Black-box tests for bzr log."""
20
from itertools import izip
31
from bzrlib.tests import (
37
class TestLog(tests.TestCaseWithTransport, test_log.TestLogMixin):
39
def make_minimal_branch(self, path='.', format=None):
40
tree = self.make_branch_and_tree(path, format=format)
41
self.build_tree([path + '/hello.txt'])
43
tree.commit(message='message1')
46
def make_linear_branch(self, path='.', format=None):
47
tree = self.make_branch_and_tree(path, format=format)
49
[path + '/hello.txt', path + '/goodbye.txt', path + '/meep.txt'])
51
tree.commit(message='message1')
52
tree.add('goodbye.txt')
53
tree.commit(message='message2')
55
tree.commit(message='message3')
58
def make_merged_branch(self, path='.', format=None):
59
tree = self.make_linear_branch(path, format)
60
tree2 = tree.bzrdir.sprout('tree2',
61
revision_id=tree.branch.get_rev_id(1)).open_workingtree()
62
tree2.commit(message='tree2 message2')
63
tree2.commit(message='tree2 message3')
64
tree.merge_from_branch(tree2.branch)
65
tree.commit(message='merge')
69
class TestLogWithLogCatcher(TestLog):
72
super(TestLogWithLogCatcher, self).setUp()
73
# Capture log formatter creations
74
class MyLogFormatter(test_log.LogCatcher):
76
def __new__(klass, *args, **kwargs):
77
self.log_catcher = test_log.LogCatcher(*args, **kwargs)
78
# Always return our own log formatter
79
return self.log_catcher
82
# Always return our own log formatter class hijacking the
83
# default behavior (which requires setting up a config
86
self.overrideAttr(log.log_formatter_registry, 'get_default', getme)
88
def get_captured_revisions(self):
89
return self.log_catcher.revisions
91
def assertLogRevnos(self, args, expected_revnos, working_dir='.'):
92
self.run_bzr(['log'] + args, working_dir=working_dir)
93
self.assertEqual(expected_revnos,
94
[r.revno for r in self.get_captured_revisions()])
96
def assertLogRevnosAndDepths(self, args, expected_revnos_and_depths,
98
self.run_bzr(['log'] + args, working_dir=working_dir)
99
self.assertEqual(expected_revnos_and_depths,
100
[(r.revno, r.merge_depth)
101
for r in self.get_captured_revisions()])
104
class TestLogRevSpecs(TestLogWithLogCatcher):
106
def test_log_no_revspec(self):
107
self.make_linear_branch()
108
self.assertLogRevnos([], ['3', '2', '1'])
110
def test_log_null_end_revspec(self):
111
self.make_linear_branch()
112
self.assertLogRevnos(['-r1..'], ['3', '2', '1'])
114
def test_log_null_begin_revspec(self):
115
self.make_linear_branch()
116
self.assertLogRevnos(['-r..3'], ['3', '2', '1'])
118
def test_log_null_both_revspecs(self):
119
self.make_linear_branch()
120
self.assertLogRevnos(['-r..'], ['3', '2', '1'])
122
def test_log_negative_begin_revspec_full_log(self):
123
self.make_linear_branch()
124
self.assertLogRevnos(['-r-3..'], ['3', '2', '1'])
126
def test_log_negative_both_revspec_full_log(self):
127
self.make_linear_branch()
128
self.assertLogRevnos(['-r-3..-1'], ['3', '2', '1'])
130
def test_log_negative_both_revspec_partial(self):
131
self.make_linear_branch()
132
self.assertLogRevnos(['-r-3..-2'], ['2', '1'])
134
def test_log_negative_begin_revspec(self):
135
self.make_linear_branch()
136
self.assertLogRevnos(['-r-2..'], ['3', '2'])
138
def test_log_positive_revspecs(self):
139
self.make_linear_branch()
140
self.assertLogRevnos(['-r1..3'], ['3', '2', '1'])
142
def test_log_dotted_revspecs(self):
143
self.make_merged_branch()
144
self.assertLogRevnos(['-n0', '-r1..1.1.1'], ['1.1.1', '1'])
146
def test_log_limit(self):
147
tree = self.make_branch_and_tree('.')
148
# We want more commits than our batch size starts at
149
for pos in range(10):
150
tree.commit("%s" % pos)
151
self.assertLogRevnos(['--limit', '2'], ['10', '9'])
153
def test_log_limit_short(self):
154
self.make_linear_branch()
155
self.assertLogRevnos(['-l', '2'], ['3', '2'])
157
def test_log_change_revno(self):
158
self.make_linear_branch()
159
self.assertLogRevnos(['-c1'], ['1'])
161
def test_branch_revspec(self):
162
foo = self.make_branch_and_tree('foo')
163
bar = self.make_branch_and_tree('bar')
164
self.build_tree(['foo/foo.txt', 'bar/bar.txt'])
167
foo.commit(message='foo')
168
bar.commit(message='bar')
169
self.run_bzr('log -r branch:../bar', working_dir='foo')
170
self.assertEqual([bar.branch.get_rev_id(1)],
172
for r in self.get_captured_revisions()])
175
class TestLogExcludeCommonAncestry(TestLogWithLogCatcher):
177
def test_exclude_common_ancestry_simple_revnos(self):
178
self.make_linear_branch()
179
self.assertLogRevnos(['-r1..3', '--exclude-common-ancestry'],
183
class TestLogMergedLinearAncestry(TestLogWithLogCatcher):
186
super(TestLogMergedLinearAncestry, self).setUp()
187
# FIXME: Using a MemoryTree would be even better here (but until we
188
# stop calling run_bzr, there is no point) --vila 100118.
189
builder = branchbuilder.BranchBuilder(self.get_transport())
190
builder.start_series()
204
builder.build_snapshot('1', None, [
205
('add', ('', 'root-id', 'directory', ''))])
206
builder.build_snapshot('2', ['1'], [])
208
builder.build_snapshot('1.1.1', ['1'], [])
209
# merge branch into mainline
210
builder.build_snapshot('3', ['2', '1.1.1'], [])
211
# new commits in branch
212
builder.build_snapshot('1.1.2', ['1.1.1'], [])
213
builder.build_snapshot('1.1.3', ['1.1.2'], [])
214
# merge branch into mainline
215
builder.build_snapshot('4', ['3', '1.1.3'], [])
216
# merge mainline into branch
217
builder.build_snapshot('1.1.4', ['1.1.3', '4'], [])
218
# merge branch into mainline
219
builder.build_snapshot('5', ['4', '1.1.4'], [])
220
builder.finish_series()
223
self.assertLogRevnos(['-n0', '-r1.1.1..1.1.4'],
224
['1.1.4', '4', '1.1.3', '1.1.2', '3', '1.1.1'])
225
def test_n0_forward(self):
226
self.assertLogRevnos(['-n0', '-r1.1.1..1.1.4', '--forward'],
227
['3', '1.1.1', '4', '1.1.2', '1.1.3', '1.1.4'])
230
# starting from 1.1.4 we follow the left-hand ancestry
231
self.assertLogRevnos(['-n1', '-r1.1.1..1.1.4'],
232
['1.1.4', '1.1.3', '1.1.2', '1.1.1'])
234
def test_n1_forward(self):
235
self.assertLogRevnos(['-n1', '-r1.1.1..1.1.4', '--forward'],
236
['1.1.1', '1.1.2', '1.1.3', '1.1.4'])
239
class Test_GenerateAllRevisions(TestLogWithLogCatcher):
242
super(Test_GenerateAllRevisions, self).setUp()
243
builder = self.make_branch_with_many_merges()
244
b = builder.get_branch()
246
self.addCleanup(b.unlock)
249
def make_branch_with_many_merges(self, path='.', format=None):
250
builder = branchbuilder.BranchBuilder(self.get_transport())
251
builder.start_series()
252
# The graph below may look a bit complicated (and it may be but I've
253
# banged my head enough on it) but the bug requires at least dotted
254
# revnos *and* merged revisions below that.
255
builder.build_snapshot('1', None, [
256
('add', ('', 'root-id', 'directory', ''))])
257
builder.build_snapshot('2', ['1'], [])
258
builder.build_snapshot('1.1.1', ['1'], [])
259
builder.build_snapshot('2.1.1', ['2'], [])
260
builder.build_snapshot('3', ['2', '1.1.1'], [])
261
builder.build_snapshot('2.1.2', ['2.1.1'], [])
262
builder.build_snapshot('2.2.1', ['2.1.1'], [])
263
builder.build_snapshot('2.1.3', ['2.1.2', '2.2.1'], [])
264
builder.build_snapshot('4', ['3', '2.1.3'], [])
265
builder.build_snapshot('5', ['4', '2.1.2'], [])
266
builder.finish_series()
269
def test_not_an_ancestor(self):
270
self.assertRaises(errors.BzrCommandError,
271
log._generate_all_revisions,
272
self.branch, '1.1.1', '2.1.3', 'reverse',
273
delayed_graph_generation=True)
275
def test_wrong_order(self):
276
self.assertRaises(errors.BzrCommandError,
277
log._generate_all_revisions,
278
self.branch, '5', '2.1.3', 'reverse',
279
delayed_graph_generation=True)
281
def test_no_start_rev_id_with_end_rev_id_being_a_merge(self):
282
revs = log._generate_all_revisions(
283
self.branch, None, '2.1.3',
284
'reverse', delayed_graph_generation=True)
287
class TestLogRevSpecsWithPaths(TestLogWithLogCatcher):
289
def test_log_revno_n_path_wrong_namespace(self):
290
self.make_linear_branch('branch1')
291
self.make_linear_branch('branch2')
292
# There is no guarantee that a path exist between two arbitrary
294
self.run_bzr("log -r revno:2:branch1..revno:3:branch2", retcode=3)
296
def test_log_revno_n_path_correct_order(self):
297
self.make_linear_branch('branch2')
298
self.assertLogRevnos(['-rrevno:1:branch2..revno:3:branch2'],
301
def test_log_revno_n_path(self):
302
self.make_linear_branch('branch2')
303
self.assertLogRevnos(['-rrevno:1:branch2'],
305
rev_props = self.log_catcher.revisions[0].rev.properties
306
self.assertEqual('branch2', rev_props['branch-nick'])
309
class TestLogErrors(TestLog):
311
def test_log_zero_revspec(self):
312
self.make_minimal_branch()
313
self.run_bzr_error(['bzr: ERROR: Logging revision 0 is invalid.'],
316
def test_log_zero_begin_revspec(self):
317
self.make_linear_branch()
318
self.run_bzr_error(['bzr: ERROR: Logging revision 0 is invalid.'],
321
def test_log_zero_end_revspec(self):
322
self.make_linear_branch()
323
self.run_bzr_error(['bzr: ERROR: Logging revision 0 is invalid.'],
326
def test_log_nonexistent_revno(self):
327
self.make_minimal_branch()
328
self.run_bzr_error(["bzr: ERROR: Requested revision: '1234' "
329
"does not exist in branch:"],
332
def test_log_nonexistent_dotted_revno(self):
333
self.make_minimal_branch()
334
self.run_bzr_error(["bzr: ERROR: Requested revision: '123.123' "
335
"does not exist in branch:"],
336
['log', '-r123.123'])
338
def test_log_change_nonexistent_revno(self):
339
self.make_minimal_branch()
340
self.run_bzr_error(["bzr: ERROR: Requested revision: '1234' "
341
"does not exist in branch:"],
344
def test_log_change_nonexistent_dotted_revno(self):
345
self.make_minimal_branch()
346
self.run_bzr_error(["bzr: ERROR: Requested revision: '123.123' "
347
"does not exist in branch:"],
348
['log', '-c123.123'])
350
def test_log_change_single_revno_only(self):
351
self.make_minimal_branch()
352
self.run_bzr_error(['bzr: ERROR: Option --change does not'
353
' accept revision ranges'],
354
['log', '--change', '2..3'])
356
def test_log_change_incompatible_with_revision(self):
357
self.run_bzr_error(['bzr: ERROR: --revision and --change'
358
' are mutually exclusive'],
359
['log', '--change', '2', '--revision', '3'])
361
def test_log_nonexistent_file(self):
362
self.make_minimal_branch()
363
# files that don't exist in either the basis tree or working tree
364
# should give an error
365
out, err = self.run_bzr('log does-not-exist', retcode=3)
366
self.assertContainsRe(err,
367
'Path unknown at end or start of revision range: '
370
def test_log_reversed_revspecs(self):
371
self.make_linear_branch()
372
self.run_bzr_error(('bzr: ERROR: Start revision must be older than '
373
'the end revision.\n',),
376
def test_log_reversed_dotted_revspecs(self):
377
self.make_merged_branch()
378
self.run_bzr_error(('bzr: ERROR: Start revision not found in '
379
'left-hand history of end revision.\n',),
382
def test_log_bad_message_re(self):
383
"""Bad --message argument gives a sensible message
385
See https://bugs.launchpad.net/bzr/+bug/251352
387
self.make_minimal_branch()
388
out, err = self.run_bzr(['log', '-m', '*'], retcode=3)
389
self.assertContainsRe(err, "ERROR.*Invalid pattern.*nothing to repeat")
390
self.assertEqual(out, '')
392
def test_log_unsupported_timezone(self):
393
self.make_linear_branch()
394
self.run_bzr_error(['bzr: ERROR: Unsupported timezone format "foo", '
395
'options are "utc", "original", "local".'],
396
['log', '--timezone', 'foo'])
398
def test_log_exclude_ancestry_no_range(self):
399
self.make_linear_branch()
400
self.run_bzr_error(['bzr: ERROR: --exclude-common-ancestry'
401
' requires -r with two revisions'],
402
['log', '--exclude-common-ancestry'])
404
def test_log_exclude_ancestry_single_revision(self):
405
self.make_merged_branch()
406
self.run_bzr_error(['bzr: ERROR: --exclude-common-ancestry'
407
' requires two different revisions'],
408
['log', '--exclude-common-ancestry',
411
class TestLogTags(TestLog):
413
def test_log_with_tags(self):
414
tree = self.make_linear_branch(format='dirstate-tags')
416
branch.tags.set_tag('tag1', branch.get_rev_id(1))
417
branch.tags.set_tag('tag1.1', branch.get_rev_id(1))
418
branch.tags.set_tag('tag3', branch.last_revision())
420
log = self.run_bzr("log -r-1")[0]
421
self.assertTrue('tags: tag3' in log)
423
log = self.run_bzr("log -r1")[0]
424
# I guess that we can't know the order of tags in the output
425
# since dicts are unordered, need to check both possibilities
426
self.assertContainsRe(log, r'tags: (tag1, tag1\.1|tag1\.1, tag1)')
428
def test_merged_log_with_tags(self):
429
branch1_tree = self.make_linear_branch('branch1',
430
format='dirstate-tags')
431
branch1 = branch1_tree.branch
432
branch2_tree = branch1_tree.bzrdir.sprout('branch2').open_workingtree()
433
branch1_tree.commit(message='foobar', allow_pointless=True)
434
branch1.tags.set_tag('tag1', branch1.last_revision())
435
# tags don't propagate if we don't merge
436
self.run_bzr('merge ../branch1', working_dir='branch2')
437
branch2_tree.commit(message='merge branch 1')
438
log = self.run_bzr("log -n0 -r-1", working_dir='branch2')[0]
439
self.assertContainsRe(log, r' tags: tag1')
440
log = self.run_bzr("log -n0 -r3.1.1", working_dir='branch2')[0]
441
self.assertContainsRe(log, r'tags: tag1')
444
class TestLogVerbose(TestLog):
447
super(TestLogVerbose, self).setUp()
448
self.make_minimal_branch()
450
def assertUseShortDeltaFormat(self, cmd):
451
log = self.run_bzr(cmd)[0]
452
# Check that we use the short status format
453
self.assertContainsRe(log, '(?m)^\s*A hello.txt$')
454
self.assertNotContainsRe(log, '(?m)^\s*added:$')
456
def assertUseLongDeltaFormat(self, cmd):
457
log = self.run_bzr(cmd)[0]
458
# Check that we use the long status format
459
self.assertNotContainsRe(log, '(?m)^\s*A hello.txt$')
460
self.assertContainsRe(log, '(?m)^\s*added:$')
462
def test_log_short_verbose(self):
463
self.assertUseShortDeltaFormat(['log', '--short', '-v'])
465
def test_log_short_verbose_verbose(self):
466
self.assertUseLongDeltaFormat(['log', '--short', '-vv'])
468
def test_log_long_verbose(self):
469
# Check that we use the long status format, ignoring the verbosity
471
self.assertUseLongDeltaFormat(['log', '--long', '-v'])
473
def test_log_long_verbose_verbose(self):
474
# Check that we use the long status format, ignoring the verbosity
476
self.assertUseLongDeltaFormat(['log', '--long', '-vv'])
479
class TestLogMerges(TestLogWithLogCatcher):
482
super(TestLogMerges, self).setUp()
483
self.make_branches_with_merges()
485
def make_branches_with_merges(self):
486
level0 = self.make_branch_and_tree('level0')
487
self.wt_commit(level0, 'in branch level0')
488
level1 = level0.bzrdir.sprout('level1').open_workingtree()
489
self.wt_commit(level1, 'in branch level1')
490
level2 = level1.bzrdir.sprout('level2').open_workingtree()
491
self.wt_commit(level2, 'in branch level2')
492
level1.merge_from_branch(level2.branch)
493
self.wt_commit(level1, 'merge branch level2')
494
level0.merge_from_branch(level1.branch)
495
self.wt_commit(level0, 'merge branch level1')
497
def test_merges_are_indented_by_level(self):
498
self.run_bzr(['log', '-n0'], working_dir='level0')
499
revnos_and_depth = [(r.revno, r.merge_depth)
500
for r in self.get_captured_revisions()]
501
self.assertEqual([('2', 0), ('1.1.2', 1), ('1.2.1', 2), ('1.1.1', 1),
503
[(r.revno, r.merge_depth)
504
for r in self.get_captured_revisions()])
506
def test_force_merge_revisions_off(self):
507
self.assertLogRevnos(['-n1'], ['2', '1'], working_dir='level0')
509
def test_force_merge_revisions_on(self):
510
self.assertLogRevnos(['-n0'], ['2', '1.1.2', '1.2.1', '1.1.1', '1'],
511
working_dir='level0')
513
def test_include_merges(self):
514
# Confirm --include-merges gives the same output as -n0
515
self.assertLogRevnos(['--include-merges'],
516
['2', '1.1.2', '1.2.1', '1.1.1', '1'],
517
working_dir='level0')
518
self.assertLogRevnos(['--include-merges'],
519
['2', '1.1.2', '1.2.1', '1.1.1', '1'],
520
working_dir='level0')
521
out_im, err_im = self.run_bzr('log --include-merges',
522
working_dir='level0')
523
out_n0, err_n0 = self.run_bzr('log -n0', working_dir='level0')
524
self.assertEqual('', err_im)
525
self.assertEqual('', err_n0)
526
self.assertEqual(out_im, out_n0)
528
def test_force_merge_revisions_N(self):
529
self.assertLogRevnos(['-n2'],
530
['2', '1.1.2', '1.1.1', '1'],
531
working_dir='level0')
533
def test_merges_single_merge_rev(self):
534
self.assertLogRevnosAndDepths(['-n0', '-r1.1.2'],
535
[('1.1.2', 0), ('1.2.1', 1)],
536
working_dir='level0')
538
def test_merges_partial_range(self):
539
self.assertLogRevnosAndDepths(
540
['-n0', '-r1.1.1..1.1.2'],
541
[('1.1.2', 0), ('1.2.1', 1), ('1.1.1', 0)],
542
working_dir='level0')
544
def test_merges_partial_range_ignore_before_lower_bound(self):
545
"""Dont show revisions before the lower bound's merged revs"""
546
self.assertLogRevnosAndDepths(
547
['-n0', '-r1.1.2..2'],
548
[('2', 0), ('1.1.2', 1), ('1.2.1', 2)],
549
working_dir='level0')
552
class TestLogDiff(TestLogWithLogCatcher):
554
# FIXME: We need specific tests for each LogFormatter about how the diffs
555
# are displayed: --long indent them by depth, --short use a fixed
556
# indent and --line does't display them. -- vila 10019
559
super(TestLogDiff, self).setUp()
560
self.make_branch_with_diffs()
562
def make_branch_with_diffs(self):
563
level0 = self.make_branch_and_tree('level0')
564
self.build_tree(['level0/file1', 'level0/file2'])
567
self.wt_commit(level0, 'in branch level0')
569
level1 = level0.bzrdir.sprout('level1').open_workingtree()
570
self.build_tree_contents([('level1/file2', 'hello\n')])
571
self.wt_commit(level1, 'in branch level1')
572
level0.merge_from_branch(level1.branch)
573
self.wt_commit(level0, 'merge branch level1')
575
def _diff_file1_revno1(self):
576
return """=== added file 'file1'
577
--- file1\t1970-01-01 00:00:00 +0000
578
+++ file1\t2005-11-22 00:00:00 +0000
580
+contents of level0/file1
584
def _diff_file2_revno2(self):
585
return """=== modified file 'file2'
586
--- file2\t2005-11-22 00:00:00 +0000
587
+++ file2\t2005-11-22 00:00:01 +0000
589
-contents of level0/file2
594
def _diff_file2_revno1_1_1(self):
595
return """=== modified file 'file2'
596
--- file2\t2005-11-22 00:00:00 +0000
597
+++ file2\t2005-11-22 00:00:01 +0000
599
-contents of level0/file2
604
def _diff_file2_revno1(self):
605
return """=== added file 'file2'
606
--- file2\t1970-01-01 00:00:00 +0000
607
+++ file2\t2005-11-22 00:00:00 +0000
609
+contents of level0/file2
613
def assertLogRevnosAndDiff(self, args, expected,
615
self.run_bzr(['log', '-p'] + args, working_dir=working_dir)
616
expected_revnos_and_depths = [
617
(revno, depth) for revno, depth, diff in expected]
618
# Check the revnos and depths first to make debugging easier
619
self.assertEqual(expected_revnos_and_depths,
620
[(r.revno, r.merge_depth)
621
for r in self.get_captured_revisions()])
622
# Now check the diffs, adding the revno in case of failure
623
fmt = 'In revno %s\n%s'
624
for expected_rev, actual_rev in izip(expected,
625
self.get_captured_revisions()):
626
revno, depth, expected_diff = expected_rev
627
actual_diff = actual_rev.diff
628
self.assertEqualDiff(fmt % (revno, expected_diff),
629
fmt % (revno, actual_diff))
631
def test_log_diff_with_merges(self):
632
self.assertLogRevnosAndDiff(
634
[('2', 0, self._diff_file2_revno2()),
635
('1.1.1', 1, self._diff_file2_revno1_1_1()),
636
('1', 0, self._diff_file1_revno1()
637
+ self._diff_file2_revno1())],
638
working_dir='level0')
641
def test_log_diff_file1(self):
642
self.assertLogRevnosAndDiff(['-n0', 'file1'],
643
[('1', 0, self._diff_file1_revno1())],
644
working_dir='level0')
646
def test_log_diff_file2(self):
647
self.assertLogRevnosAndDiff(['-n1', 'file2'],
648
[('2', 0, self._diff_file2_revno2()),
649
('1', 0, self._diff_file2_revno1())],
650
working_dir='level0')
653
class TestLogUnicodeDiff(TestLog):
655
def test_log_show_diff_non_ascii(self):
656
# Smoke test for bug #328007 UnicodeDecodeError on 'log -p'
657
message = u'Message with \xb5'
658
body = 'Body with \xb5\n'
659
wt = self.make_branch_and_tree('.')
660
self.build_tree_contents([('foo', body)])
662
wt.commit(message=message)
663
# check that command won't fail with unicode error
664
# don't care about exact output because we have other tests for this
665
out,err = self.run_bzr('log -p --long')
666
self.assertNotEqual('', out)
667
self.assertEqual('', err)
668
out,err = self.run_bzr('log -p --short')
669
self.assertNotEqual('', out)
670
self.assertEqual('', err)
671
out,err = self.run_bzr('log -p --line')
672
self.assertNotEqual('', out)
673
self.assertEqual('', err)
676
class TestLogEncodings(tests.TestCaseInTempDir):
679
_message = u'Message with \xb5'
681
# Encodings which can encode mu
686
'cp437', # Common windows encoding
687
'cp1251', # Russian windows encoding
688
'cp1258', # Common windows encoding
690
# Encodings which cannot encode mu
698
super(TestLogEncodings, self).setUp()
699
self.overrideAttr(osutils, '_cached_user_encoding')
701
def create_branch(self):
704
self.build_tree_contents([('a', 'some stuff\n')])
706
bzr(['commit', '-m', self._message])
708
def try_encoding(self, encoding, fail=False):
711
self.assertRaises(UnicodeEncodeError,
712
self._mu.encode, encoding)
713
encoded_msg = self._message.encode(encoding, 'replace')
715
encoded_msg = self._message.encode(encoding)
717
old_encoding = osutils._cached_user_encoding
718
# This test requires that 'run_bzr' uses the current
719
# bzrlib, because we override user_encoding, and expect
722
osutils._cached_user_encoding = 'ascii'
723
# We should be able to handle any encoding
724
out, err = bzr('log', encoding=encoding)
726
# Make sure we wrote mu as we expected it to exist
727
self.assertNotEqual(-1, out.find(encoded_msg))
728
out_unicode = out.decode(encoding)
729
self.assertNotEqual(-1, out_unicode.find(self._message))
731
self.assertNotEqual(-1, out.find('Message with ?'))
733
osutils._cached_user_encoding = old_encoding
735
def test_log_handles_encoding(self):
738
for encoding in self.good_encodings:
739
self.try_encoding(encoding)
741
def test_log_handles_bad_encoding(self):
744
for encoding in self.bad_encodings:
745
self.try_encoding(encoding, fail=True)
747
def test_stdout_encoding(self):
749
osutils._cached_user_encoding = "cp1251"
752
self.build_tree(['a'])
754
bzr(['commit', '-m', u'\u0422\u0435\u0441\u0442'])
755
stdout, stderr = self.run_bzr('log', encoding='cp866')
757
message = stdout.splitlines()[-1]
759
# explanation of the check:
760
# u'\u0422\u0435\u0441\u0442' is word 'Test' in russian
761
# in cp866 encoding this is string '\x92\xa5\xe1\xe2'
762
# in cp1251 encoding this is string '\xd2\xe5\xf1\xf2'
763
# This test should check that output of log command
764
# encoded to sys.stdout.encoding
765
test_in_cp866 = '\x92\xa5\xe1\xe2'
766
test_in_cp1251 = '\xd2\xe5\xf1\xf2'
767
# Make sure the log string is encoded in cp866
768
self.assertEquals(test_in_cp866, message[2:])
769
# Make sure the cp1251 string is not found anywhere
770
self.assertEquals(-1, stdout.find(test_in_cp1251))
773
class TestLogFile(TestLogWithLogCatcher):
775
def test_log_local_branch_file(self):
776
"""We should be able to log files in local treeless branches"""
777
tree = self.make_branch_and_tree('tree')
778
self.build_tree(['tree/file'])
780
tree.commit('revision 1')
781
tree.bzrdir.destroy_workingtree()
782
self.run_bzr('log tree/file')
784
def prepare_tree(self, complex=False):
785
# The complex configuration includes deletes and renames
786
tree = self.make_branch_and_tree('parent')
787
self.build_tree(['parent/file1', 'parent/file2', 'parent/file3'])
789
tree.commit('add file1')
791
tree.commit('add file2')
793
tree.commit('add file3')
794
child_tree = tree.bzrdir.sprout('child').open_workingtree()
795
self.build_tree_contents([('child/file2', 'hello')])
796
child_tree.commit(message='branch 1')
797
tree.merge_from_branch(child_tree.branch)
798
tree.commit(message='merge child branch')
801
tree.commit('remove file2')
802
tree.rename_one('file3', 'file4')
803
tree.commit('file3 is now called file4')
805
tree.commit('remove file1')
808
# FIXME: It would be good to parametrize the following tests against all
809
# formatters. But the revisions selection is not *currently* part of the
810
# LogFormatter contract, so using LogCatcher is sufficient -- vila 100118
811
def test_log_file1(self):
813
self.assertLogRevnos(['-n0', 'file1'], ['1'])
815
def test_log_file2(self):
818
self.assertLogRevnos(['-n0', 'file2'], ['4', '3.1.1', '2'])
819
# file2 in a merge revision
820
self.assertLogRevnos(['-n0', '-r3.1.1', 'file2'], ['3.1.1'])
821
# file2 in a mainline revision
822
self.assertLogRevnos(['-n0', '-r4', 'file2'], ['4', '3.1.1'])
823
# file2 since a revision
824
self.assertLogRevnos(['-n0', '-r3..', 'file2'], ['4', '3.1.1'])
825
# file2 up to a revision
826
self.assertLogRevnos(['-n0', '-r..3', 'file2'], ['2'])
828
def test_log_file3(self):
830
self.assertLogRevnos(['-n0', 'file3'], ['3'])
832
def test_log_file_historical_missing(self):
833
# Check logging a deleted file gives an error if the
834
# file isn't found at the end or start of the revision range
835
self.prepare_tree(complex=True)
836
err_msg = "Path unknown at end or start of revision range: file2"
837
err = self.run_bzr('log file2', retcode=3)[1]
838
self.assertContainsRe(err, err_msg)
840
def test_log_file_historical_end(self):
841
# Check logging a deleted file is ok if the file existed
842
# at the end the revision range
843
self.prepare_tree(complex=True)
844
self.assertLogRevnos(['-n0', '-r..4', 'file2'], ['4', '3.1.1', '2'])
846
def test_log_file_historical_start(self):
847
# Check logging a deleted file is ok if the file existed
848
# at the start of the revision range
849
self.prepare_tree(complex=True)
850
self.assertLogRevnos(['file1'], ['1'])
852
def test_log_file_renamed(self):
853
"""File matched against revision range, not current tree."""
854
self.prepare_tree(complex=True)
856
# Check logging a renamed file gives an error by default
857
err_msg = "Path unknown at end or start of revision range: file3"
858
err = self.run_bzr('log file3', retcode=3)[1]
859
self.assertContainsRe(err, err_msg)
861
# Check we can see a renamed file if we give the right end revision
862
self.assertLogRevnos(['-r..4', 'file3'], ['3'])
865
class TestLogMultiple(TestLogWithLogCatcher):
867
def prepare_tree(self):
868
tree = self.make_branch_and_tree('parent')
875
'parent/dir1/dir2/file3',
878
tree.commit('add file1')
880
tree.commit('add file2')
881
tree.add(['dir1', 'dir1/dir2', 'dir1/dir2/file3'])
882
tree.commit('add file3')
884
tree.commit('add file4')
885
tree.add('dir1/file5')
886
tree.commit('add file5')
887
child_tree = tree.bzrdir.sprout('child').open_workingtree()
888
self.build_tree_contents([('child/file2', 'hello')])
889
child_tree.commit(message='branch 1')
890
tree.merge_from_branch(child_tree.branch)
891
tree.commit(message='merge child branch')
894
def test_log_files(self):
895
"""The log for multiple file should only list revs for those files"""
897
self.assertLogRevnos(['file1', 'file2', 'dir1/dir2/file3'],
898
['6', '5.1.1', '3', '2', '1'])
900
def test_log_directory(self):
901
"""The log for a directory should show all nested files."""
903
self.assertLogRevnos(['dir1'], ['5', '3'])
905
def test_log_nested_directory(self):
906
"""The log for a directory should show all nested files."""
908
self.assertLogRevnos(['dir1/dir2'], ['3'])
910
def test_log_in_nested_directory(self):
911
"""The log for a directory should show all nested files."""
914
self.assertLogRevnos(['.'], ['5', '3'])
916
def test_log_files_and_directories(self):
917
"""Logging files and directories together should be fine."""
919
self.assertLogRevnos(['file4', 'dir1/dir2'], ['4', '3'])
921
def test_log_files_and_dirs_in_nested_directory(self):
922
"""The log for a directory should show all nested files."""
925
self.assertLogRevnos(['dir2', 'file5'], ['5', '3'])
added
removed
bzrlib/tests/blackbox/test_log.py
