/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: 2018-07-08 14:45:27 UTC
  • mto: This revision was merged to the branch mainline in revision 7036.
  • Revision ID: jelmer@jelmer.uk-20180708144527-codhlvdcdg9y0nji
Fix a bunch of merge tests.

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.tests import (
33
33
    test_log,
 
34
    features,
34
35
    )
 
36
from breezy.tests.matchers import ContainsNoVfsCalls
35
37
 
36
38
 
37
39
class TestLog(tests.TestCaseWithTransport, test_log.TestLogMixin):
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',
 
62
        tree2 = tree.controldir.sprout('tree2',
61
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')
77
79
                self.log_catcher = test_log.LogCatcher(*args, **kwargs)
78
80
                # Always return our own log formatter
79
81
                return self.log_catcher
 
82
        # Break cycle with closure over self on cleanup by removing method
 
83
        self.addCleanup(setattr, MyLogFormatter, "__new__", None)
80
84
 
81
85
        def getme(branch):
82
86
                # Always return our own log formatter class hijacking the
88
92
    def get_captured_revisions(self):
89
93
        return self.log_catcher.revisions
90
94
 
91
 
    def assertLogRevnos(self, args, expected_revnos, working_dir='.'):
92
 
        self.run_bzr(['log'] + args, working_dir=working_dir)
 
95
    def assertLogRevnos(self, args, expected_revnos, working_dir='.',
 
96
                        out=b'', err=b''):
 
97
        actual_out, actual_err = self.run_bzr(['log'] + args,
 
98
                                              working_dir=working_dir)
 
99
        self.assertEqual(out, actual_out)
 
100
        self.assertEqual(err, actual_err)
93
101
        self.assertEqual(expected_revnos,
94
102
                         [r.revno for r in self.get_captured_revisions()])
95
103
 
158
166
        self.make_linear_branch()
159
167
        self.assertLogRevnos(['-c1'], ['1'])
160
168
 
 
169
    def test_branch_revspec(self):
 
170
        foo = self.make_branch_and_tree('foo')
 
171
        bar = self.make_branch_and_tree('bar')
 
172
        self.build_tree(['foo/foo.txt', 'bar/bar.txt'])
 
173
        foo.add('foo.txt')
 
174
        bar.add('bar.txt')
 
175
        foo.commit(message='foo')
 
176
        bar.commit(message='bar')
 
177
        self.run_bzr('log -r branch:../bar', working_dir='foo')
 
178
        self.assertEqual([bar.branch.get_rev_id(1)],
 
179
                         [r.rev.revision_id
 
180
                          for r in self.get_captured_revisions()])
 
181
 
 
182
 
 
183
class TestLogExcludeCommonAncestry(TestLogWithLogCatcher):
 
184
 
 
185
    def test_exclude_common_ancestry_simple_revnos(self):
 
186
        self.make_linear_branch()
 
187
        self.assertLogRevnos(['-r1..3', '--exclude-common-ancestry'],
 
188
                             ['3', '2'])
 
189
 
161
190
 
162
191
class TestLogMergedLinearAncestry(TestLogWithLogCatcher):
163
192
 
167
196
        # stop calling run_bzr, there is no point) --vila 100118.
168
197
        builder = branchbuilder.BranchBuilder(self.get_transport())
169
198
        builder.start_series()
 
199
        # 1
 
200
        # | \
 
201
        # 2  1.1.1
 
202
        # | / |
 
203
        # 3  1.1.2
 
204
        # |   |
 
205
        # |  1.1.3
 
206
        # | / |
 
207
        # 4  1.1.4
 
208
        # | /
 
209
        # 5
 
210
        # | \
 
211
        # | 5.1.1
 
212
        # | /
 
213
        # 6
 
214
 
170
215
        # mainline
171
 
        builder.build_snapshot('1', None, [
172
 
            ('add', ('', 'root-id', 'directory', ''))])
173
 
        builder.build_snapshot('2', ['1'], [])
 
216
        builder.build_snapshot(None, [
 
217
            ('add', ('', b'root-id', 'directory', ''))],
 
218
            revision_id=b'1')
 
219
        builder.build_snapshot([b'1'], [], revision_id=b'2')
174
220
        # branch
175
 
        builder.build_snapshot('1.1.1', ['1'], [])
 
221
        builder.build_snapshot([b'1'], [], revision_id=b'1.1.1')
176
222
        # merge branch into mainline
177
 
        builder.build_snapshot('3', ['2', '1.1.1'], [])
 
223
        builder.build_snapshot([b'2', '1.1.1'], [], revision_id=b'3')
178
224
        # new commits in branch
179
 
        builder.build_snapshot('1.1.2', ['1.1.1'], [])
180
 
        builder.build_snapshot('1.1.3', ['1.1.2'], [])
 
225
        builder.build_snapshot([b'1.1.1'], [], revision_id=b'1.1.2')
 
226
        builder.build_snapshot([b'1.1.2'], [], revision_id=b'1.1.3')
181
227
        # merge branch into mainline
182
 
        builder.build_snapshot('4', ['3', '1.1.3'], [])
 
228
        builder.build_snapshot([b'3', b'1.1.3'], [], revision_id=b'4')
183
229
        # merge mainline into branch
184
 
        builder.build_snapshot('1.1.4', ['1.1.3', '4'], [])
 
230
        builder.build_snapshot([b'1.1.3', b'4'], [], revision_id=b'1.1.4')
185
231
        # merge branch into mainline
186
 
        builder.build_snapshot('5', ['4', '1.1.4'], [])
 
232
        builder.build_snapshot([b'4', b'1.1.4'], [], revision_id=b'5')
 
233
        builder.build_snapshot([b'5'], [], revision_id=b'5.1.1')
 
234
        builder.build_snapshot([b'5', b'5.1.1'], [], revision_id=b'6')
187
235
        builder.finish_series()
188
236
 
189
237
    def test_n0(self):
190
238
        self.assertLogRevnos(['-n0', '-r1.1.1..1.1.4'],
191
 
                             ['1.1.4', '4', '1.1.3', '1.1.2', '3', '1.1.1'])
 
239
                             [b'1.1.4', b'4', b'1.1.3', b'1.1.2', b'3', b'1.1.1'])
 
