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
30
from bzrlib.tests import (
36
class TestLog(tests.TestCaseWithTransport, test_log.TestLogMixin):
38
def make_minimal_branch(self, path='.', format=None):
39
tree = self.make_branch_and_tree(path, format=format)
40
self.build_tree([path + '/hello.txt'])
42
tree.commit(message='message1')
45
def make_linear_branch(self, path='.', format=None):
46
tree = self.make_branch_and_tree(path, format=format)
48
[path + '/hello.txt', path + '/goodbye.txt', path + '/meep.txt'])
50
tree.commit(message='message1')
51
tree.add('goodbye.txt')
52
tree.commit(message='message2')
54
tree.commit(message='message3')
57
def make_merged_branch(self, path='.', format=None):
58
tree = self.make_linear_branch(path, format)
59
tree2 = tree.bzrdir.sprout('tree2',
60
revision_id=tree.branch.get_rev_id(1)).open_workingtree()
61
tree2.commit(message='tree2 message2')
62
tree2.commit(message='tree2 message3')
63
tree.merge_from_branch(tree2.branch)
64
tree.commit(message='merge')
68
class TestLogWithLogCatcher(TestLog):
71
super(TestLogWithLogCatcher, self).setUp()
72
# Capture log formatter creations
73
class MyLogFormatter(test_log.LogCatcher):
75
def __new__(klass, *args, **kwargs):
76
self.log_catcher = test_log.LogCatcher(*args, **kwargs)
77
# Always return our own log formatter
78
return self.log_catcher
79
# Break cycle with closure over self on cleanup by removing method
80
self.addCleanup(setattr, MyLogFormatter, "__new__", None)
83
# Always return our own log formatter class hijacking the
84
# default behavior (which requires setting up a config
87
self.overrideAttr(log.log_formatter_registry, 'get_default', getme)
89
def get_captured_revisions(self):
90
return self.log_catcher.revisions
92
def assertLogRevnos(self, args, expected_revnos, working_dir='.'):
93
self.run_bzr(['log'] + args, working_dir=working_dir)
94
self.assertEqual(expected_revnos,
95
[r.revno for r in self.get_captured_revisions()])
97
def assertLogRevnosAndDepths(self, args, expected_revnos_and_depths,
99
self.run_bzr(['log'] + args, working_dir=working_dir)
100
self.assertEqual(expected_revnos_and_depths,
101
[(r.revno, r.merge_depth)
102
for r in self.get_captured_revisions()])
105
class TestLogRevSpecs(TestLogWithLogCatcher):
107
def test_log_no_revspec(self):
108
self.make_linear_branch()
109
self.assertLogRevnos([], ['3', '2', '1'])
111
def test_log_null_end_revspec(self):
112
self.make_linear_branch()
113
self.assertLogRevnos(['-r1..'], ['3', '2', '1'])
115
def test_log_null_begin_revspec(self):
116
self.make_linear_branch()
117
self.assertLogRevnos(['-r..3'], ['3', '2', '1'])
119
def test_log_null_both_revspecs(self):
120
self.make_linear_branch()
121
self.assertLogRevnos(['-r..'], ['3', '2', '1'])
123
def test_log_negative_begin_revspec_full_log(self):
124
self.make_linear_branch()
125
self.assertLogRevnos(['-r-3..'], ['3', '2', '1'])
127
def test_log_negative_both_revspec_full_log(self):
128
self.make_linear_branch()
129
self.assertLogRevnos(['-r-3..-1'], ['3', '2', '1'])
131
def test_log_negative_both_revspec_partial(self):
132
self.make_linear_branch()
133
self.assertLogRevnos(['-r-3..-2'], ['2', '1'])
135
def test_log_negative_begin_revspec(self):
136
self.make_linear_branch()
137
self.assertLogRevnos(['-r-2..'], ['3', '2'])
139
def test_log_positive_revspecs(self):
140
self.make_linear_branch()
141
self.assertLogRevnos(['-r1..3'], ['3', '2', '1'])
143
def test_log_dotted_revspecs(self):
144
self.make_merged_branch()
145
self.assertLogRevnos(['-n0', '-r1..1.1.1'], ['1.1.1', '1'])
147
def test_log_limit(self):
148
tree = self.make_branch_and_tree('.')
149
# We want more commits than our batch size starts at
150
for pos in range(10):
151
tree.commit("%s" % pos)
152
self.assertLogRevnos(['--limit', '2'], ['10', '9'])
154
def test_log_limit_short(self):
155
self.make_linear_branch()
156
self.assertLogRevnos(['-l', '2'], ['3', '2'])
158
def test_log_change_revno(self):
159
self.make_linear_branch()
160
self.assertLogRevnos(['-c1'], ['1'])
162
def test_branch_revspec(self):
163
foo = self.make_branch_and_tree('foo')
164
bar = self.make_branch_and_tree('bar')
165
self.build_tree(['foo/foo.txt', 'bar/bar.txt'])
168
foo.commit(message='foo')
169
bar.commit(message='bar')
170
self.run_bzr('log -r branch:../bar', working_dir='foo')
171
self.assertEqual([bar.branch.get_rev_id(1)],
173
for r in self.get_captured_revisions()])
176
class TestLogExcludeCommonAncestry(TestLogWithLogCatcher):
178
def test_exclude_common_ancestry_simple_revnos(self):
179
self.make_linear_branch()
180
self.assertLogRevnos(['-r1..3', '--exclude-common-ancestry'],
184
class TestLogMergedLinearAncestry(TestLogWithLogCatcher):
187
super(TestLogMergedLinearAncestry, self).setUp()
188
# FIXME: Using a MemoryTree would be even better here (but until we
189
# stop calling run_bzr, there is no point) --vila 100118.
190
builder = branchbuilder.BranchBuilder(self.get_transport())
191
builder.start_series()
205
builder.build_snapshot('1', None, [
206
('add', ('', 'root-id', 'directory', ''))])
207
builder.build_snapshot('2', ['1'], [])
209
builder.build_snapshot('1.1.1', ['1'], [])
210
# merge branch into mainline
211
builder.build_snapshot('3', ['2', '1.1.1'], [])
212
# new commits in branch
213
builder.build_snapshot('1.1.2', ['1.1.1'], [])
214
builder.build_snapshot('1.1.3', ['1.1.2'], [])
215
# merge branch into mainline
216
builder.build_snapshot('4', ['3', '1.1.3'], [])
217
# merge mainline into branch
218
builder.build_snapshot('1.1.4', ['1.1.3', '4'], [])
219
# merge branch into mainline
220
builder.build_snapshot('5', ['4', '1.1.4'], [])
221
builder.finish_series()
224
self.assertLogRevnos(['-n0', '-r1.1.1..1.1.4'],
225
['1.1.4', '4', '1.1.3', '1.1.2', '3', '1.1.1'])
226
def test_n0_forward(self):
227
self.assertLogRevnos(['-n0', '-r1.1.1..1.1.4', '--forward'],
228
['3', '1.1.1', '4', '1.1.2', '1.1.3', '1.1.4'])
231
# starting from 1.1.4 we follow the left-hand ancestry
232
self.assertLogRevnos(['-n1', '-r1.1.1..1.1.4'],
233
['1.1.4', '1.1.3', '1.1.2', '1.1.1'])
235
def test_n1_forward(self):
236
self.assertLogRevnos(['-n1', '-r1.1.1..1.1.4', '--forward'],
237
['1.1.1', '1.1.2', '1.1.3', '1.1.4'])
240
class Test_GenerateAllRevisions(TestLogWithLogCatcher):
243
super(Test_GenerateAllRevisions, self).setUp()
244
builder = self.make_branch_with_many_merges()
245
b = builder.get_branch()
247
self.addCleanup(b.unlock)
250
def make_branch_with_many_merges(self, path='.', format=None):
251
builder = branchbuilder.BranchBuilder(self.get_transport())
252
builder.start_series()
253
# The graph below may look a bit complicated (and it may be but I've
254
# banged my head enough on it) but the bug requires at least dotted
255
# revnos *and* merged revisions below that.
256
builder.build_snapshot('1', None, [
257
('add', ('', 'root-id', 'directory', ''))])
258
builder.build_snapshot('2', ['1'], [])
259
builder.build_snapshot('1.1.1', ['1'], [])
260
builder.build_snapshot('2.1.1', ['2'], [])
261
builder.build_snapshot('3', ['2', '1.1.1'], [])
262
builder.build_snapshot('2.1.2', ['2.1.1'], [])
263
builder.build_snapshot('2.2.1', ['2.1.1'], [])
264
builder.build_snapshot('2.1.3', ['2.1.2', '2.2.1'], [])
265
builder.build_snapshot('4', ['3', '2.1.3'], [])
266
builder.build_snapshot('5', ['4', '2.1.2'], [])
267
builder.finish_series()
270
def test_not_an_ancestor(self):
271
self.assertRaises(errors.BzrCommandError,
272
log._generate_all_revisions,
273
self.branch, '1.1.1', '2.1.3', 'reverse',
274
delayed_graph_generation=True)
276
def test_wrong_order(self):
277
self.assertRaises(errors.BzrCommandError,
278
log._generate_all_revisions,
279
self.branch, '5', '2.1.3', 'reverse',
280
delayed_graph_generation=True)
282
def test_no_start_rev_id_with_end_rev_id_being_a_merge(self):
283
revs = log._generate_all_revisions(
284
self.branch, None, '2.1.3',
285
'reverse', delayed_graph_generation=True)
288
class TestLogRevSpecsWithPaths(TestLogWithLogCatcher):
290
def test_log_revno_n_path_wrong_namespace(self):
291
self.make_linear_branch('branch1')
292
self.make_linear_branch('branch2')
293
# There is no guarantee that a path exist between two arbitrary
295
self.run_bzr("log -r revno:2:branch1..revno:3:branch2", retcode=3)
297
def test_log_revno_n_path_correct_order(self):
298
self.make_linear_branch('branch2')
299
self.assertLogRevnos(['-rrevno:1:branch2..revno:3:branch2'],
302
def test_log_revno_n_path(self):
303
self.make_linear_branch('branch2')
304
self.assertLogRevnos(['-rrevno:1:branch2'],
306
rev_props = self.log_catcher.revisions[0].rev.properties
307
self.assertEqual('branch2', rev_props['branch-nick'])
310
class TestLogErrors(TestLog):
312
def test_log_zero_revspec(self):
313
self.make_minimal_branch()
314
self.run_bzr_error(['bzr: ERROR: Logging revision 0 is invalid.'],
317
def test_log_zero_begin_revspec(self):
318
self.make_linear_branch()
319
self.run_bzr_error(['bzr: ERROR: Logging revision 0 is invalid.'],
322
def test_log_zero_end_revspec(self):
323
self.make_linear_branch()
324
self.run_bzr_error(['bzr: ERROR: Logging revision 0 is invalid.'],
327
def test_log_nonexistent_revno(self):
328
self.make_minimal_branch()
329
self.run_bzr_error(["bzr: ERROR: Requested revision: '1234' "
330
"does not exist in branch:"],
333
def test_log_nonexistent_dotted_revno(self):
334
self.make_minimal_branch()
335
self.run_bzr_error(["bzr: ERROR: Requested revision: '123.123' "
336
"does not exist in branch:"],
337
['log', '-r123.123'])
339
def test_log_change_nonexistent_revno(self):
340
self.make_minimal_branch()
341
self.run_bzr_error(["bzr: ERROR: Requested revision: '1234' "
342
"does not exist in branch:"],
345
def test_log_change_nonexistent_dotted_revno(self):
346
self.make_minimal_branch()
347
self.run_bzr_error(["bzr: ERROR: Requested revision: '123.123' "
348
"does not exist in branch:"],
349
['log', '-c123.123'])
351
def test_log_change_single_revno_only(self):
352
self.make_minimal_branch()
353
self.run_bzr_error(['bzr: ERROR: Option --change does not'
354
' accept revision ranges'],
355
['log', '--change', '2..3'])
357
def test_log_change_incompatible_with_revision(self):
358
self.run_bzr_error(['bzr: ERROR: --revision and --change'
359
' are mutually exclusive'],
360
['log', '--change', '2', '--revision', '3'])
362
def test_log_nonexistent_file(self):
363
self.make_minimal_branch()
364
# files that don't exist in either the basis tree or working tree
365
# should give an error
366
out, err = self.run_bzr('log does-not-exist', retcode=3)
367
self.assertContainsRe(err,
368
'Path unknown at end or start of revision range: '
371
def test_log_reversed_revspecs(self):
372
self.make_linear_branch()
373
self.run_bzr_error(('bzr: ERROR: Start revision must be older than '
374
'the end revision.\n',),
377
def test_log_reversed_dotted_revspecs(self):
378
self.make_merged_branch()
379
self.run_bzr_error(('bzr: ERROR: Start revision not found in '
380
'left-hand history of end revision.\n',),
383
def test_log_bad_message_re(self):
384
"""Bad --message argument gives a sensible message
386
See https://bugs.launchpad.net/bzr/+bug/251352
388
self.make_minimal_branch()
389
out, err = self.run_bzr(['log', '-m', '*'], retcode=3)
390
self.assertContainsRe(err, "ERROR.*Invalid pattern.*nothing to repeat")
391
self.assertNotContainsRe(err, "Unprintable exception")
392
self.assertEqual(out, '')
394
def test_log_unsupported_timezone(self):
395
self.make_linear_branch()
396
self.run_bzr_error(['bzr: ERROR: Unsupported timezone format "foo", '
397
'options are "utc", "original", "local".'],
398
['log', '--timezone', 'foo'])
400
def test_log_exclude_ancestry_no_range(self):
401
self.make_linear_branch()
402
self.run_bzr_error(['bzr: ERROR: --exclude-common-ancestry'
403
' requires -r with two revisions'],
404
['log', '--exclude-common-ancestry'])
406
def test_log_exclude_ancestry_single_revision(self):
407
self.make_merged_branch()
408
self.run_bzr_error(['bzr: ERROR: --exclude-common-ancestry'
409
' requires two different revisions'],
410
['log', '--exclude-common-ancestry',
413
class TestLogTags(TestLog):
415
def test_log_with_tags(self):
416
tree = self.make_linear_branch(format='dirstate-tags')
418
branch.tags.set_tag('tag1', branch.get_rev_id(1))
419
branch.tags.set_tag('tag1.1', branch.get_rev_id(1))
420
branch.tags.set_tag('tag3', branch.last_revision())
422
log = self.run_bzr("log -r-1")[0]
423
self.assertTrue('tags: tag3' in log)
425
log = self.run_bzr("log -r1")[0]
426
# I guess that we can't know the order of tags in the output
427
# since dicts are unordered, need to check both possibilities
428
self.assertContainsRe(log, r'tags: (tag1, tag1\.1|tag1\.1, tag1)')
430
def test_merged_log_with_tags(self):
431
branch1_tree = self.make_linear_branch('branch1',
432
format='dirstate-tags')
433
branch1 = branch1_tree.branch
434
branch2_tree = branch1_tree.bzrdir.sprout('branch2').open_workingtree()
435
branch1_tree.commit(message='foobar', allow_pointless=True)
436
branch1.tags.set_tag('tag1', branch1.last_revision())
437
# tags don't propagate if we don't merge
438
self.run_bzr('merge ../branch1', working_dir='branch2')
439
branch2_tree.commit(message='merge branch 1')
440
log = self.run_bzr("log -n0 -r-1", working_dir='branch2')[0]
441
self.assertContainsRe(log, r' tags: tag1')
442
log = self.run_bzr("log -n0 -r3.1.1", working_dir='branch2')[0]
443
self.assertContainsRe(log, r'tags: tag1')
446
class TestLogSignatures(TestLog):
448
def test_log_with_signatures(self):
449
self.requireFeature(features.gpgme)
451
tree = self.make_linear_branch(format='dirstate-tags')
453
log = self.run_bzr("log --signatures")[0]
454
self.assertTrue('signature: no signature' in log)
456
def test_log_without_signatures(self):
457
self.requireFeature(features.gpgme)
459
tree = self.make_linear_branch(format='dirstate-tags')
461
log = self.run_bzr("log")[0]
462
self.assertFalse('signature: no signature' in log)
465
class TestLogVerbose(TestLog):
468
super(TestLogVerbose, self).setUp()
469
self.make_minimal_branch()
471
def assertUseShortDeltaFormat(self, cmd):
472
log = self.run_bzr(cmd)[0]
473
# Check that we use the short status format
474
self.assertContainsRe(log, '(?m)^\s*A hello.txt$')
475
self.assertNotContainsRe(log, '(?m)^\s*added:$')
477
def assertUseLongDeltaFormat(self, cmd):
478
log = self.run_bzr(cmd)[0]
479
# Check that we use the long status format
480
self.assertNotContainsRe(log, '(?m)^\s*A hello.txt$')
481
self.assertContainsRe(log, '(?m)^\s*added:$')
483
def test_log_short_verbose(self):
484
self.assertUseShortDeltaFormat(['log', '--short', '-v'])
486
def test_log_s_verbose(self):
487
self.assertUseShortDeltaFormat(['log', '-S', '-v'])
489
def test_log_short_verbose_verbose(self):
490
self.assertUseLongDeltaFormat(['log', '--short', '-vv'])
492
def test_log_long_verbose(self):
493
# Check that we use the long status format, ignoring the verbosity
495
self.assertUseLongDeltaFormat(['log', '--long', '-v'])
497
def test_log_long_verbose_verbose(self):
498
# Check that we use the long status format, ignoring the verbosity
500
self.assertUseLongDeltaFormat(['log', '--long', '-vv'])
503
class TestLogMerges(TestLogWithLogCatcher):
506
super(TestLogMerges, self).setUp()
507
self.make_branches_with_merges()
509
def make_branches_with_merges(self):
510
level0 = self.make_branch_and_tree('level0')
511
self.wt_commit(level0, 'in branch level0')
512
level1 = level0.bzrdir.sprout('level1').open_workingtree()
513
self.wt_commit(level1, 'in branch level1')
514
level2 = level1.bzrdir.sprout('level2').open_workingtree()
515
self.wt_commit(level2, 'in branch level2')
516
level1.merge_from_branch(level2.branch)
517
self.wt_commit(level1, 'merge branch level2')
518
level0.merge_from_branch(level1.branch)
519
self.wt_commit(level0, 'merge branch level1')
521
def test_merges_are_indented_by_level(self):
522
self.run_bzr(['log', '-n0'], working_dir='level0')
523
revnos_and_depth = [(r.revno, r.merge_depth)
524
for r in self.get_captured_revisions()]
525
self.assertEqual([('2', 0), ('1.1.2', 1), ('1.2.1', 2), ('1.1.1', 1),
527
[(r.revno, r.merge_depth)
528
for r in self.get_captured_revisions()])
530
def test_force_merge_revisions_off(self):
531
self.assertLogRevnos(['-n1'], ['2', '1'], working_dir='level0')
533
def test_force_merge_revisions_on(self):
534
self.assertLogRevnos(['-n0'], ['2', '1.1.2', '1.2.1', '1.1.1', '1'],
535
working_dir='level0')
537
def test_include_merges(self):
538
# Confirm --include-merges gives the same output as -n0
539
self.assertLogRevnos(['--include-merges'],
540
['2', '1.1.2', '1.2.1', '1.1.1', '1'],
541
working_dir='level0')
542
self.assertLogRevnos(['--include-merges'],
543
['2', '1.1.2', '1.2.1', '1.1.1', '1'],
544
working_dir='level0')
545
out_im, err_im = self.run_bzr('log --include-merges',
546
working_dir='level0')
547
out_n0, err_n0 = self.run_bzr('log -n0', working_dir='level0')
548
self.assertEqual('', err_im)
549
self.assertEqual('', err_n0)
550
self.assertEqual(out_im, out_n0)
552
def test_force_merge_revisions_N(self):
553
self.assertLogRevnos(['-n2'],
554
['2', '1.1.2', '1.1.1', '1'],
555
working_dir='level0')
557
def test_merges_single_merge_rev(self):
558
self.assertLogRevnosAndDepths(['-n0', '-r1.1.2'],
559
[('1.1.2', 0), ('1.2.1', 1)],
560
working_dir='level0')
562
def test_merges_partial_range(self):
563
self.assertLogRevnosAndDepths(
564
['-n0', '-r1.1.1..1.1.2'],
565
[('1.1.2', 0), ('1.2.1', 1), ('1.1.1', 0)],
566
working_dir='level0')
568
def test_merges_partial_range_ignore_before_lower_bound(self):
569
"""Dont show revisions before the lower bound's merged revs"""
570
self.assertLogRevnosAndDepths(
571
['-n0', '-r1.1.2..2'],
572
[('2', 0), ('1.1.2', 1), ('1.2.1', 2)],
573
working_dir='level0')
576
class TestLogDiff(TestLogWithLogCatcher):
578
# FIXME: We need specific tests for each LogFormatter about how the diffs
579
# are displayed: --long indent them by depth, --short use a fixed
580
# indent and --line does't display them. -- vila 10019
583
super(TestLogDiff, self).setUp()
584
self.make_branch_with_diffs()
586
def make_branch_with_diffs(self):
587
level0 = self.make_branch_and_tree('level0')
588
self.build_tree(['level0/file1', 'level0/file2'])
591
self.wt_commit(level0, 'in branch level0')
593
level1 = level0.bzrdir.sprout('level1').open_workingtree()
594
self.build_tree_contents([('level1/file2', 'hello\n')])
595
self.wt_commit(level1, 'in branch level1')
596
level0.merge_from_branch(level1.branch)
597
self.wt_commit(level0, 'merge branch level1')
599
def _diff_file1_revno1(self):
600
return """=== added file 'file1'
601
--- file1\t1970-01-01 00:00:00 +0000
602
+++ file1\t2005-11-22 00:00:00 +0000
604
+contents of level0/file1
608
def _diff_file2_revno2(self):
609
return """=== modified file 'file2'
610
--- file2\t2005-11-22 00:00:00 +0000
611
+++ file2\t2005-11-22 00:00:01 +0000
613
-contents of level0/file2
618
def _diff_file2_revno1_1_1(self):
619
return """=== modified file 'file2'
620
--- file2\t2005-11-22 00:00:00 +0000
621
+++ file2\t2005-11-22 00:00:01 +0000
623
-contents of level0/file2
628
def _diff_file2_revno1(self):
629
return """=== added file 'file2'
630
--- file2\t1970-01-01 00:00:00 +0000
631
+++ file2\t2005-11-22 00:00:00 +0000
633
+contents of level0/file2
637
def assertLogRevnosAndDiff(self, args, expected,
639
self.run_bzr(['log', '-p'] + args, working_dir=working_dir)
640
expected_revnos_and_depths = [
641
(revno, depth) for revno, depth, diff in expected]
642
# Check the revnos and depths first to make debugging easier
643
self.assertEqual(expected_revnos_and_depths,
644
[(r.revno, r.merge_depth)
645
for r in self.get_captured_revisions()])
646
# Now check the diffs, adding the revno in case of failure
647
fmt = 'In revno %s\n%s'
648
for expected_rev, actual_rev in izip(expected,
649
self.get_captured_revisions()):
650
revno, depth, expected_diff = expected_rev
651
actual_diff = actual_rev.diff
652
self.assertEqualDiff(fmt % (revno, expected_diff),
653
fmt % (revno, actual_diff))
655
def test_log_diff_with_merges(self):
656
self.assertLogRevnosAndDiff(
658
[('2', 0, self._diff_file2_revno2()),
659
('1.1.1', 1, self._diff_file2_revno1_1_1()),
660
('1', 0, self._diff_file1_revno1()
661
+ self._diff_file2_revno1())],
662
working_dir='level0')
665
def test_log_diff_file1(self):
666
self.assertLogRevnosAndDiff(['-n0', 'file1'],
667
[('1', 0, self._diff_file1_revno1())],
668
working_dir='level0')
670
def test_log_diff_file2(self):
671
self.assertLogRevnosAndDiff(['-n1', 'file2'],
672
[('2', 0, self._diff_file2_revno2()),
673
('1', 0, self._diff_file2_revno1())],
674
working_dir='level0')
677
class TestLogUnicodeDiff(TestLog):
679
def test_log_show_diff_non_ascii(self):
680
# Smoke test for bug #328007 UnicodeDecodeError on 'log -p'
681
message = u'Message with \xb5'
682
body = 'Body with \xb5\n'
683
wt = self.make_branch_and_tree('.')
684
self.build_tree_contents([('foo', body)])
686
wt.commit(message=message)
687
# check that command won't fail with unicode error
688
# don't care about exact output because we have other tests for this
689
out,err = self.run_bzr('log -p --long')
690
self.assertNotEqual('', out)
691
self.assertEqual('', err)
692
out,err = self.run_bzr('log -p --short')
693
self.assertNotEqual('', out)
694
self.assertEqual('', err)
695
out,err = self.run_bzr('log -p --line')
696
self.assertNotEqual('', out)
697
self.assertEqual('', err)
700
class TestLogEncodings(tests.TestCaseInTempDir):
703
_message = u'Message with \xb5'
705
# Encodings which can encode mu
710
'cp437', # Common windows encoding
711
'cp1251', # Russian windows encoding
712
'cp1258', # Common windows encoding
714
# Encodings which cannot encode mu
722
super(TestLogEncodings, self).setUp()
723
self.overrideAttr(osutils, '_cached_user_encoding')
725
def create_branch(self):
728
self.build_tree_contents([('a', 'some stuff\n')])
730
bzr(['commit', '-m', self._message])
732
def try_encoding(self, encoding, fail=False):
735
self.assertRaises(UnicodeEncodeError,
736
self._mu.encode, encoding)
737
encoded_msg = self._message.encode(encoding, 'replace')
739
encoded_msg = self._message.encode(encoding)
741
old_encoding = osutils._cached_user_encoding
742
# This test requires that 'run_bzr' uses the current
743
# bzrlib, because we override user_encoding, and expect
746
osutils._cached_user_encoding = 'ascii'
747
# We should be able to handle any encoding
748
out, err = bzr('log', encoding=encoding)
750
# Make sure we wrote mu as we expected it to exist
751
self.assertNotEqual(-1, out.find(encoded_msg))
752
out_unicode = out.decode(encoding)
753
self.assertNotEqual(-1, out_unicode.find(self._message))
755
self.assertNotEqual(-1, out.find('Message with ?'))
757
osutils._cached_user_encoding = old_encoding
759
def test_log_handles_encoding(self):
762
for encoding in self.good_encodings:
763
self.try_encoding(encoding)
765
def test_log_handles_bad_encoding(self):
768
for encoding in self.bad_encodings:
769
self.try_encoding(encoding, fail=True)
771
def test_stdout_encoding(self):
773
osutils._cached_user_encoding = "cp1251"
776
self.build_tree(['a'])
778
bzr(['commit', '-m', u'\u0422\u0435\u0441\u0442'])
779
stdout, stderr = self.run_bzr('log', encoding='cp866')
781
message = stdout.splitlines()[-1]
783
# explanation of the check:
784
# u'\u0422\u0435\u0441\u0442' is word 'Test' in russian
785
# in cp866 encoding this is string '\x92\xa5\xe1\xe2'
786
# in cp1251 encoding this is string '\xd2\xe5\xf1\xf2'
787
# This test should check that output of log command
788
# encoded to sys.stdout.encoding
789
test_in_cp866 = '\x92\xa5\xe1\xe2'
790
test_in_cp1251 = '\xd2\xe5\xf1\xf2'
791
# Make sure the log string is encoded in cp866
792
self.assertEquals(test_in_cp866, message[2:])
793
# Make sure the cp1251 string is not found anywhere
794
self.assertEquals(-1, stdout.find(test_in_cp1251))
797
class TestLogFile(TestLogWithLogCatcher):
799
def test_log_local_branch_file(self):
800
"""We should be able to log files in local treeless branches"""
801
tree = self.make_branch_and_tree('tree')
802
self.build_tree(['tree/file'])
804
tree.commit('revision 1')
805
tree.bzrdir.destroy_workingtree()
806
self.run_bzr('log tree/file')
808
def prepare_tree(self, complex=False):
809
# The complex configuration includes deletes and renames
810
tree = self.make_branch_and_tree('parent')
811
self.build_tree(['parent/file1', 'parent/file2', 'parent/file3'])
813
tree.commit('add file1')
815
tree.commit('add file2')
817
tree.commit('add file3')
818
child_tree = tree.bzrdir.sprout('child').open_workingtree()
819
self.build_tree_contents([('child/file2', 'hello')])
820
child_tree.commit(message='branch 1')
821
tree.merge_from_branch(child_tree.branch)
822
tree.commit(message='merge child branch')
825
tree.commit('remove file2')
826
tree.rename_one('file3', 'file4')
827
tree.commit('file3 is now called file4')
829
tree.commit('remove file1')
832
# FIXME: It would be good to parametrize the following tests against all
833
# formatters. But the revisions selection is not *currently* part of the
834
# LogFormatter contract, so using LogCatcher is sufficient -- vila 100118
835
def test_log_file1(self):
837
self.assertLogRevnos(['-n0', 'file1'], ['1'])
839
def test_log_file2(self):
842
self.assertLogRevnos(['-n0', 'file2'], ['4', '3.1.1', '2'])
843
# file2 in a merge revision
844
self.assertLogRevnos(['-n0', '-r3.1.1', 'file2'], ['3.1.1'])
845
# file2 in a mainline revision
846
self.assertLogRevnos(['-n0', '-r4', 'file2'], ['4', '3.1.1'])
847
# file2 since a revision
848
self.assertLogRevnos(['-n0', '-r3..', 'file2'], ['4', '3.1.1'])
849
# file2 up to a revision
850
self.assertLogRevnos(['-n0', '-r..3', 'file2'], ['2'])
852
def test_log_file3(self):
854
self.assertLogRevnos(['-n0', 'file3'], ['3'])
856
def test_log_file_historical_missing(self):
857
# Check logging a deleted file gives an error if the
858
# file isn't found at the end or start of the revision range
859
self.prepare_tree(complex=True)
860
err_msg = "Path unknown at end or start of revision range: file2"
861
err = self.run_bzr('log file2', retcode=3)[1]
862
self.assertContainsRe(err, err_msg)
864
def test_log_file_historical_end(self):
865
# Check logging a deleted file is ok if the file existed
866
# at the end the revision range
867
self.prepare_tree(complex=True)
868
self.assertLogRevnos(['-n0', '-r..4', 'file2'], ['4', '3.1.1', '2'])
870
def test_log_file_historical_start(self):
871
# Check logging a deleted file is ok if the file existed
872
# at the start of the revision range
873
self.prepare_tree(complex=True)
874
self.assertLogRevnos(['file1'], ['1'])
876
def test_log_file_renamed(self):
877
"""File matched against revision range, not current tree."""
878
self.prepare_tree(complex=True)
880
# Check logging a renamed file gives an error by default
881
err_msg = "Path unknown at end or start of revision range: file3"
882
err = self.run_bzr('log file3', retcode=3)[1]
883
self.assertContainsRe(err, err_msg)
885
# Check we can see a renamed file if we give the right end revision
886
self.assertLogRevnos(['-r..4', 'file3'], ['3'])
889
class TestLogMultiple(TestLogWithLogCatcher):
891
def prepare_tree(self):
892
tree = self.make_branch_and_tree('parent')
899
'parent/dir1/dir2/file3',
902
tree.commit('add file1')
904
tree.commit('add file2')
905
tree.add(['dir1', 'dir1/dir2', 'dir1/dir2/file3'])
906
tree.commit('add file3')
908
tree.commit('add file4')
909
tree.add('dir1/file5')
910
tree.commit('add file5')
911
child_tree = tree.bzrdir.sprout('child').open_workingtree()
912
self.build_tree_contents([('child/file2', 'hello')])
913
child_tree.commit(message='branch 1')
914
tree.merge_from_branch(child_tree.branch)
915
tree.commit(message='merge child branch')
918
def test_log_files(self):
919
"""The log for multiple file should only list revs for those files"""
921
self.assertLogRevnos(['file1', 'file2', 'dir1/dir2/file3'],
922
['6', '5.1.1', '3', '2', '1'])
924
def test_log_directory(self):
925
"""The log for a directory should show all nested files."""
927
self.assertLogRevnos(['dir1'], ['5', '3'])
929
def test_log_nested_directory(self):
930
"""The log for a directory should show all nested files."""
932
self.assertLogRevnos(['dir1/dir2'], ['3'])
934
def test_log_in_nested_directory(self):
935
"""The log for a directory should show all nested files."""
938
self.assertLogRevnos(['.'], ['5', '3'])
940
def test_log_files_and_directories(self):
941
"""Logging files and directories together should be fine."""
943
self.assertLogRevnos(['file4', 'dir1/dir2'], ['4', '3'])
945
def test_log_files_and_dirs_in_nested_directory(self):
946
"""The log for a directory should show all nested files."""
949
self.assertLogRevnos(['dir2', 'file5'], ['5', '3'])
952
class MainlineGhostTests(TestLogWithLogCatcher):
955
super(MainlineGhostTests, self).setUp()
956
tree = self.make_branch_and_tree('')
957
tree.set_parent_ids(["spooky"], allow_leftmost_as_ghost=True)
959
tree.commit('msg1', rev_id='rev1')
960
tree.commit('msg2', rev_id='rev2')
962
def test_log_range(self):
963
self.assertLogRevnos(["-r1..2"], ["2", "1"])
965
def test_log_norange(self):
966
self.assertLogRevnos([], ["2", "1"])
968
def test_log_range_open_begin(self):
969
self.knownFailure("log with ghosts fails. bug #726466")
970
(stdout, stderr) = self.run_bzr(['log', '-r..2'], retcode=3)
971
self.assertEqual(["2", "1"],
972
[r.revno for r in self.get_captured_revisions()])
973
self.assertEquals("bzr: ERROR: Further revision history missing.", stderr)
975
def test_log_range_open_end(self):
976
self.assertLogRevnos(["-r1.."], ["2", "1"])
978
class TestLogMatch(TestLogWithLogCatcher):
979
def prepare_tree(self):
980
tree = self.make_branch_and_tree('')
982
['/hello.txt', '/goodbye.txt'])
983
tree.add('hello.txt')
984
tree.commit(message='message1', committer='committer1', authors=['author1'])
985
tree.add('goodbye.txt')
986
tree.commit(message='message2', committer='committer2', authors=['author2'])
988
def test_message(self):
990
self.assertLogRevnos(["-m", "message1"], ["1"])
991
self.assertLogRevnos(["-m", "message2"], ["2"])
992
self.assertLogRevnos(["-m", "message"], ["2", "1"])
993
self.assertLogRevnos(["-m", "message1", "-m", "message2"], ["2", "1"])
994
self.assertLogRevnos(["--match-message", "message1"], ["1"])
995
self.assertLogRevnos(["--match-message", "message2"], ["2"])
996
self.assertLogRevnos(["--match-message", "message"], ["2", "1"])
997
self.assertLogRevnos(["--match-message", "message1",
998
"--match-message", "message2"], ["2", "1"])
999
self.assertLogRevnos(["--message", "message1"], ["1"])
1000
self.assertLogRevnos(["--message", "message2"], ["2"])
1001
self.assertLogRevnos(["--message", "message"], ["2", "1"])
1002
self.assertLogRevnos(["--match-message", "message1",
1003
"--message", "message2"], ["2", "1"])
1004
self.assertLogRevnos(["--message", "message1",
1005
"--match-message", "message2"], ["2", "1"])
1007
def test_committer(self):
1009
self.assertLogRevnos(["-m", "committer1"], ["1"])
1010
self.assertLogRevnos(["-m", "committer2"], ["2"])
1011
self.assertLogRevnos(["-m", "committer"], ["2", "1"])
1012
self.assertLogRevnos(["-m", "committer1", "-m", "committer2"],
1014
self.assertLogRevnos(["--match-committer", "committer1"], ["1"])
1015
self.assertLogRevnos(["--match-committer", "committer2"], ["2"])
1016
self.assertLogRevnos(["--match-committer", "committer"], ["2", "1"])
1017
self.assertLogRevnos(["--match-committer", "committer1",
1018
"--match-committer", "committer2"], ["2", "1"])
1020
def test_author(self):
1022
self.assertLogRevnos(["-m", "author1"], ["1"])
1023
self.assertLogRevnos(["-m", "author2"], ["2"])
1024
self.assertLogRevnos(["-m", "author"], ["2", "1"])
1025
self.assertLogRevnos(["-m", "author1", "-m", "author2"],
1027
self.assertLogRevnos(["--match-author", "author1"], ["1"])
1028
self.assertLogRevnos(["--match-author", "author2"], ["2"])
1029
self.assertLogRevnos(["--match-author", "author"], ["2", "1"])
1030
self.assertLogRevnos(["--match-author", "author1",
1031
"--match-author", "author2"], ["2", "1"])
added
removed
bzrlib/tests/blackbox/test_log.py
