/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/blackbox/test_log.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-08-23 01:15:41 UTC
  • mfrom: (7520.1.4 merge-3.1)
  • Revision ID: breezy.the.bot@gmail.com-20200823011541-nv0oh7nzaganx2qy
Merge lp:brz/3.1.

Merged from https://code.launchpad.net/~jelmer/brz/merge-3.1/+merge/389690

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_log.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006-2012, 2016 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
 
18
 
"""Black-box tests for bzr log."""
19
 
 
20
 
from itertools import izip
 
18
"""Black-box tests for brz log."""
 
19
 
 
20
 
21
21
import os
22
 
import re
23
22
 
24
 
from bzrlib import (
 
23
from breezy import (
25
24
    branchbuilder,
26
25
    errors,
27
26
    log,
28
27
    osutils,
29
28
    tests,
30
29
    )
31
 
from bzrlib.tests import (
32
 
    script,
 
30
from breezy.tests import (
33
31
    test_log,
 
32
    features,
34
33
    )
35
34
 
36
35
 
57
56
 
58
57
    def make_merged_branch(self, path='.', format=None):
59
58
        tree = self.make_linear_branch(path, format)
60
 
        tree2 = tree.bzrdir.sprout('tree2',
61
 
            revision_id=tree.branch.get_rev_id(1)).open_workingtree()
 
59
        tree2 = tree.controldir.sprout('tree2',
 
60
                                       revision_id=tree.branch.get_rev_id(1)).open_workingtree()
62
61
        tree2.commit(message='tree2 message2')
63
62
        tree2.commit(message='tree2 message3')
64
63
        tree.merge_from_branch(tree2.branch)
71
70
    def setUp(self):
72
71
        super(TestLogWithLogCatcher, self).setUp()
73
72
        # Capture log formatter creations
 
73
 
74
74
        class MyLogFormatter(test_log.LogCatcher):
75
75
 
76
76
            def __new__(klass, *args, **kwargs):
77
77
                self.log_catcher = test_log.LogCatcher(*args, **kwargs)
78
78
                # Always return our own log formatter
79
79
                return self.log_catcher
 
80
        # Break cycle with closure over self on cleanup by removing method
 
81
        self.addCleanup(setattr, MyLogFormatter, "__new__", None)
80
82
 
81
83
        def getme(branch):
82
 
                # Always return our own log formatter class hijacking the
83
 
                # default behavior (which requires setting up a config
84
 
                # variable)
 
84
            # Always return our own log formatter class hijacking the
 
85
            # default behavior (which requires setting up a config
 
86
            # variable)
85
87
            return MyLogFormatter
86
88
        self.overrideAttr(log.log_formatter_registry, 'get_default', getme)
87
89
 
88
90
    def get_captured_revisions(self):
89
91
        return self.log_catcher.revisions
90
92
 
91
 
    def assertLogRevnos(self, args, expected_revnos, working_dir='.'):
92
 
        self.run_bzr(['log'] + args, working_dir=working_dir)
 
93
    def assertLogRevnos(self, args, expected_revnos, working_dir='.',
 
94
                        out='', err=''):
 
95
        actual_out, actual_err = self.run_bzr(['log'] + args,
 
96
                                              working_dir=working_dir)
 
97
        self.assertEqual(out, actual_out)
 
98
        self.assertEqual(err, actual_err)
93
99
        self.assertEqual(expected_revnos,
94
100
                         [r.revno for r in self.get_captured_revisions()])
95
101
 
96
102
    def assertLogRevnosAndDepths(self, args, expected_revnos_and_depths,
97
 
                                working_dir='.'):
 
103
                                 working_dir='.'):
98
104
        self.run_bzr(['log'] + args, working_dir=working_dir)
99
105
        self.assertEqual(expected_revnos_and_depths,
100
106
                         [(r.revno, r.merge_depth)
101
 
                           for r in self.get_captured_revisions()])
 
107
                          for r in self.get_captured_revisions()])
102
108
 
103
109
 
104
110
class TestLogRevSpecs(TestLogWithLogCatcher):
158
164
        self.make_linear_branch()
159
165
        self.assertLogRevnos(['-c1'], ['1'])
160
166
 
 
167
    def test_branch_revspec(self):
 
168
        foo = self.make_branch_and_tree('foo')
 
169
        bar = self.make_branch_and_tree('bar')
 
170
        self.build_tree(['foo/foo.txt', 'bar/bar.txt'])
 
171
        foo.add('foo.txt')
 
172
        bar.add('bar.txt')
 
173
        foo.commit(message='foo')
 
174
        bar.commit(message='bar')
 
175
        self.run_bzr('log -r branch:../bar', working_dir='foo')
 
176
        self.assertEqual([bar.branch.get_rev_id(1)],
 
177
                         [r.rev.revision_id
 
178
                          for r in self.get_captured_revisions()])
 
179
 
 
180
 
 
181
class TestLogExcludeCommonAncestry(TestLogWithLogCatcher):
 
182
 
 
183
    def test_exclude_common_ancestry_simple_revnos(self):
 
184
        self.make_linear_branch()
 
185
        self.assertLogRevnos(['-r1..3', '--exclude-common-ancestry'],
 
186
                             ['3', '2'])
 
187
 
161
188
 
162
189
class TestLogMergedLinearAncestry(TestLogWithLogCatcher):
163
190
 
167
194
        # stop calling run_bzr, there is no point) --vila 100118.
168
195
        builder = branchbuilder.BranchBuilder(self.get_transport())
169
196
        builder.start_series()
 
197
        # 1
 
198
        # | \
 
