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'])
162
class TestLogExcludeCommonAncestry(TestLogWithLogCatcher):
164
def test_exclude_common_ancestry_simple_revnos(self):
165
self.make_linear_branch()
166
self.assertLogRevnos(['-r1..3', '--exclude-common-ancestry'],
170
class TestLogMergedLinearAncestry(TestLogWithLogCatcher):
173
super(TestLogMergedLinearAncestry, self).setUp()
174
# FIXME: Using a MemoryTree would be even better here (but until we
175
# stop calling run_bzr, there is no point) --vila 100118.
176
builder = branchbuilder.BranchBuilder(self.get_transport())
177
builder.start_series()
191
builder.build_snapshot('1', None, [
192
('add', ('', 'root-id', 'directory', ''))])
193
builder.build_snapshot('2', ['1'], [])
195
builder.build_snapshot('1.1.1', ['1'], [])
196
# merge branch into mainline
197
builder.build_snapshot('3', ['2', '1.1.1'], [])
198
# new commits in branch
199
builder.build_snapshot('1.1.2', ['1.1.1'], [])
200
builder.build_snapshot('1.1.3', ['1.1.2'], [])
201
# merge branch into mainline
202
builder.build_snapshot('4', ['3', '1.1.3'], [])
203
# merge mainline into branch
204
builder.build_snapshot('1.1.4', ['1.1.3', '4'], [])
205
# merge branch into mainline
206
builder.build_snapshot('5', ['4', '1.1.4'], [])
207
builder.finish_series()
210
self.assertLogRevnos(['-n0', '-r1.1.1..1.1.4'],
211
['1.1.4', '4', '1.1.3', '1.1.2', '3', '1.1.1'])
212
def test_n0_forward(self):
213
self.assertLogRevnos(['-n0', '-r1.1.1..1.1.4', '--forward'],
214
['3', '1.1.1', '4', '1.1.2', '1.1.3', '1.1.4'])
217
# starting from 1.1.4 we follow the left-hand ancestry
218
self.assertLogRevnos(['-n1', '-r1.1.1..1.1.4'],
219
['1.1.4', '1.1.3', '1.1.2', '1.1.1'])
221
def test_n1_forward(self):
222
self.assertLogRevnos(['-n1', '-r1.1.1..1.1.4', '--forward'],
223
['1.1.1', '1.1.2', '1.1.3', '1.1.4'])
226
class Test_GenerateAllRevisions(TestLogWithLogCatcher):
229
super(Test_GenerateAllRevisions, self).setUp()
230
builder = self.make_branch_with_many_merges()
231
b = builder.get_branch()
233
self.addCleanup(b.unlock)
236
def make_branch_with_many_merges(self, path='.', format=None):
237
builder = branchbuilder.BranchBuilder(self.get_transport())
238
builder.start_series()
239
# The graph below may look a bit complicated (and it may be but I've
240
# banged my head enough on it) but the bug requires at least dotted
241
# revnos *and* merged revisions below that.
242
builder.build_snapshot('1', None, [
243
('add', ('', 'root-id', 'directory', ''))])
244
builder.build_snapshot('2', ['1'], [])
245
builder.build_snapshot('1.1.1', ['1'], [])
246
builder.build_snapshot('2.1.1', ['2'], [])
247
builder.build_snapshot('3', ['2', '1.1.1'], [])
248
builder.build_snapshot('2.1.2', ['2.1.1'], [])
249
builder.build_snapshot('2.2.1', ['2.1.1'], [])
250
builder.build_snapshot('2.1.3', ['2.1.2', '2.2.1'], [])
251
builder.build_snapshot('4', ['3', '2.1.3'], [])
252
builder.build_snapshot('5', ['4', '2.1.2'], [])
253
builder.finish_series()
256
def test_not_an_ancestor(self):
257
self.assertRaises(errors.BzrCommandError,
258
log._generate_all_revisions,
259
self.branch, '1.1.1', '2.1.3', 'reverse',
260
delayed_graph_generation=True)
262
def test_wrong_order(self):
263
self.assertRaises(errors.BzrCommandError,
264
log._generate_all_revisions,
265
self.branch, '5', '2.1.3', 'reverse',
266
delayed_graph_generation=True)
268
def test_no_start_rev_id_with_end_rev_id_being_a_merge(self):
269
revs = log._generate_all_revisions(
270
self.branch, None, '2.1.3',
271
'reverse', delayed_graph_generation=True)
274
class TestLogRevSpecsWithPaths(TestLogWithLogCatcher):
276
def test_log_revno_n_path_wrong_namespace(self):
277
self.make_linear_branch('branch1')
278
self.make_linear_branch('branch2')
279
# There is no guarantee that a path exist between two arbitrary
281
self.run_bzr("log -r revno:2:branch1..revno:3:branch2", retcode=3)
283
def test_log_revno_n_path_correct_order(self):
284
self.make_linear_branch('branch2')
285
self.assertLogRevnos(['-rrevno:1:branch2..revno:3:branch2'],
288
def test_log_revno_n_path(self):
289
self.make_linear_branch('branch2')
290
self.assertLogRevnos(['-rrevno:1:branch2'],
292
rev_props = self.log_catcher.revisions[0].rev.properties
293
self.assertEqual('branch2', rev_props['branch-nick'])
296
class TestLogErrors(TestLog):
298
def test_log_zero_revspec(self):
299
self.make_minimal_branch()
300
self.run_bzr_error(['bzr: ERROR: Logging revision 0 is invalid.'],
303
def test_log_zero_begin_revspec(self):
304
self.make_linear_branch()
305
self.run_bzr_error(['bzr: ERROR: Logging revision 0 is invalid.'],
308
def test_log_zero_end_revspec(self):
309
self.make_linear_branch()
310
self.run_bzr_error(['bzr: ERROR: Logging revision 0 is invalid.'],
313
def test_log_nonexistent_revno(self):
314
self.make_minimal_branch()
315
self.run_bzr_error(["bzr: ERROR: Requested revision: '1234' "
316
"does not exist in branch:"],
319
def test_log_nonexistent_dotted_revno(self):
320
self.make_minimal_branch()
321
self.run_bzr_error(["bzr: ERROR: Requested revision: '123.123' "
322
"does not exist in branch:"],
323
['log', '-r123.123'])
325
def test_log_change_nonexistent_revno(self):
326
self.make_minimal_branch()
327
self.run_bzr_error(["bzr: ERROR: Requested revision: '1234' "
328
"does not exist in branch:"],
331
def test_log_change_nonexistent_dotted_revno(self):
332
self.make_minimal_branch()
333
self.run_bzr_error(["bzr: ERROR: Requested revision: '123.123' "
334
"does not exist in branch:"],
335
['log', '-c123.123'])
337
def test_log_change_single_revno_only(self):
338
self.make_minimal_branch()
339
self.run_bzr_error(['bzr: ERROR: Option --change does not'
340
' accept revision ranges'],
341
['log', '--change', '2..3'])
343
def test_log_change_incompatible_with_revision(self):
344
self.run_bzr_error(['bzr: ERROR: --revision and --change'
345
' are mutually exclusive'],
346
['log', '--change', '2', '--revision', '3'])
348
def test_log_nonexistent_file(self):
349
self.make_minimal_branch()
350
# files that don't exist in either the basis tree or working tree
351
# should give an error
352
out, err = self.run_bzr('log does-not-exist', retcode=3)
353
self.assertContainsRe(err,
354
'Path unknown at end or start of revision range: '
357
def test_log_reversed_revspecs(self):
358
self.make_linear_branch()
359
self.run_bzr_error(('bzr: ERROR: Start revision must be older than '
360
'the end revision.\n',),
363
def test_log_reversed_dotted_revspecs(self):
364
self.make_merged_branch()
365
self.run_bzr_error(('bzr: ERROR: Start revision not found in '
366
'left-hand history of end revision.\n',),
369
def test_log_bad_message_re(self):
370
"""Bad --message argument gives a sensible message
372
See https://bugs.launchpad.net/bzr/+bug/251352
374
self.make_minimal_branch()
375
out, err = self.run_bzr(['log', '-m', '*'], retcode=3)
376
self.assertEqual("bzr: ERROR: Invalid regular expression"
377
" in log message filter"
379
": nothing to repeat\n", err)
380
self.assertEqual('', out)
382
def test_log_unsupported_timezone(self):
383
self.make_linear_branch()
384
self.run_bzr_error(['bzr: ERROR: Unsupported timezone format "foo", '
385
'options are "utc", "original", "local".'],
386
['log', '--timezone', 'foo'])
388
def test_log_exclude_ancestry_no_range(self):
389
self.make_linear_branch()
390
self.run_bzr_error(['bzr: ERROR: --exclude-common-ancestry'
391
' requires -r with two revisions'],
392
['log', '--exclude-common-ancestry'])
394
def test_log_exclude_ancestry_single_revision(self):
395
self.make_merged_branch()
396
self.run_bzr_error(['bzr: ERROR: --exclude-common-ancestry'
397
' requires two different revisions'],
398
['log', '--exclude-common-ancestry',
401
class TestLogTags(TestLog):
403
def test_log_with_tags(self):
404
tree = self.make_linear_branch(format='dirstate-tags')
406
branch.tags.set_tag('tag1', branch.get_rev_id(1))
407
branch.tags.set_tag('tag1.1', branch.get_rev_id(1))
408
branch.tags.set_tag('tag3', branch.last_revision())
410
log = self.run_bzr("log -r-1")[0]
411
self.assertTrue('tags: tag3' in log)
413
log = self.run_bzr("log -r1")[0]
414
# I guess that we can't know the order of tags in the output
415
# since dicts are unordered, need to check both possibilities
416
self.assertContainsRe(log, r'tags: (tag1, tag1\.1|tag1\.1, tag1)')
418
def test_merged_log_with_tags(self):
419
branch1_tree = self.make_linear_branch('branch1',
420
format='dirstate-tags')
421
branch1 = branch1_tree.branch
422
branch2_tree = branch1_tree.bzrdir.sprout('branch2').open_workingtree()
423
branch1_tree.commit(message='foobar', allow_pointless=True)
424
branch1.tags.set_tag('tag1', branch1.last_revision())
425
# tags don't propagate if we don't merge
426
self.run_bzr('merge ../branch1', working_dir='branch2')
427
branch2_tree.commit(message='merge branch 1')
428
log = self.run_bzr("log -n0 -r-1", working_dir='branch2')[0]
429
self.assertContainsRe(log, r' tags: tag1')
430
log = self.run_bzr("log -n0 -r3.1.1", working_dir='branch2')[0]
431
self.assertContainsRe(log, r'tags: tag1')
434
class TestLogVerbose(TestLog):
437
super(TestLogVerbose, self).setUp()
438
self.make_minimal_branch()
440
def assertUseShortDeltaFormat(self, cmd):
441
log = self.run_bzr(cmd)[0]
442
# Check that we use the short status format
443
self.assertContainsRe(log, '(?m)^\s*A hello.txt$')
444
self.assertNotContainsRe(log, '(?m)^\s*added:$')
446
def assertUseLongDeltaFormat(self, cmd):
447
log = self.run_bzr(cmd)[0]
448
# Check that we use the long status format
449
self.assertNotContainsRe(log, '(?m)^\s*A hello.txt$')
450
self.assertContainsRe(log, '(?m)^\s*added:$')
452
def test_log_short_verbose(self):
453
self.assertUseShortDeltaFormat(['log', '--short', '-v'])
455
def test_log_short_verbose_verbose(self):
456
self.assertUseLongDeltaFormat(['log', '--short', '-vv'])
458
def test_log_long_verbose(self):
459
# Check that we use the long status format, ignoring the verbosity
461
self.assertUseLongDeltaFormat(['log', '--long', '-v'])
463
def test_log_long_verbose_verbose(self):
464
# Check that we use the long status format, ignoring the verbosity
466
self.assertUseLongDeltaFormat(['log', '--long', '-vv'])
469
class TestLogMerges(TestLogWithLogCatcher):
472
super(TestLogMerges, self).setUp()
473
self.make_branches_with_merges()
475
def make_branches_with_merges(self):
476
level0 = self.make_branch_and_tree('level0')
477
self.wt_commit(level0, 'in branch level0')
478
level1 = level0.bzrdir.sprout('level1').open_workingtree()
479
self.wt_commit(level1, 'in branch level1')
480
level2 = level1.bzrdir.sprout('level2').open_workingtree()
481
self.wt_commit(level2, 'in branch level2')
482
level1.merge_from_branch(level2.branch)
483
self.wt_commit(level1, 'merge branch level2')
484
level0.merge_from_branch(level1.branch)
485
self.wt_commit(level0, 'merge branch level1')
487
def test_merges_are_indented_by_level(self):
488
self.run_bzr(['log', '-n0'], working_dir='level0')
489
revnos_and_depth = [(r.revno, r.merge_depth)
490
for r in self.get_captured_revisions()]
491
self.assertEqual([('2', 0), ('1.1.2', 1), ('1.2.1', 2), ('1.1.1', 1),
493
[(r.revno, r.merge_depth)
494
for r in self.get_captured_revisions()])
496
def test_force_merge_revisions_off(self):
497
self.assertLogRevnos(['-n1'], ['2', '1'], working_dir='level0')
499
def test_force_merge_revisions_on(self):
500
self.assertLogRevnos(['-n0'], ['2', '1.1.2', '1.2.1', '1.1.1', '1'],
501
working_dir='level0')
503
def test_include_merges(self):
504
# Confirm --include-merges gives the same output as -n0
505
self.assertLogRevnos(['--include-merges'],
506
['2', '1.1.2', '1.2.1', '1.1.1', '1'],
507
working_dir='level0')
508
self.assertLogRevnos(['--include-merges'],
509
['2', '1.1.2', '1.2.1', '1.1.1', '1'],
510
working_dir='level0')
511
out_im, err_im = self.run_bzr('log --include-merges',
512
working_dir='level0')
513
out_n0, err_n0 = self.run_bzr('log -n0', working_dir='level0')
514
self.assertEqual('', err_im)
515
self.assertEqual('', err_n0)
516
self.assertEqual(out_im, out_n0)
518
def test_force_merge_revisions_N(self):
519
self.assertLogRevnos(['-n2'],
520
['2', '1.1.2', '1.1.1', '1'],
521
working_dir='level0')
523
def test_merges_single_merge_rev(self):
524
self.assertLogRevnosAndDepths(['-n0', '-r1.1.2'],
525
[('1.1.2', 0), ('1.2.1', 1)],
526
working_dir='level0')
528
def test_merges_partial_range(self):
529
self.assertLogRevnosAndDepths(
530
['-n0', '-r1.1.1..1.1.2'],
531
[('1.1.2', 0), ('1.2.1', 1), ('1.1.1', 0)],
532
working_dir='level0')
534
def test_merges_partial_range_ignore_before_lower_bound(self):
535
"""Dont show revisions before the lower bound's merged revs"""
536
self.assertLogRevnosAndDepths(
537
['-n0', '-r1.1.2..2'],
538
[('2', 0), ('1.1.2', 1), ('1.2.1', 2)],
539
working_dir='level0')
542
class TestLogDiff(TestLogWithLogCatcher):
544
# FIXME: We need specific tests for each LogFormatter about how the diffs
545
# are displayed: --long indent them by depth, --short use a fixed
546
# indent and --line does't display them. -- vila 10019
549
super(TestLogDiff, self).setUp()
550
self.make_branch_with_diffs()
552
def make_branch_with_diffs(self):
553
level0 = self.make_branch_and_tree('level0')
554
self.build_tree(['level0/file1', 'level0/file2'])
557
self.wt_commit(level0, 'in branch level0')
559
level1 = level0.bzrdir.sprout('level1').open_workingtree()
560
self.build_tree_contents([('level1/file2', 'hello\n')])
561
self.wt_commit(level1, 'in branch level1')
562
level0.merge_from_branch(level1.branch)
563
self.wt_commit(level0, 'merge branch level1')
565
def _diff_file1_revno1(self):
566
return """=== added file 'file1'
567
--- file1\t1970-01-01 00:00:00 +0000
568
+++ file1\t2005-11-22 00:00:00 +0000
570
+contents of level0/file1
574
def _diff_file2_revno2(self):
575
return """=== modified file 'file2'
576
--- file2\t2005-11-22 00:00:00 +0000
577
+++ file2\t2005-11-22 00:00:01 +0000
579
-contents of level0/file2
584
def _diff_file2_revno1_1_1(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(self):
595
return """=== added file 'file2'
596
--- file2\t1970-01-01 00:00:00 +0000
597
+++ file2\t2005-11-22 00:00:00 +0000
599
+contents of level0/file2
603
def assertLogRevnosAndDiff(self, args, expected,
605
self.run_bzr(['log', '-p'] + args, working_dir=working_dir)
606
expected_revnos_and_depths = [
607
(revno, depth) for revno, depth, diff in expected]
608
# Check the revnos and depths first to make debugging easier
609
self.assertEqual(expected_revnos_and_depths,
610
[(r.revno, r.merge_depth)
611
for r in self.get_captured_revisions()])
612
# Now check the diffs, adding the revno in case of failure
613
fmt = 'In revno %s\n%s'
614
for expected_rev, actual_rev in izip(expected,
615
self.get_captured_revisions()):
616
revno, depth, expected_diff = expected_rev
617
actual_diff = actual_rev.diff
618
self.assertEqualDiff(fmt % (revno, expected_diff),
619
fmt % (revno, actual_diff))
621
def test_log_diff_with_merges(self):
622
self.assertLogRevnosAndDiff(
624
[('2', 0, self._diff_file2_revno2()),
625
('1.1.1', 1, self._diff_file2_revno1_1_1()),
626
('1', 0, self._diff_file1_revno1()
627
+ self._diff_file2_revno1())],
628
working_dir='level0')
631
def test_log_diff_file1(self):
632
self.assertLogRevnosAndDiff(['-n0', 'file1'],
633
[('1', 0, self._diff_file1_revno1())],
634
working_dir='level0')
636
def test_log_diff_file2(self):
637
self.assertLogRevnosAndDiff(['-n1', 'file2'],
638
[('2', 0, self._diff_file2_revno2()),
639
('1', 0, self._diff_file2_revno1())],
640
working_dir='level0')
643
class TestLogUnicodeDiff(TestLog):
645
def test_log_show_diff_non_ascii(self):
646
# Smoke test for bug #328007 UnicodeDecodeError on 'log -p'
647
message = u'Message with \xb5'
648
body = 'Body with \xb5\n'
649
wt = self.make_branch_and_tree('.')
650
self.build_tree_contents([('foo', body)])
652
wt.commit(message=message)
653
# check that command won't fail with unicode error
654
# don't care about exact output because we have other tests for this
655
out,err = self.run_bzr('log -p --long')
656
self.assertNotEqual('', out)
657
self.assertEqual('', err)
658
out,err = self.run_bzr('log -p --short')
659
self.assertNotEqual('', out)
660
self.assertEqual('', err)
661
out,err = self.run_bzr('log -p --line')
662
self.assertNotEqual('', out)
663
self.assertEqual('', err)
666
class TestLogEncodings(tests.TestCaseInTempDir):
669
_message = u'Message with \xb5'
671
# Encodings which can encode mu
676
'cp437', # Common windows encoding
677
'cp1251', # Russian windows encoding
678
'cp1258', # Common windows encoding
680
# Encodings which cannot encode mu
688
super(TestLogEncodings, self).setUp()
689
self.overrideAttr(osutils, '_cached_user_encoding')
691
def create_branch(self):
694
self.build_tree_contents([('a', 'some stuff\n')])
696
bzr(['commit', '-m', self._message])
698
def try_encoding(self, encoding, fail=False):
701
self.assertRaises(UnicodeEncodeError,
702
self._mu.encode, encoding)
703
encoded_msg = self._message.encode(encoding, 'replace')
705
encoded_msg = self._message.encode(encoding)
707
old_encoding = osutils._cached_user_encoding
708
# This test requires that 'run_bzr' uses the current
709
# bzrlib, because we override user_encoding, and expect
712
osutils._cached_user_encoding = 'ascii'
713
# We should be able to handle any encoding
714
out, err = bzr('log', encoding=encoding)
716
# Make sure we wrote mu as we expected it to exist
717
self.assertNotEqual(-1, out.find(encoded_msg))
718
out_unicode = out.decode(encoding)
719
self.assertNotEqual(-1, out_unicode.find(self._message))
721
self.assertNotEqual(-1, out.find('Message with ?'))
723
osutils._cached_user_encoding = old_encoding
725
def test_log_handles_encoding(self):
728
for encoding in self.good_encodings:
729
self.try_encoding(encoding)
731
def test_log_handles_bad_encoding(self):
734
for encoding in self.bad_encodings:
735
self.try_encoding(encoding, fail=True)
737
def test_stdout_encoding(self):
739
osutils._cached_user_encoding = "cp1251"
742
self.build_tree(['a'])
744
bzr(['commit', '-m', u'\u0422\u0435\u0441\u0442'])
745
stdout, stderr = self.run_bzr('log', encoding='cp866')
747
message = stdout.splitlines()[-1]
749
# explanation of the check:
750
# u'\u0422\u0435\u0441\u0442' is word 'Test' in russian
751
# in cp866 encoding this is string '\x92\xa5\xe1\xe2'
752
# in cp1251 encoding this is string '\xd2\xe5\xf1\xf2'
753
# This test should check that output of log command
754
# encoded to sys.stdout.encoding
755
test_in_cp866 = '\x92\xa5\xe1\xe2'
756
test_in_cp1251 = '\xd2\xe5\xf1\xf2'
757
# Make sure the log string is encoded in cp866
758
self.assertEquals(test_in_cp866, message[2:])
759
# Make sure the cp1251 string is not found anywhere
760
self.assertEquals(-1, stdout.find(test_in_cp1251))
763
class TestLogFile(TestLogWithLogCatcher):
765
def test_log_local_branch_file(self):
766
"""We should be able to log files in local treeless branches"""
767
tree = self.make_branch_and_tree('tree')
768
self.build_tree(['tree/file'])
770
tree.commit('revision 1')
771
tree.bzrdir.destroy_workingtree()
772
self.run_bzr('log tree/file')
774
def prepare_tree(self, complex=False):
775
# The complex configuration includes deletes and renames
776
tree = self.make_branch_and_tree('parent')
777
self.build_tree(['parent/file1', 'parent/file2', 'parent/file3'])
779
tree.commit('add file1')
781
tree.commit('add file2')
783
tree.commit('add file3')
784
child_tree = tree.bzrdir.sprout('child').open_workingtree()
785
self.build_tree_contents([('child/file2', 'hello')])
786
child_tree.commit(message='branch 1')
787
tree.merge_from_branch(child_tree.branch)
788
tree.commit(message='merge child branch')
791
tree.commit('remove file2')
792
tree.rename_one('file3', 'file4')
793
tree.commit('file3 is now called file4')
795
tree.commit('remove file1')
798
# FIXME: It would be good to parametrize the following tests against all
799
# formatters. But the revisions selection is not *currently* part of the
800
# LogFormatter contract, so using LogCatcher is sufficient -- vila 100118
801
def test_log_file1(self):
803
self.assertLogRevnos(['-n0', 'file1'], ['1'])
805
def test_log_file2(self):
808
self.assertLogRevnos(['-n0', 'file2'], ['4', '3.1.1', '2'])
809
# file2 in a merge revision
810
self.assertLogRevnos(['-n0', '-r3.1.1', 'file2'], ['3.1.1'])
811
# file2 in a mainline revision
812
self.assertLogRevnos(['-n0', '-r4', 'file2'], ['4', '3.1.1'])
813
# file2 since a revision
814
self.assertLogRevnos(['-n0', '-r3..', 'file2'], ['4', '3.1.1'])
815
# file2 up to a revision
816
self.assertLogRevnos(['-n0', '-r..3', 'file2'], ['2'])
818
def test_log_file3(self):
820
self.assertLogRevnos(['-n0', 'file3'], ['3'])
822
def test_log_file_historical_missing(self):
823
# Check logging a deleted file gives an error if the
824
# file isn't found at the end or start of the revision range
825
self.prepare_tree(complex=True)
826
err_msg = "Path unknown at end or start of revision range: file2"
827
err = self.run_bzr('log file2', retcode=3)[1]
828
self.assertContainsRe(err, err_msg)
830
def test_log_file_historical_end(self):
831
# Check logging a deleted file is ok if the file existed
832
# at the end the revision range
833
self.prepare_tree(complex=True)
834
self.assertLogRevnos(['-n0', '-r..4', 'file2'], ['4', '3.1.1', '2'])
836
def test_log_file_historical_start(self):
837
# Check logging a deleted file is ok if the file existed
838
# at the start of the revision range
839
self.prepare_tree(complex=True)
840
self.assertLogRevnos(['file1'], ['1'])
842
def test_log_file_renamed(self):
843
"""File matched against revision range, not current tree."""
844
self.prepare_tree(complex=True)
846
# Check logging a renamed file gives an error by default
847
err_msg = "Path unknown at end or start of revision range: file3"
848
err = self.run_bzr('log file3', retcode=3)[1]
849
self.assertContainsRe(err, err_msg)
851
# Check we can see a renamed file if we give the right end revision
852
self.assertLogRevnos(['-r..4', 'file3'], ['3'])
855
class TestLogMultiple(TestLogWithLogCatcher):
857
def prepare_tree(self):
858
tree = self.make_branch_and_tree('parent')
865
'parent/dir1/dir2/file3',
868
tree.commit('add file1')
870
tree.commit('add file2')
871
tree.add(['dir1', 'dir1/dir2', 'dir1/dir2/file3'])
872
tree.commit('add file3')
874
tree.commit('add file4')
875
tree.add('dir1/file5')
876
tree.commit('add file5')
877
child_tree = tree.bzrdir.sprout('child').open_workingtree()
878
self.build_tree_contents([('child/file2', 'hello')])
879
child_tree.commit(message='branch 1')
880
tree.merge_from_branch(child_tree.branch)
881
tree.commit(message='merge child branch')
884
def test_log_files(self):
885
"""The log for multiple file should only list revs for those files"""
887
self.assertLogRevnos(['file1', 'file2', 'dir1/dir2/file3'],
888
['6', '5.1.1', '3', '2', '1'])
890
def test_log_directory(self):
891
"""The log for a directory should show all nested files."""
893
self.assertLogRevnos(['dir1'], ['5', '3'])
895
def test_log_nested_directory(self):
896
"""The log for a directory should show all nested files."""
898
self.assertLogRevnos(['dir1/dir2'], ['3'])
900
def test_log_in_nested_directory(self):
901
"""The log for a directory should show all nested files."""
904
self.assertLogRevnos(['.'], ['5', '3'])
906
def test_log_files_and_directories(self):
907
"""Logging files and directories together should be fine."""
909
self.assertLogRevnos(['file4', 'dir1/dir2'], ['4', '3'])
911
def test_log_files_and_dirs_in_nested_directory(self):
912
"""The log for a directory should show all nested files."""
915
self.assertLogRevnos(['dir2', 'file5'], ['5', '3'])
added
removed
bzrlib/tests/blackbox/test_log.py
