/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: Jelmer Vernooij
  • Date: 2020-09-02 16:35:18 UTC
  • mto: (7490.40.109 work)
  • mto: This revision was merged to the branch mainline in revision 7526.
  • Revision ID: jelmer@jelmer.uk-20200902163518-sy9f4unbboljphgu
Handle duplicate directories entries for git.

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