199
        # 2  1.1.1
 
200
        # | / |
 
201
        # 3  1.1.2
 
202
        # |   |
 
203
        # |  1.1.3
 
204
        # | / |
 
205
        # 4  1.1.4
 
206
        # | /
 
207
        # 5
 
208
        # | \
 
209
        # | 5.1.1
 
210
        # | /
 
211
        # 6
 
212
 
170
213
        # mainline
171
 
        builder.build_snapshot('1', None, [
172
 
            ('add', ('', 'root-id', 'directory', ''))])
173
 
        builder.build_snapshot('2', ['1'], [])
 
214
        builder.build_snapshot(None, [
 
215
            ('add', ('', b'root-id', 'directory', ''))],
 
216
            revision_id=b'1')
 
217
        builder.build_snapshot([b'1'], [], revision_id=b'2')
174
218
        # branch
175
 
        builder.build_snapshot('1.1.1', ['1'], [])
 
219
        builder.build_snapshot([b'1'], [], revision_id=b'1.1.1')
176
220
        # merge branch into mainline
177
 
        builder.build_snapshot('3', ['2', '1.1.1'], [])
 
221
        builder.build_snapshot([b'2', b'1.1.1'], [], revision_id=b'3')
178
222
        # new commits in branch
179
 
        builder.build_snapshot('1.1.2', ['1.1.1'], [])
180
 
        builder.build_snapshot('1.1.3', ['1.1.2'], [])
 
223
        builder.build_snapshot([b'1.1.1'], [], revision_id=b'1.1.2')
 
224
        builder.build_snapshot([b'1.1.2'], [], revision_id=b'1.1.3')
181
225
        # merge branch into mainline
182
 
        builder.build_snapshot('4', ['3', '1.1.3'], [])
 
226
        builder.build_snapshot([b'3', b'1.1.3'], [], revision_id=b'4')
183
227
        # merge mainline into branch
184
 
        builder.build_snapshot('1.1.4', ['1.1.3', '4'], [])
 
228
        builder.build_snapshot([b'1.1.3', b'4'], [], revision_id=b'1.1.4')
185
229
        # merge branch into mainline
186
 
        builder.build_snapshot('5', ['4', '1.1.4'], [])
 
230
        builder.build_snapshot([b'4', b'1.1.4'], [], revision_id=b'5')
 
231
        builder.build_snapshot([b'5'], [], revision_id=b'5.1.1')
 
232
        builder.build_snapshot([b'5', b'5.1.1'], [], revision_id=b'6')
187
233
        builder.finish_series()
188
234
 
189
235
    def test_n0(self):
190
236
        self.assertLogRevnos(['-n0', '-r1.1.1..1.1.4'],
191
237
                             ['1.1.4', '4', '1.1.3', '1.1.2', '3', '1.1.1'])
 
238
 
192
239
    def test_n0_forward(self):
193
240
        self.assertLogRevnos(['-n0', '-r1.1.1..1.1.4', '--forward'],
194
241
                             ['3', '1.1.1', '4', '1.1.2', '1.1.3', '1.1.4'])
202
249
        self.assertLogRevnos(['-n1', '-r1.1.1..1.1.4', '--forward'],
203
250
                             ['1.1.1', '1.1.2', '1.1.3', '1.1.4'])
204
251
 
 
252
    def test_fallback_when_end_rev_is_not_on_mainline(self):
 
253
        self.assertLogRevnos(['-n1', '-r1.1.1..5.1.1'],
 
254
                             # We don't get 1.1.1 because we say -n1
 
255
                             ['5.1.1', '5', '4', '3'])
 
256
 
205
257
 
206
258
class Test_GenerateAllRevisions(TestLogWithLogCatcher):
207
259
 
219
271
        # The graph below may look a bit complicated (and it may be but I've
220
272
        # banged my head enough on it) but the bug requires at least dotted
221
273
        # revnos *and* merged revisions below that.
222
 
        builder.build_snapshot('1', None, [
223
 
            ('add', ('', 'root-id', 'directory', ''))])
224
 
        builder.build_snapshot('2', ['1'], [])
225
 
        builder.build_snapshot('1.1.1', ['1'], [])
226
 
        builder.build_snapshot('2.1.1', ['2'], [])
227
 
        builder.build_snapshot('3', ['2', '1.1.1'], [])
228
 
        builder.build_snapshot('2.1.2', ['2.1.1'], [])
229
 
        builder.build_snapshot('2.2.1', ['2.1.1'], [])
230
 
        builder.build_snapshot('2.1.3', ['2.1.2', '2.2.1'], [])
231
 
        builder.build_snapshot('4', ['3', '2.1.3'], [])
232
 
        builder.build_snapshot('5', ['4', '2.1.2'], [])
 
274
        # 1
 
275
        # | \
 
276
        # 2  1.1.1
 
277
        # | X
 
278
        # 3  2.1.1
 
279
        # |   |    \
 
280
        # |  2.1.2  2.2.1
 
281
        # |   |    X
 
282
        # |  2.1.3  \
 
283
        # | /       /
 
284
        # 4        /
 
285
        # |       /
 
286
        # 5 -----/
 
287
        builder.build_snapshot(None, [
 
288
            ('add', ('', b'root-id', 'directory', ''))], revision_id=b'1')
 
289
        builder.build_snapshot([b'1'], [], revision_id=b'2')
 
290
        builder.build_snapshot([b'1'], [], revision_id=b'1.1.1')
 
291
        builder.build_snapshot([b'2'], [], revision_id=b'2.1.1')
 