240
 
192
241
    def test_n0_forward(self):
193
242
        self.assertLogRevnos(['-n0', '-r1.1.1..1.1.4', '--forward'],
194
 
                             ['3', '1.1.1', '4', '1.1.2', '1.1.3', '1.1.4'])
 
243
                             [b'3', b'1.1.1', b'4', b'1.1.2', b'1.1.3', b'1.1.4'])
195
244
 
196
245
    def test_n1(self):
197
246
        # starting from 1.1.4 we follow the left-hand ancestry
198
247
        self.assertLogRevnos(['-n1', '-r1.1.1..1.1.4'],
199
 
                             ['1.1.4', '1.1.3', '1.1.2', '1.1.1'])
 
248
                             [b'1.1.4', b'1.1.3', b'1.1.2', b'1.1.1'])
200
249
 
201
250
    def test_n1_forward(self):
202
251
        self.assertLogRevnos(['-n1', '-r1.1.1..1.1.4', '--forward'],
203
 
                             ['1.1.1', '1.1.2', '1.1.3', '1.1.4'])
 
252
                             [b'1.1.1', b'1.1.2', b'1.1.3', b'1.1.4'])
 
253
 
 
254
    def test_fallback_when_end_rev_is_not_on_mainline(self):
 
255
        self.assertLogRevnos(['-n1', '-r1.1.1..5.1.1'],
 
256
                             # We don't get 1.1.1 because we say -n1
 
257
                             [b'5.1.1', b'5', b'4', b'3'])
204
258
 
205
259
 
206
260
class Test_GenerateAllRevisions(TestLogWithLogCatcher):
219
273
        # The graph below may look a bit complicated (and it may be but I've
220
274
        # banged my head enough on it) but the bug requires at least dotted
221
275
        # 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'], [])
 
276
        # 1
 
277
        # | \
 
278
        # 2  1.1.1
 
279
        # | X
 
280
        # 3  2.1.1
 
281
        # |   |    \
 
282
        # |  2.1.2  2.2.1
 
283
        # |   |    X
 
284
        # |  2.1.3  \
 
285
        # | /       /
 
286
        # 4        /
 
287
        # |       /
 
288
        # 5 -----/
 
