/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: 2019-10-13 17:31:55 UTC
  • mfrom: (7397.4.9 remove-unused)
  • Revision ID: breezy.the.bot@gmail.com-20191013173155-yoiokny4mknxb3um
Remove Tree.has_id.

Merged from https://code.launchpad.net/~jelmer/brz/remove-unused/+merge/373320

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