292
        builder.build_snapshot([b'2', b'1.1.1'], [], revision_id=b'3')
 
293
        builder.build_snapshot([b'2.1.1'], [], revision_id=b'2.1.2')
 
294
        builder.build_snapshot([b'2.1.1'], [], revision_id=b'2.2.1')
 
295
        builder.build_snapshot([b'2.1.2', b'2.2.1'], [], revision_id=b'2.1.3')
 
296
        builder.build_snapshot([b'3', b'2.1.3'], [], revision_id=b'4')
 
297
        builder.build_snapshot([b'4', b'2.1.2'], [], revision_id=b'5')
233
298
        builder.finish_series()
234
299
        return builder
235
300
 
236
301
    def test_not_an_ancestor(self):
237
 
        self.assertRaises(errors.BzrCommandError,
 
302
        self.assertRaises(errors.CommandError,
238
303
                          log._generate_all_revisions,
239
304
                          self.branch, '1.1.1', '2.1.3', 'reverse',
240
305
                          delayed_graph_generation=True)
241
306
 
242
307
    def test_wrong_order(self):
243
 
        self.assertRaises(errors.BzrCommandError,
 
308
        self.assertRaises(errors.CommandError,
244
309
                          log._generate_all_revisions,
245
310
                          self.branch, '5', '2.1.3', 'reverse',
246
311
                          delayed_graph_generation=True)
263
328
    def test_log_revno_n_path_correct_order(self):
264
329
        self.make_linear_branch('branch2')
265
330
        self.assertLogRevnos(['-rrevno:1:branch2..revno:3:branch2'],
266
 
                             ['3', '2','1'])
 
331
                             ['3', '2', '1'])
267
332
 
268
333
    def test_log_revno_n_path(self):
269
334
        self.make_linear_branch('branch2')
270
335
        self.assertLogRevnos(['-rrevno:1:branch2'],
271
336
                             ['1'])
272
337
        rev_props = self.log_catcher.revisions[0].rev.properties
273
 
        self.assertEqual('branch2', rev_props['branch-nick'])
 
338
        self.assertEqual('branch2', rev_props[u'branch-nick'])
274
339
 
275
340
 
276
341
class TestLogErrors(TestLog):
277
342
 
278
343
    def test_log_zero_revspec(self):
279
344
        self.make_minimal_branch()
280
 
        self.run_bzr_error(['bzr: ERROR: Logging revision 0 is invalid.'],
 
345
        self.run_bzr_error(['brz: ERROR: Logging revision 0 is invalid.'],
281
346
                           ['log', '-r0'])
282
347
 
283
348
    def test_log_zero_begin_revspec(self):
284
349
        self.make_linear_branch()
285
 
        self.run_bzr_error(['bzr: ERROR: Logging revision 0 is invalid.'],
 
350
        self.run_bzr_error(['brz: ERROR: Logging revision 0 is invalid.'],
286
351
                           ['log', '-r0..2'])
287
352
 
288
353
    def test_log_zero_end_revspec(self):
289
354
        self.make_linear_branch()
290
 
        self.run_bzr_error(['bzr: ERROR: Logging revision 0 is invalid.'],
 
355
        self.run_bzr_error(['brz: ERROR: Logging revision 0 is invalid.'],
291
356
                           ['log', '-r-2..0'])
292
357
 
293
358
    def test_log_nonexistent_revno(self):
294
359
        self.make_minimal_branch()
295
 
        self.run_bzr_error(["bzr: ERROR: Requested revision: '1234' "
 
360
        self.run_bzr_error(["brz: ERROR: Requested revision: '1234' "
296
361
                            "does not exist in branch:"],
297
362
                           ['log', '-r1234'])
298
363
 
299
364
    def test_log_nonexistent_dotted_revno(self):
300
365
        self.make_minimal_branch()
301
 
        self.run_bzr_error(["bzr: ERROR: Requested revision: '123.123' "
 
366
        self.run_bzr_error(["brz: ERROR: Requested revision: '123.123' "
302
367
                            "does not exist in branch:"],
303
 
                           ['log',  '-r123.123'])
 
368
                           ['log', '-r123.123'])
304
369
 
305
370
    def test_log_change_nonexistent_revno(self):
306
371
        self.make_minimal_branch()
307
 
        self.run_bzr_error(["bzr: ERROR: Requested revision: '1234' "
 
372
        self.run_bzr_error(["brz: ERROR: Requested revision: '1234' "
308
373
                            "does not exist in branch:"],
309
 
                           ['log',  '-c1234'])
 
374
                           ['log', '-c1234'])
310
375
 
311
376
    def test_log_change_nonexistent_dotted_revno(self):
312
377
        self.make_minimal_branch()
313
 
        self.run_bzr_error(["bzr: ERROR: Requested revision: '123.123' "
 
378
        self.run_bzr_error(["brz: ERROR: Requested revision: '123.123' "
314
379
                            "does not exist in branch:"],
315
380
                           ['log', '-c123.123'])
316
381
 
317
382
    def test_log_change_single_revno_only(self):
318
383
        self.make_minimal_branch()
319
 
        self.run_bzr_error(['bzr: ERROR: Option --change does not'
320
 
                           ' accept revision ranges'],
 
384
        self.run_bzr_error(['brz: ERROR: Option --change does not'
 
385
                            ' accept revision ranges'],
321
386
                           ['log', '--change', '2..3'])
322
387
 
323
388
    def test_log_change_incompatible_with_revision(self):
324
 
        self.run_bzr_error(['bzr: ERROR: --revision and --change'
325
 
                           ' are mutually exclusive'],
 
389
        self.run_bzr_error(['brz: ERROR: --revision and --change'
 
390
                            ' are mutually exclusive'],
326
391
                           ['log', '--change', '2', '--revision', '3'])
327
392
 
328
393
    def test_log_nonexistent_file(self):
336
401
 
337
402
    def test_log_reversed_revspecs(self):
338
403
        self.make_linear_branch()
339
 
        self.run_bzr_error(('bzr: ERROR: Start revision must be older than '
 
404
        self.run_bzr_error(('brz: ERROR: Start revision must be older than '
340
405
                            'the end revision.\n',),
341
406
                           ['log', '-r3..1'])
342
407
 
343
408
    def test_log_reversed_dotted_revspecs(self):
344
409
        self.make_merged_branch()
345
 
        self.run_bzr_error(('bzr: ERROR: Start revision not found in '
346
 
                            'left-hand history of end revision.\n',),
 
410
        self.run_bzr_error(('brz: ERROR: Start revision not found in '
 
411
                            'history of end revision.\n',),
347
412
                           "log -r 1.1.1..1")
348
413
 
349
414
    def test_log_bad_message_re(self):
350
415
        """Bad --message argument gives a sensible message
351
 
        
 
416
 
352
417
        See https://bugs.launchpad.net/bzr/+bug/251352
353
418
        """
354
419
        self.make_minimal_branch()
355
420
        out, err = self.run_bzr(['log', '-m', '*'], retcode=3)
356
 
        self.assertEqual("bzr: ERROR: Invalid regular expression"
357
 
            " in log message filter"
358
 
            ": '*'"
359
 
            ": nothing to repeat\n", err)
360
 
        self.assertEqual('', out)
 
421
        self.assertContainsRe(err, "ERROR.*Invalid pattern.*nothing to repeat")
 
422
        self.assertNotContainsRe(err, "Unprintable exception")
 
423
        self.assertEqual(out, '')
361
424
 
362
425
    def test_log_unsupported_timezone(self):
363
426
        self.make_linear_branch()
364
 
        self.run_bzr_error(['bzr: ERROR: Unsupported timezone format "foo", '
 
427
        self.run_bzr_error(['brz: ERROR: Unsupported timezone format "foo", '
365
428
                            'options are "utc", "original", "local".'],
366
429
                           ['log', '--timezone', 'foo'])
367
430
 
368
431
    def test_log_exclude_ancestry_no_range(self):
369
432
        self.make_linear_branch()
370
 
        self.run_bzr_error(['bzr: ERROR: --exclude-common-ancestry'
 
433
        self.run_bzr_error(['brz: ERROR: --exclude-common-ancestry'
371
434
                            ' requires -r with two revisions'],
372
435
                           ['log', '--exclude-common-ancestry'])
373
436
 
374
437
    def test_log_exclude_ancestry_single_revision(self):
375
438
        self.make_merged_branch()
376
 
        self.run_bzr_error(['bzr: ERROR: --exclude-common-ancestry'
 
439
        self.run_bzr_error(['brz: ERROR: --exclude-common-ancestry'
377
440
                            ' requires two different revisions'],
378
441
                           ['log', '--exclude-common-ancestry',
379
442
                            '-r1.1.1..1.1.1'])
380
443
 
 
444
 
381
445
class TestLogTags(TestLog):
382
446
 
383
447
    def test_log_with_tags(self):
399
463
        branch1_tree = self.make_linear_branch('branch1',
400
464
                                               format='dirstate-tags')
401
465
        branch1 = branch1_tree.branch
402
 
        branch2_tree = branch1_tree.bzrdir.sprout('branch2').open_workingtree()
 
466
        branch2_tree = branch1_tree.controldir.sprout(
 
467
            'branch2').open_workingtree()
403
468
        branch1_tree.commit(message='foobar', allow_pointless=True)
404
469
        branch1.tags.set_tag('tag1', branch1.last_revision())
405
470
        # tags don't propagate if we don't merge
411
476
        self.assertContainsRe(log, r'tags: tag1')
412
477
 
413
478
 
 
479
class TestLogSignatures(TestLog):
 
480
 
 
481
    def test_log_with_signatures(self):
 
482
        self.requireFeature(features.gpg)
 
483
 
 
484
        tree = self.make_linear_branch(format='dirstate-tags')
 
485
 
 
486
        log = self.run_bzr("log --signatures")[0]
 
487
        self.assertTrue('signature: no signature' in log)
 
488
 
 
489
    def test_log_without_signatures(self):
 
490
        self.requireFeature(features.gpg)
 
491
 
 
492
        tree = self.make_linear_branch(format='dirstate-tags')
 
493
 
 
494
        log = self.run_bzr("log")[0]
 
495
        self.assertFalse('signature: no signature' in log)
 
496
 
 
497
 
414
498
class TestLogVerbose(TestLog):
415
499
 
416
500
    def setUp(self):
420
504
    def assertUseShortDeltaFormat(self, cmd):
421
505
        log = self.run_bzr(cmd)[0]
422
506
        # Check that we use the short status format
423
 
        self.assertContainsRe(log, '(?m)^\s*A  hello.txt$')
424
 
        self.assertNotContainsRe(log, '(?m)^\s*added:$')
 
507
        self.assertContainsRe(log, '(?m)^\\s*A  hello.txt$')
 
508
        self.assertNotContainsRe(log, '(?m)^\\s*added:$')
425
509
 
426
510
    def assertUseLongDeltaFormat(self, cmd):
427
511
        log = self.run_bzr(cmd)[0]
428
512
        # Check that we use the long status format
429
 
        self.assertNotContainsRe(log, '(?m)^\s*A  hello.txt$')
430
 
        self.assertContainsRe(log, '(?m)^\s*added:$')
 
513
        self.assertNotContainsRe(log, '(?m)^\\s*A  hello.txt$')
 
514
        self.assertContainsRe(log, '(?m)^\\s*added:$')
431
515
 
432
516
    def test_log_short_verbose(self):
433
517
        self.assertUseShortDeltaFormat(['log', '--short', '-v'])
434
518
 
 
519
    def test_log_s_verbose(self):
 
520
        self.assertUseShortDeltaFormat(['log', '-S', '-v'])
 
521
 
435
522
    def test_log_short_verbose_verbose(self):
436
523
        self.assertUseLongDeltaFormat(['log', '--short', '-vv'])
437
524
 
455
542
    def make_branches_with_merges(self):
456
543
        level0 = self.make_branch_and_tree('level0')
457
544
        self.wt_commit(level0, 'in branch level0')
458
 
        level1 = level0.bzrdir.sprout('level1').open_workingtree()
 
545
        level1 = level0.controldir.sprout('level1').open_workingtree()
459
546
        self.wt_commit(level1, 'in branch level1')
460
 
        level2 = level1.bzrdir.sprout('level2').open_workingtree()
 
547
        level2 = level1.controldir.sprout('level2').open_workingtree()
461
548
        self.wt_commit(level2, 'in branch level2')
462
549
        level1.merge_from_branch(level2.branch)
463
550
        self.wt_commit(level1, 'merge branch level2')
471
558
        self.assertEqual([('2', 0), ('1.1.2', 1), ('1.2.1', 2), ('1.1.1', 1),
472
559
                          ('1', 0)],
473
560
                         [(r.revno, r.merge_depth)
474
 
                            for r in self.get_captured_revisions()])
 
561
                          for r in self.get_captured_revisions()])
475
562
 
476
563
    def test_force_merge_revisions_off(self):
477
564
        self.assertLogRevnos(['-n1'], ['2', '1'], working_dir='level0')
480
567
        self.assertLogRevnos(['-n0'], ['2', '1.1.2', '1.2.1', '1.1.1', '1'],
481
568
                             working_dir='level0')
482
569
 
483
 
    def test_include_merges(self):
484
 
        # Confirm --include-merges gives the same output as -n0
485
 
        self.assertLogRevnos(['--include-merges'],
486
 
                             ['2', '1.1.2', '1.2.1', '1.1.1', '1'],
487
 
                             working_dir='level0')
488
 
        self.assertLogRevnos(['--include-merges'],
489
 
                             ['2', '1.1.2', '1.2.1', '1.1.1', '1'],
490
 
                             working_dir='level0')
491
 
        out_im, err_im = self.run_bzr('log --include-merges',
492
 
                                      working_dir='level0')
493
 
        out_n0, err_n0 = self.run_bzr('log -n0', working_dir='level0')
494
 
        self.assertEqual('', err_im)
495
 
        self.assertEqual('', err_n0)
496
 
        self.assertEqual(out_im, out_n0)
 
570
    def test_include_merged(self):
 
571
        # Confirm --include-merged gives the same output as -n0
 
572
        expected = ['2', '1.1.2', '1.2.1', '1.1.1', '1']
 
573
        self.assertLogRevnos(['--include-merged'],
 
574
                             expected, working_dir='level0')
 
575
        self.assertLogRevnos(['--include-merged'],
 
576
                             expected, working_dir='level0')
497
577
 
498
578
    def test_force_merge_revisions_N(self):
499
579
        self.assertLogRevnos(['-n2'],
507
587
 
508
588
    def test_merges_partial_range(self):
509
589
        self.assertLogRevnosAndDepths(
510
 
                ['-n0', '-r1.1.1..1.1.2'],
511
 
                [('1.1.2', 0), ('1.2.1', 1), ('1.1.1', 0)],
512
 
                working_dir='level0')
 
590
            ['-n0', '-r1.1.1..1.1.2'],
 
591
            [('1.1.2', 0), ('1.2.1', 1), ('1.1.1', 0)],
 
592
            working_dir='level0')
513
593
 
514
594
    def test_merges_partial_range_ignore_before_lower_bound(self):
515
595
        """Dont show revisions before the lower bound's merged revs"""
516
596
        self.assertLogRevnosAndDepths(
517
 
                ['-n0', '-r1.1.2..2'],
518
 
                [('2', 0), ('1.1.2', 1), ('1.2.1', 2)],
519
 
                working_dir='level0')
 
597
            ['-n0', '-r1.1.2..2'],
 
598
            [('2', 0), ('1.1.2', 1), ('1.2.1', 2)],
 
599
            working_dir='level0')
 
600
 
 
601
    def test_omit_merges_with_sidelines(self):
 
602
        self.assertLogRevnos(['--omit-merges', '-n0'], ['1.2.1', '1.1.1', '1'],
 
603
                             working_dir='level0')
 
604
 
 
605
    def test_omit_merges_without_sidelines(self):
 
606
        self.assertLogRevnos(['--omit-merges', '-n1'], ['1'],
 
607
                             working_dir='level0')
520
608
 
521
609
 
522
610
class TestLogDiff(TestLogWithLogCatcher):
536
624
        level0.add('file2')
537
625
        self.wt_commit(level0, 'in branch level0')
538
626
 
539
 
        level1 = level0.bzrdir.sprout('level1').open_workingtree()
540
 
        self.build_tree_contents([('level1/file2', 'hello\n')])
 
627
        level1 = level0.controldir.sprout('level1').open_workingtree()
 
628
        self.build_tree_contents([('level1/file2', b'hello\n')])
541
629
        self.wt_commit(level1, 'in branch level1')
542
630
        level0.merge_from_branch(level1.branch)
543
631
        self.wt_commit(level0, 'merge branch level1')
544
632
 
545
633
    def _diff_file1_revno1(self):
546
 
        return """=== added file 'file1'
 
634
        return b"""=== added file 'file1'
547
635
--- file1\t1970-01-01 00:00:00 +0000
548
636
+++ file1\t2005-11-22 00:00:00 +0000
549
637
@@ -0,0 +1,1 @@
552
640
"""
553
641
 
554
642
    def _diff_file2_revno2(self):
555
 
        return """=== modified file 'file2'
 
643
        return b"""=== modified file 'file2'
556
644
--- file2\t2005-11-22 00:00:00 +0000
557
645
+++ file2\t2005-11-22 00:00:01 +0000
558
646
@@ -1,1 +1,1 @@
562
650
"""
563
651
 
564
652
    def _diff_file2_revno1_1_1(self):
565
 
        return """=== modified file 'file2'
 
653
        return b"""=== modified file 'file2'
566
654
--- file2\t2005-11-22 00:00:00 +0000
567
655
+++ file2\t2005-11-22 00:00:01 +0000
568
656
@@ -1,1 +1,1 @@
572
660
"""
573
661
 
574
662
    def _diff_file2_revno1(self):
575
 
        return """=== added file 'file2'
 
663
        return b"""=== added file 'file2'
576
664
--- file2\t1970-01-01 00:00:00 +0000
577
665
+++ file2\t2005-11-22 00:00:00 +0000
578
666
@@ -0,0 +1,1 @@
581
669
"""
582
670
 
583
671
    def assertLogRevnosAndDiff(self, args, expected,
584
 
                            working_dir='.'):
 
672
                               working_dir='.'):
585
673
        self.run_bzr(['log', '-p'] + args, working_dir=working_dir)
586
674
        expected_revnos_and_depths = [
587
675
            (revno, depth) for revno, depth, diff in expected]
588
676
        # Check the revnos and depths first to make debugging easier
589
677
        self.assertEqual(expected_revnos_and_depths,
590
678
                         [(r.revno, r.merge_depth)
591
 
                           for r in self.get_captured_revisions()])
 
679
                          for r in self.get_captured_revisions()])
592
680
        # Now check the diffs, adding the revno  in case of failure
593
681
        fmt = 'In revno %s\n%s'
594
 
        for expected_rev, actual_rev in izip(expected,
595
 
                                             self.get_captured_revisions()):
 
682
        for expected_rev, actual_rev in zip(expected,
 
683
                                            self.get_captured_revisions()):
596
684
            revno, depth, expected_diff = expected_rev
597
685
            actual_diff = actual_rev.diff
598
686
            self.assertEqualDiff(fmt % (revno, expected_diff),
603
691
            ['-n0'],
604
692
            [('2', 0, self._diff_file2_revno2()),
605
693
             ('1.1.1', 1, self._diff_file2_revno1_1_1()),
606
 
             ('1', 0, self._diff_file1_revno1()
607
 
              + self._diff_file2_revno1())],
 
694
             ('1', 0, self._diff_file1_revno1() +
 
695
              self._diff_file2_revno1())],
608
696
            working_dir='level0')
609
697
 
610
 
 
611
698
    def test_log_diff_file1(self):
612
699
        self.assertLogRevnosAndDiff(['-n0', 'file1'],
613
700
                                    [('1', 0, self._diff_file1_revno1())],
625
712
    def test_log_show_diff_non_ascii(self):
626
713
        # Smoke test for bug #328007 UnicodeDecodeError on 'log -p'
627
714
        message = u'Message with \xb5'
628
 
        body = 'Body with \xb5\n'
 
715
        body = b'Body with \xb5\n'
629
716
        wt = self.make_branch_and_tree('.')
630
717
        self.build_tree_contents([('foo', body)])
631
718
        wt.add('foo')
632
719
        wt.commit(message=message)
633
720
        # check that command won't fail with unicode error
634
721
        # don't care about exact output because we have other tests for this
635
 
        out,err = self.run_bzr('log -p --long')
636
 
        self.assertNotEqual('', out)
637
 
        self.assertEqual('', err)
638
 
        out,err = self.run_bzr('log -p --short')
639
 
        self.assertNotEqual('', out)
640
 
        self.assertEqual('', err)
641
 
        out,err = self.run_bzr('log -p --line')
 
722
        out, err = self.run_bzr('log -p --long')
 
723
        self.assertNotEqual('', out)
 
724
        self.assertEqual('', err)
 
725
        out, err = self.run_bzr('log -p --short')
 
726
        self.assertNotEqual('', out)
 
727
        self.assertEqual('', err)
 
728
        out, err = self.run_bzr('log -p --line')
642
729
        self.assertNotEqual('', out)
643
730
        self.assertEqual('', err)
644
731
 
653
740
        'utf-8',
654
741
        'latin-1',
655
742
        'iso-8859-1',
656
 
        'cp437', # Common windows encoding
657
 
        'cp1251', # Russian windows encoding
658
 
        'cp1258', # Common windows encoding
 
743
        'cp437',  # Common windows encoding
 
744
        'cp1251',  # Russian windows encoding
 
745
        'cp1258',  # Common windows encoding
659
746
    ]
660
747
    # Encodings which cannot encode mu
661
748
    bad_encodings = [
669
756
        self.overrideAttr(osutils, '_cached_user_encoding')
670
757
 
671
758
    def create_branch(self):
672
 
        bzr = self.run_bzr
673
 
        bzr('init')
674
 
        self.build_tree_contents([('a', 'some stuff\n')])
675
 
        bzr('add a')
676
 
        bzr(['commit', '-m', self._message])
 
759
        brz = self.run_bzr
 
760
        brz('init')
 
761
        self.build_tree_contents([('a', b'some stuff\n')])
 
762
        brz('add a')
 
763
        brz(['commit', '-m', self._message])
677
764
 
678
765
    def try_encoding(self, encoding, fail=False):
679
 
        bzr = self.run_bzr
 
766
        brz = self.run_bzr
680
767
        if fail:
681
768
            self.assertRaises(UnicodeEncodeError,
682
 
                self._mu.encode, encoding)
 
769
                              self._mu.encode, encoding)
683
770
            encoded_msg = self._message.encode(encoding, 'replace')
684
771
        else:
685
772
            encoded_msg = self._message.encode(encoding)
686
773
 
687
774
        old_encoding = osutils._cached_user_encoding
688
775
        # This test requires that 'run_bzr' uses the current
689
 
        # bzrlib, because we override user_encoding, and expect
 
776
        # breezy, because we override user_encoding, and expect
690
777
        # it to be used
691
778
        try:
692
779
            osutils._cached_user_encoding = 'ascii'
693
780
            # We should be able to handle any encoding
694
 
            out, err = bzr('log', encoding=encoding)
 
781
            out, err = brz('log', encoding=encoding)
695
782
            if not fail:
696
783
                # Make sure we wrote mu as we expected it to exist
697
 
                self.assertNotEqual(-1, out.find(encoded_msg))
698
 
                out_unicode = out.decode(encoding)
699
 
                self.assertNotEqual(-1, out_unicode.find(self._message))
 
784
                self.assertNotEqual(-1, out.find(self._message))
700
785
            else:
701
786
                self.assertNotEqual(-1, out.find('Message with ?'))
702
787
        finally:
715
800
            self.try_encoding(encoding, fail=True)
716
801
 
717
802
    def test_stdout_encoding(self):
718
 
        bzr = self.run_bzr
 
803
        brz = self.run_bzr
719
804
        osutils._cached_user_encoding = "cp1251"
720
805
 
721
 
        bzr('init')
 
806
        brz('init')
722
807
        self.build_tree(['a'])
723
 
        bzr('add a')
724
 
        bzr(['commit', '-m', u'\u0422\u0435\u0441\u0442'])
725
 
        stdout, stderr = self.run_bzr('log', encoding='cp866')
 
808
        brz('add a')
 
809
        brz(['commit', '-m', u'\u0422\u0435\u0441\u0442'])
 
810
        stdout, stderr = self.run_bzr_raw('log', encoding='cp866')
726
811
 
727
812
        message = stdout.splitlines()[-1]
728
813
 
732
817
        # in cp1251 encoding this is string '\xd2\xe5\xf1\xf2'
733
818
        # This test should check that output of log command
734
819
        # encoded to sys.stdout.encoding
735
 
        test_in_cp866 = '\x92\xa5\xe1\xe2'
736
 
        test_in_cp1251 = '\xd2\xe5\xf1\xf2'
 
820
        test_in_cp866 = b'\x92\xa5\xe1\xe2'
 
821
        test_in_cp1251 = b'\xd2\xe5\xf1\xf2'
737
822
        # Make sure the log string is encoded in cp866
738
 
        self.assertEquals(test_in_cp866, message[2:])
 
823
        self.assertEqual(test_in_cp866, message[2:])
739
824
        # Make sure the cp1251 string is not found anywhere
740
 
        self.assertEquals(-1, stdout.find(test_in_cp1251))
 
825
        self.assertEqual(-1, stdout.find(test_in_cp1251))
741
826
 
742
827
 
743
828
class TestLogFile(TestLogWithLogCatcher):
748
833
        self.build_tree(['tree/file'])
749
834
        tree.add('file')
750
835
        tree.commit('revision 1')
751
 
        tree.bzrdir.destroy_workingtree()
 
836
        tree.controldir.destroy_workingtree()
752
837
        self.run_bzr('log tree/file')
753
838
 
754
839
    def prepare_tree(self, complex=False):
761
846
        tree.commit('add file2')
762
847
        tree.add('file3')
763
848
        tree.commit('add file3')
764
 
        child_tree = tree.bzrdir.sprout('child').open_workingtree()
765
 
        self.build_tree_contents([('child/file2', 'hello')])
 
849
        child_tree = tree.controldir.sprout('child').open_workingtree()
 
850
        self.build_tree_contents([('child/file2', b'hello')])
766
851
        child_tree.commit(message='branch 1')
767
852
        tree.merge_from_branch(child_tree.branch)
768
853
        tree.commit(message='merge child branch')
817
902
        # Check logging a deleted file is ok if the file existed
818
903
        # at the start of the revision range
819
904
        self.prepare_tree(complex=True)
820
 
        self.assertLogRevnos(['file1'], ['1'])
 
905
        self.assertLogRevnos(['file1'], [])
821
906
 
822
907
    def test_log_file_renamed(self):
823
908
        """File matched against revision range, not current tree."""
854
939
        tree.commit('add file4')
855
940
        tree.add('dir1/file5')
856
941
        tree.commit('add file5')
857
 
        child_tree = tree.bzrdir.sprout('child').open_workingtree()
858
 
        self.build_tree_contents([('child/file2', 'hello')])
 
942
        child_tree = tree.controldir.sprout('child').open_workingtree()
 
943
        self.build_tree_contents([('child/file2', b'hello')])
859
944
        child_tree.commit(message='branch 1')
860
945
        tree.merge_from_branch(child_tree.branch)
861
946
        tree.commit(message='merge child branch')
893
978
        self.prepare_tree()
894
979
        os.chdir("dir1")
895
980
        self.assertLogRevnos(['dir2', 'file5'], ['5', '3'])
 
981
 
 
982
 
 
983
class MainlineGhostTests(TestLogWithLogCatcher):
 
984
 
 
985
    def setUp(self):
 
986
        super(MainlineGhostTests, self).setUp()
 
987
        tree = self.make_branch_and_tree('')
 
988
        tree.set_parent_ids([b"spooky"], allow_leftmost_as_ghost=True)
 
989
        tree.add('')
 
990
        tree.commit('msg1', rev_id=b'rev1')
 
991
        tree.commit('msg2', rev_id=b'rev2')
 
992
 
 
993
    def test_log_range(self):
 
994
        self.assertLogRevnos(["-r1..2"], ["2", "1"])
 
995
 
 
996
    def test_log_norange(self):
 
997
        self.assertLogRevnos([], ["2", "1"])
 
998
 
 
999
    def test_log_range_open_begin(self):
 
1000
        (stdout, stderr) = self.run_bzr(['log', '-r..2'], retcode=3)
 
1001
        self.assertEqual(["2", "1"],
 
1002
                         [r.revno for r in self.get_captured_revisions()])
 
1003
        self.assertEqual("brz: ERROR: Further revision history missing.\n",
 
1004
                         stderr)
 
1005
 
 
1006
    def test_log_range_open_end(self):
 
1007
        self.assertLogRevnos(["-r1.."], ["2", "1"])
 
1008
 
 
1009
 
 
1010
class TestLogMatch(TestLogWithLogCatcher):
 
1011
 
 
1012
    def prepare_tree(self):
 
1013
        tree = self.make_branch_and_tree('')
 
1014
        self.build_tree(
 
1015
            ['/hello.txt', '/goodbye.txt'])
 
1016
        tree.add('hello.txt')
 
1017
        tree.commit(message='message1', committer='committer1',
 
1018
                    authors=['author1'])
 
1019
        tree.add('goodbye.txt')
 
1020
        tree.commit(message='message2', committer='committer2',
 
1021
                    authors=['author2'])
 
1022
 
 
1023
    def test_message(self):
 
1024
        self.prepare_tree()
 
1025
        self.assertLogRevnos(["-m", "message1"], ["1"])
 
1026
        self.assertLogRevnos(["-m", "message2"], ["2"])
 
1027
        self.assertLogRevnos(["-m", "message"], ["2", "1"])
 
1028
        self.assertLogRevnos(["-m", "message1", "-m", "message2"], ["2", "1"])
 
1029
        self.assertLogRevnos(["--match-message", "message1"], ["1"])
 
1030
        self.assertLogRevnos(["--match-message", "message2"], ["2"])
 
1031
        self.assertLogRevnos(["--match-message", "message"], ["2", "1"])
 
1032
        self.assertLogRevnos(["--match-message", "message1",
 
1033
                              "--match-message", "message2"], ["2", "1"])
 
1034
        self.assertLogRevnos(["--message", "message1"], ["1"])
 
1035
        self.assertLogRevnos(["--message", "message2"], ["2"])
 
1036
        self.assertLogRevnos(["--message", "message"], ["2", "1"])
 
1037
        self.assertLogRevnos(["--match-message", "message1",
 
1038
                              "--message", "message2"], ["2", "1"])
 
1039
        self.assertLogRevnos(["--message", "message1",
 
1040
                              "--match-message", "message2"], ["2", "1"])
 
1041
 
 
1042
    def test_committer(self):
 
1043
        self.prepare_tree()
 
1044
        self.assertLogRevnos(["-m", "committer1"], ["1"])
 
1045
        self.assertLogRevnos(["-m", "committer2"], ["2"])
 
1046
        self.assertLogRevnos(["-m", "committer"], ["2", "1"])
 
1047
        self.assertLogRevnos(["-m", "committer1", "-m", "committer2"],
 
1048
                             ["2", "1"])
 
1049
        self.assertLogRevnos(["--match-committer", "committer1"], ["1"])
 
1050
        self.assertLogRevnos(["--match-committer", "committer2"], ["2"])
 
1051
        self.assertLogRevnos(["--match-committer", "committer"], ["2", "1"])
 
1052
        self.assertLogRevnos(["--match-committer", "committer1",
 
1053
                              "--match-committer", "committer2"], ["2", "1"])
 
1054
 
 
1055
    def test_author(self):
 
1056
        self.prepare_tree()
 
1057
        self.assertLogRevnos(["-m", "author1"], ["1"])
 
1058
        self.assertLogRevnos(["-m", "author2"], ["2"])
 
1059
        self.assertLogRevnos(["-m", "author"], ["2", "1"])
 
1060
        self.assertLogRevnos(["-m", "author1", "-m", "author2"],
 
1061
                             ["2", "1"])
 
1062
        self.assertLogRevnos(["--match-author", "author1"], ["1"])
 
1063
        self.assertLogRevnos(["--match-author", "author2"], ["2"])
 
1064
        self.assertLogRevnos(["--match-author", "author"], ["2", "1"])
 
1065
        self.assertLogRevnos(["--match-author", "author1",
 
1066
                              "--match-author", "author2"], ["2", "1"])