289
        builder.build_snapshot(None, [
 
290
            ('add', ('', b'root-id', 'directory', ''))], revision_id=b'1')
 
291
        builder.build_snapshot([b'1'], [], revision_id=b'2')
 
292
        builder.build_snapshot([b'1'], [], revision_id=b'1.1.1')
 
293
        builder.build_snapshot([b'2'], [], revision_id=b'2.1.1')
 
294
        builder.build_snapshot([b'2', b'1.1.1'], [], revision_id=b'3')
 
295
        builder.build_snapshot([b'2.1.1'], [], revision_id=b'2.1.2')
 
296
        builder.build_snapshot([b'2.1.1'], [], revision_id=b'2.2.1')
 
297
        builder.build_snapshot([b'2.1.2', b'2.2.1'], [], revision_id=b'2.1.3')
 
298
        builder.build_snapshot([b'3', b'2.1.3'], [], revision_id=b'4')
 
299
        builder.build_snapshot([b'4', b'2.1.2'], [], revision_id=b'5')
233
300
        builder.finish_series()
234
301
        return builder
235
302
 
263
330
    def test_log_revno_n_path_correct_order(self):
264
331
        self.make_linear_branch('branch2')
265
332
        self.assertLogRevnos(['-rrevno:1:branch2..revno:3:branch2'],
266
 
                             ['3', '2','1'])
 
333
                             ['3', '2', '1'])
267
334
 
268
335
    def test_log_revno_n_path(self):
269
336
        self.make_linear_branch('branch2')
270
337
        self.assertLogRevnos(['-rrevno:1:branch2'],
271
338
                             ['1'])
272
339
        rev_props = self.log_catcher.revisions[0].rev.properties
273
 
        self.assertEqual('branch2', rev_props['branch-nick'])
 
340
        self.assertEqual('branch2', rev_props[u'branch-nick'])
274
341
 
275
342
 
276
343
class TestLogErrors(TestLog):
277
344
 
278
345
    def test_log_zero_revspec(self):
279
346
        self.make_minimal_branch()
