/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 bzrlib/tests/blackbox/test_log.py

  • Committer: Robert Collins
  • Date: 2010-05-06 23:41:35 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100506234135-yivbzczw1sejxnxc
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
expected to return an object which can be used to unlock them. This reduces
duplicate code when using cleanups. The previous 'tokens's returned by
``Branch.lock_write`` and ``Repository.lock_write`` are now attributes
on the result of the lock_write. ``repository.RepositoryWriteLockResult``
and ``branch.BranchWriteLockResult`` document this. (Robert Collins)

``log._get_info_for_log_files`` now takes an add_cleanup callable.
(Robert Collins)

Show diffs side-by-side

added added

removed removed

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