280
 
        self.run_bzr_error(['bzr: ERROR: Logging revision 0 is invalid.'],
 
347
        self.run_bzr_error([b'brz: ERROR: Logging revision 0 is invalid.'],
281
348
                           ['log', '-r0'])
282
349
 
283
350
    def test_log_zero_begin_revspec(self):
284
351
        self.make_linear_branch()
285
 
        self.run_bzr_error(['bzr: ERROR: Logging revision 0 is invalid.'],
 
352
        self.run_bzr_error([b'brz: ERROR: Logging revision 0 is invalid.'],
286
353
                           ['log', '-r0..2'])
287
354
 
288
355
    def test_log_zero_end_revspec(self):
289
356
        self.make_linear_branch()
290
 
        self.run_bzr_error(['bzr: ERROR: Logging revision 0 is invalid.'],
 
357
        self.run_bzr_error([b'brz: ERROR: Logging revision 0 is invalid.'],
291
358
                           ['log', '-r-2..0'])
292
359
 
293
360
    def test_log_nonexistent_revno(self):
294
361
        self.make_minimal_branch()
295
 
        self.run_bzr_error(["bzr: ERROR: Requested revision: '1234' "
296
 
                            "does not exist in branch:"],
 
362
        self.run_bzr_error([b"brz: ERROR: Requested revision: '1234' "
 
363
                            b"does not exist in branch:"],
297
364
                           ['log', '-r1234'])
298
365
 
299
366
    def test_log_nonexistent_dotted_revno(self):
300
367
        self.make_minimal_branch()
301
 
        self.run_bzr_error(["bzr: ERROR: Requested revision: '123.123' "
302
 
                            "does not exist in branch:"],
 
368
        self.run_bzr_error([b"brz: ERROR: Requested revision: '123.123' "
 
369
                            b"does not exist in branch:"],
303
370
                           ['log',  '-r123.123'])
304
371
 
305
372
    def test_log_change_nonexistent_revno(self):
306
373
        self.make_minimal_branch()
307
 
        self.run_bzr_error(["bzr: ERROR: Requested revision: '1234' "
308
 
                            "does not exist in branch:"],
 
374
        self.run_bzr_error([b"brz: ERROR: Requested revision: '1234' "
 
375
                            b"does not exist in branch:"],
309
376
                           ['log',  '-c1234'])
310
377
 
311
378
    def test_log_change_nonexistent_dotted_revno(self):
312
379
        self.make_minimal_branch()
313
 
        self.run_bzr_error(["bzr: ERROR: Requested revision: '123.123' "
314
 
                            "does not exist in branch:"],
 
380
        self.run_bzr_error([b"brz: ERROR: Requested revision: '123.123' "
 
381
                            b"does not exist in branch:"],
315
382
                           ['log', '-c123.123'])
316
383
 
317
384
    def test_log_change_single_revno_only(self):
318
385
        self.make_minimal_branch()
319
 
        self.run_bzr_error(['bzr: ERROR: Option --change does not'
320
 
                           ' accept revision ranges'],
 
386
        self.run_bzr_error([b'brz: ERROR: Option --change does not'
 
387
                           b' accept revision ranges'],
321
388
                           ['log', '--change', '2..3'])
322
389
 
323
390
    def test_log_change_incompatible_with_revision(self):
324
 
        self.run_bzr_error(['bzr: ERROR: --revision and --change'
325
 
                           ' are mutually exclusive'],
 
391
        self.run_bzr_error([b'brz: ERROR: --revision and --change'
 
392
                           b' are mutually exclusive'],
326
393
                           ['log', '--change', '2', '--revision', '3'])
327
394
 
328
395
    def test_log_nonexistent_file(self):
331
398
        # should give an error
332
399
        out, err = self.run_bzr('log does-not-exist', retcode=3)
333
400
        self.assertContainsRe(err,
334
 
                              'Path unknown at end or start of revision range: '
335
 
                              'does-not-exist')
 
401
                              b'Path unknown at end or start of revision range: '
 
402
                              b'does-not-exist')
336
403
 
337
404
    def test_log_reversed_revspecs(self):
338
405
        self.make_linear_branch()
339
 
        self.run_bzr_error(('bzr: ERROR: Start revision must be older than '
340
 
                            'the end revision.\n',),
 
406
        self.run_bzr_error((b'brz: ERROR: Start revision must be older than '
 
407
                            b'the end revision.\n',),
341
408
                           ['log', '-r3..1'])
342
409
 
343
410
    def test_log_reversed_dotted_revspecs(self):
344
411
        self.make_merged_branch()
345
 
        self.run_bzr_error(('bzr: ERROR: Start revision not found in '
346
 
                            'left-hand history of end revision.\n',),
 
412
        self.run_bzr_error((b'brz: ERROR: Start revision not found in '
 
413
                            b'history of end revision.\n',),
347
414
                           "log -r 1.1.1..1")
348
415
 
349
416
    def test_log_bad_message_re(self):
350
417
        """Bad --message argument gives a sensible message
351
 
        
 
418
 
352
419
        See https://bugs.launchpad.net/bzr/+bug/251352
353
420
        """
354
421
        self.make_minimal_branch()
355
422
        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)
 
423
        self.assertContainsRe(err, b"ERROR.*Invalid pattern.*nothing to repeat")
 
424
        self.assertNotContainsRe(err, b"Unprintable exception")
 
425
        self.assertEqual(out, b'')
361
426
 
362
427
    def test_log_unsupported_timezone(self):
363
428
        self.make_linear_branch()
364
 
        self.run_bzr_error(['bzr: ERROR: Unsupported timezone format "foo", '
365
 
                            'options are "utc", "original", "local".'],
 
429
        self.run_bzr_error([b'brz: ERROR: Unsupported timezone format "foo", '
 
430
                            b'options are "utc", "original", "local".'],
366
431
                           ['log', '--timezone', 'foo'])
367
432
 
368
433
    def test_log_exclude_ancestry_no_range(self):
369
434
        self.make_linear_branch()
370
 
        self.run_bzr_error(['bzr: ERROR: --exclude-common-ancestry'
371
 
                            ' requires -r with two revisions'],
 
435
        self.run_bzr_error([b'brz: ERROR: --exclude-common-ancestry'
 
436
                            b' requires -r with two revisions'],
372
437
                           ['log', '--exclude-common-ancestry'])
373
438
 
374
439
    def test_log_exclude_ancestry_single_revision(self):
375
440
        self.make_merged_branch()
376
 
        self.run_bzr_error(['bzr: ERROR: --exclude-common-ancestry'
377
 
                            ' requires two different revisions'],
 
441
        self.run_bzr_error([b'brz: ERROR: --exclude-common-ancestry'
 
442
                            b' requires two different revisions'],
378
443
                           ['log', '--exclude-common-ancestry',
379
444
                            '-r1.1.1..1.1.1'])
380
445
 
399
464
        branch1_tree = self.make_linear_branch('branch1',
400
465
                                               format='dirstate-tags')
401
466
        branch1 = branch1_tree.branch
402
 
        branch2_tree = branch1_tree.bzrdir.sprout('branch2').open_workingtree()
 
467
        branch2_tree = branch1_tree.controldir.sprout('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
406
471
        self.run_bzr('merge ../branch1', working_dir='branch2')
407
472
        branch2_tree.commit(message='merge branch 1')
408
473
        log = self.run_bzr("log -n0 -r-1", working_dir='branch2')[0]
409
 
        self.assertContainsRe(log, r'    tags: tag1')
 
474
        self.assertContainsRe(log, br'    tags: tag1')
410
475
        log = self.run_bzr("log -n0 -r3.1.1", working_dir='branch2')[0]
411
 
        self.assertContainsRe(log, r'tags: tag1')
 
476
        self.assertContainsRe(log, br'tags: tag1')
 
477
 
 
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(b'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(b'signature: no signature' in log)
412
496
 
413
497
 
414
498
class TestLogVerbose(TestLog):
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, b'(?m)^\\s*A  hello.txt$')
 
508
        self.assertNotContainsRe(log, b'(?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, b'(?m)^\\s*A  hello.txt$')
 
514
        self.assertContainsRe(log, b'(?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')
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'],
518
598
                [('2', 0), ('1.1.2', 1), ('1.2.1', 2)],
519
599
                working_dir='level0')
520
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')
 
608
 
521
609
 
522
610
class TestLogDiff(TestLogWithLogCatcher):
523
611
 
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')
591
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),
625
713
    def test_log_show_diff_non_ascii(self):
626
714
        # Smoke test for bug #328007 UnicodeDecodeError on 'log -p'
627
715
        message = u'Message with \xb5'
628
 
        body = 'Body with \xb5\n'
 
716
        body = b'Body with \xb5\n'
629
717
        wt = self.make_branch_and_tree('.')
630
718
        self.build_tree_contents([('foo', body)])
631
719
        wt.add('foo')
632
720
        wt.commit(message=message)
633
721
        # check that command won't fail with unicode error
634
722
        # 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')
642
 
        self.assertNotEqual('', out)
643
 
        self.assertEqual('', err)
 
723
        out, err = self.run_bzr('log -p --long')
 
724
        self.assertNotEqual(b'', out)
 
725
        self.assertEqual(b'', err)
 
726
        out, err = self.run_bzr('log -p --short')
 
727
        self.assertNotEqual(b'', out)
 
728
        self.assertEqual(b'', err)
 
729
        out, err = self.run_bzr('log -p --line')
 
730
        self.assertNotEqual(b'', out)
 
731
        self.assertEqual(b'', err)
644
732
 
645
733
 
646
734
class TestLogEncodings(tests.TestCaseInTempDir):
669
757
        self.overrideAttr(osutils, '_cached_user_encoding')
670
758
 
671
759
    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])
 
760
        brz = self.run_bzr
 
761
        brz('init')
 
762
        self.build_tree_contents([('a', b'some stuff\n')])
 
763
        brz('add a')
 
764
        brz(['commit', '-m', self._message])
677
765
 
678
766
    def try_encoding(self, encoding, fail=False):
679
 
        bzr = self.run_bzr
 
767
        brz = self.run_bzr
680
768
        if fail:
681
769
            self.assertRaises(UnicodeEncodeError,
682
770
                self._mu.encode, encoding)
686
774
 
687
775
        old_encoding = osutils._cached_user_encoding
688
776
        # This test requires that 'run_bzr' uses the current
689
 
        # bzrlib, because we override user_encoding, and expect
 
777
        # breezy, because we override user_encoding, and expect
690
778
        # it to be used
691
779
        try:
692
780
            osutils._cached_user_encoding = 'ascii'
693
781
            # We should be able to handle any encoding
694
 
            out, err = bzr('log', encoding=encoding)
 
782
            out, err = brz('log', encoding=encoding)
695
783
            if not fail:
696
784
                # Make sure we wrote mu as we expected it to exist
697
785
                self.assertNotEqual(-1, out.find(encoded_msg))
715
803
            self.try_encoding(encoding, fail=True)
716
804
 
717
805
    def test_stdout_encoding(self):
718
 
        bzr = self.run_bzr
 
806
        brz = self.run_bzr
719
807
        osutils._cached_user_encoding = "cp1251"
720
808
 
721
 
        bzr('init')
 
809
        brz('init')
722
810
        self.build_tree(['a'])
723
 
        bzr('add a')
724
 
        bzr(['commit', '-m', u'\u0422\u0435\u0441\u0442'])
 
811
        brz('add a')
 
812
        brz(['commit', '-m', u'\u0422\u0435\u0441\u0442'])
725
813
        stdout, stderr = self.run_bzr('log', encoding='cp866')
726
814
 
727
815
        message = stdout.splitlines()[-1]
735
823
        test_in_cp866 = '\x92\xa5\xe1\xe2'
736
824
        test_in_cp1251 = '\xd2\xe5\xf1\xf2'
737
825
        # Make sure the log string is encoded in cp866
738
 
        self.assertEquals(test_in_cp866, message[2:])
 
826
        self.assertEqual(test_in_cp866, message[2:])
739
827
        # Make sure the cp1251 string is not found anywhere
740
 
        self.assertEquals(-1, stdout.find(test_in_cp1251))
 
828
        self.assertEqual(-1, stdout.find(test_in_cp1251))
741
829
 
742
830
 
743
831
class TestLogFile(TestLogWithLogCatcher):
748
836
        self.build_tree(['tree/file'])
749
837
        tree.add('file')
750
838
        tree.commit('revision 1')
751
 
        tree.bzrdir.destroy_workingtree()
 
839
        tree.controldir.destroy_workingtree()
752
840
        self.run_bzr('log tree/file')
753
841
 
754
842
    def prepare_tree(self, complex=False):
761
849
        tree.commit('add file2')
762
850
        tree.add('file3')
763
851
        tree.commit('add file3')
764
 
        child_tree = tree.bzrdir.sprout('child').open_workingtree()
765
 
        self.build_tree_contents([('child/file2', 'hello')])
 
852
        child_tree = tree.controldir.sprout('child').open_workingtree()
 
853
        self.build_tree_contents([('child/file2', b'hello')])
766
854
        child_tree.commit(message='branch 1')
767
855
        tree.merge_from_branch(child_tree.branch)
768
856
        tree.commit(message='merge child branch')
803
891
        # Check logging a deleted file gives an error if the
804
892
        # file isn't found at the end or start of the revision range
805
893
        self.prepare_tree(complex=True)
806
 
        err_msg = "Path unknown at end or start of revision range: file2"
 
894
        err_msg = b"Path unknown at end or start of revision range: file2"
807
895
        err = self.run_bzr('log file2', retcode=3)[1]
808
896
        self.assertContainsRe(err, err_msg)
809
897
 
824
912
        self.prepare_tree(complex=True)
825
913
 
826
914
        # Check logging a renamed file gives an error by default
827
 
        err_msg = "Path unknown at end or start of revision range: file3"
 
915
        err_msg = b"Path unknown at end or start of revision range: file3"
828
916
        err = self.run_bzr('log file3', retcode=3)[1]
829
917
        self.assertContainsRe(err, err_msg)
830
918
 
854
942
        tree.commit('add file4')
855
943
        tree.add('dir1/file5')
856
944
        tree.commit('add file5')
857
 
        child_tree = tree.bzrdir.sprout('child').open_workingtree()
858
 
        self.build_tree_contents([('child/file2', 'hello')])
 
945
        child_tree = tree.controldir.sprout('child').open_workingtree()
 
946
        self.build_tree_contents([('child/file2', b'hello')])
859
947
        child_tree.commit(message='branch 1')
860
948
        tree.merge_from_branch(child_tree.branch)
861
949
        tree.commit(message='merge child branch')
893
981
        self.prepare_tree()
894
982
        os.chdir("dir1")
895
983
        self.assertLogRevnos(['dir2', 'file5'], ['5', '3'])
 
984
 
 
985
 
 
986
class MainlineGhostTests(TestLogWithLogCatcher):
 
987
 
 
988
    def setUp(self):
 
989
        super(MainlineGhostTests, self).setUp()
 
990
        tree = self.make_branch_and_tree('')
 
991
        tree.set_parent_ids(["spooky"], allow_leftmost_as_ghost=True)
 
992
        tree.add('')
 
993
        tree.commit('msg1', rev_id=b'rev1')
 
994
        tree.commit('msg2', rev_id=b'rev2')
 
995
 
 
996
    def test_log_range(self):
 
997
        self.assertLogRevnos(["-r1..2"], ["2", "1"])
 
998
 
 
999
    def test_log_norange(self):
 
1000
        self.assertLogRevnos([], ["2", "1"])
 
1001
 
 
1002
    def test_log_range_open_begin(self):
 
1003
        (stdout, stderr) = self.run_bzr(['log', '-r..2'], retcode=3)
 
1004
        self.assertEqual(["2", "1"],
 
1005
                         [r.revno for r in self.get_captured_revisions()])
 
1006
        self.assertEqual("brz: ERROR: Further revision history missing.\n",
 
1007
                stderr)
 
1008
 
 
1009
    def test_log_range_open_end(self):
 
1010
        self.assertLogRevnos(["-r1.."], ["2", "1"])
 
1011
 
 
1012
 
 
1013
class TestLogMatch(TestLogWithLogCatcher):
 
1014
 
 
1015
    def prepare_tree(self):
 
1016
        tree = self.make_branch_and_tree('')
 
1017
        self.build_tree(
 
1018
            ['/hello.txt', '/goodbye.txt'])
 
1019
        tree.add('hello.txt')
 
1020
        tree.commit(message='message1', committer='committer1', authors=['author1'])
 
1021
        tree.add('goodbye.txt')
 
1022
        tree.commit(message='message2', committer='committer2', authors=['author2'])
 
1023
 
 
1024
    def test_message(self):
 
1025
        self.prepare_tree()
 
1026
        self.assertLogRevnos(["-m", "message1"], ["1"])
 
1027
        self.assertLogRevnos(["-m", "message2"], ["2"])
 
1028
        self.assertLogRevnos(["-m", "message"], ["2", "1"])
 
1029
        self.assertLogRevnos(["-m", "message1", "-m", "message2"], ["2", "1"])
 
1030
        self.assertLogRevnos(["--match-message", "message1"], ["1"])
 
1031
        self.assertLogRevnos(["--match-message", "message2"], ["2"])
 
1032
        self.assertLogRevnos(["--match-message", "message"], ["2", "1"])
 
1033
        self.assertLogRevnos(["--match-message", "message1", 
 
1034
                              "--match-message", "message2"], ["2", "1"])
 
1035
        self.assertLogRevnos(["--message", "message1"], ["1"])
 
1036
        self.assertLogRevnos(["--message", "message2"], ["2"])
 
1037
        self.assertLogRevnos(["--message", "message"], ["2", "1"])
 
1038
        self.assertLogRevnos(["--match-message", "message1", 
 
1039
                              "--message", "message2"], ["2", "1"])
 
1040
        self.assertLogRevnos(["--message", "message1", 
 
1041
                              "--match-message", "message2"], ["2", "1"])
 
1042
 
 
1043
    def test_committer(self):
 
1044
        self.prepare_tree()
 
1045
        self.assertLogRevnos(["-m", "committer1"], ["1"])
 
1046
        self.assertLogRevnos(["-m", "committer2"], ["2"])
 
1047
        self.assertLogRevnos(["-m", "committer"], ["2", "1"])
 
1048
        self.assertLogRevnos(["-m", "committer1", "-m", "committer2"], 
 
1049
                             ["2", "1"])
 
1050
        self.assertLogRevnos(["--match-committer", "committer1"], ["1"])
 
1051
        self.assertLogRevnos(["--match-committer", "committer2"], ["2"])
 
1052
        self.assertLogRevnos(["--match-committer", "committer"], ["2", "1"])
 
1053
        self.assertLogRevnos(["--match-committer", "committer1", 
 
1054
                              "--match-committer", "committer2"], ["2", "1"])
 
1055
 
 
1056
    def test_author(self):
 
1057
        self.prepare_tree()
 
1058
        self.assertLogRevnos(["-m", "author1"], ["1"])
 
1059
        self.assertLogRevnos(["-m", "author2"], ["2"])
 
1060
        self.assertLogRevnos(["-m", "author"], ["2", "1"])
 
1061
        self.assertLogRevnos(["-m", "author1", "-m", "author2"], 
 
1062
                             ["2", "1"])
 
1063
        self.assertLogRevnos(["--match-author", "author1"], ["1"])
 
1064
        self.assertLogRevnos(["--match-author", "author2"], ["2"])
 
1065
        self.assertLogRevnos(["--match-author", "author"], ["2", "1"])
 
1066
        self.assertLogRevnos(["--match-author", "author1", 
 
1067
                              "--match-author", "author2"], ["2", "1"])
 
1068
 
 
1069
 
 
1070
class TestSmartServerLog(tests.TestCaseWithTransport):
 
1071
 
 
1072
    def test_standard_log(self):
 
1073
        self.setup_smart_server_with_call_log()
 
1074
        t = self.make_branch_and_tree('branch')
 
1075
        self.build_tree_contents([('branch/foo', b'thecontents')])
 
1076
        t.add("foo")
 
1077
        t.commit("message")
 
1078
        self.reset_smart_call_log()
 
1079
        out, err = self.run_bzr(['log', self.get_url('branch')])
 
1080
        # This figure represent the amount of work to perform this use case. It
 
1081
        # is entirely ok to reduce this number if a test fails due to rpc_count
 
1082
        # being too low. If rpc_count increases, more network roundtrips have
 
1083
        # become necessary for this use case. Please do not adjust this number
 
1084
        # upwards without agreement from bzr's network support maintainers.
 
1085
        self.assertThat(self.hpss_calls, ContainsNoVfsCalls)
 
1086
        self.assertLength(1, self.hpss_connections)
 
1087
        self.assertLength(9, self.hpss_calls)
 
1088
 
 
1089
    def test_verbose_log(self):
 
1090
        self.setup_smart_server_with_call_log()
 
1091
        t = self.make_branch_and_tree('branch')
 
1092
        self.build_tree_contents([('branch/foo', b'thecontents')])
 
1093
        t.add("foo")
 
1094
        t.commit("message")
 
1095
        self.reset_smart_call_log()
 
1096
        out, err = self.run_bzr(['log', '-v', self.get_url('branch')])
 
1097
        # This figure represent the amount of work to perform this use case. It
 
1098
        # is entirely ok to reduce this number if a test fails due to rpc_count
 
1099
        # being too low. If rpc_count increases, more network roundtrips have
 
1100
        # become necessary for this use case. Please do not adjust this number
 
1101
        # upwards without agreement from bzr's network support maintainers.
 
1102
        self.assertLength(10, self.hpss_calls)
 
1103
        self.assertLength(1, self.hpss_connections)
 
1104
        self.assertThat(self.hpss_calls, ContainsNoVfsCalls)
 
1105
 
 
1106
    def test_per_file(self):
 
1107
        self.setup_smart_server_with_call_log()
 
1108
        t = self.make_branch_and_tree('branch')
 
1109
        self.build_tree_contents([('branch/foo', b'thecontents')])
 
1110
        t.add("foo")
 
1111
        t.commit("message")
 
1112
        self.reset_smart_call_log()
 
1113
        out, err = self.run_bzr(['log', '-v', self.get_url('branch') + "/foo"])
 
1114
        # This figure represent the amount of work to perform this use case. It
 
1115
        # is entirely ok to reduce this number if a test fails due to rpc_count
 
1116
        # being too low. If rpc_count increases, more network roundtrips have
 
1117
        # become necessary for this use case. Please do not adjust this number
 
1118
        # upwards without agreement from bzr's network support maintainers.
 
1119
        self.assertLength(14, self.hpss_calls)
 
1120
        self.assertLength(1, self.hpss_connections)
 
1121
        self.assertThat(self.hpss_calls, ContainsNoVfsCalls)