← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Jelmer Vernooij
  • Date: 2011-09-26 15:21:01 UTC
  • mfrom: (6165.2.3 avoid-revision-history)
  • mto: This revision was merged to the branch mainline in revision 6216.
  • Revision ID: jelmer@samba.org-20110926152101-afcxw1hikybyivfd
merge avoid-revision-history.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_log.py
19
19
 
20
20
from itertools import izip
21
21
import os
22
 
import re
23
22
 
24
23
from bzrlib import (
25
24
    branchbuilder,
29
28
    tests,
30
29
    )
31
30
from bzrlib.tests import (
32
 
    script,
33
31
    test_log,
 
32
    features,
34
33
    )
35
34
 
36
35
 
77
76
                self.log_catcher = test_log.LogCatcher(*args, **kwargs)
78
77
                # Always return our own log formatter
79
78
                return self.log_catcher
 
79
        # Break cycle with closure over self on cleanup by removing method
 
80
        self.addCleanup(setattr, MyLogFormatter, "__new__", None)
80
81
 
81
82
        def getme(branch):
82
83
                # Always return our own log formatter class hijacking the
88
89
    def get_captured_revisions(self):
89
90
        return self.log_catcher.revisions
90
91
 
91
 
    def assertLogRevnos(self, args, expected_revnos, working_dir='.'):
92
 
        self.run_bzr(['log'] + args, working_dir=working_dir)
 
92
    def assertLogRevnos(self, args, expected_revnos, working_dir='.',
 
93
                        out='', err=''):
 
94
        actual_out, actual_err = self.run_bzr(['log'] + args,
 
95
                                              working_dir=working_dir)
 
96
        self.assertEqual(out, actual_out)
 
97
        self.assertEqual(err, actual_err)
93
98
        self.assertEqual(expected_revnos,
94
99
                         [r.revno for r in self.get_captured_revisions()])
95
100
 
158
163
        self.make_linear_branch()
159
164
        self.assertLogRevnos(['-c1'], ['1'])
160
165
 
 
166
    def test_branch_revspec(self):
 
167
        foo = self.make_branch_and_tree('foo')
 
168
        bar = self.make_branch_and_tree('bar')
 
169
        self.build_tree(['foo/foo.txt', 'bar/bar.txt'])
 
170
        foo.add('foo.txt')
 
171
        bar.add('bar.txt')
 
172
        foo.commit(message='foo')
 
173
        bar.commit(message='bar')
 
174
        self.run_bzr('log -r branch:../bar', working_dir='foo')
 
175
        self.assertEqual([bar.branch.get_rev_id(1)],
 
176
                         [r.rev.revision_id
 
177
                          for r in self.get_captured_revisions()])
 
178
 
 
179
 
 
180
class TestLogExcludeCommonAncestry(TestLogWithLogCatcher):
 
181
 
 
182
    def test_exclude_common_ancestry_simple_revnos(self):
 
183
        self.make_linear_branch()
 
184
        self.assertLogRevnos(['-r1..3', '--exclude-common-ancestry'],
 
185
                             ['3', '2'])
 
186
 
161
187
 
162
188
class TestLogMergedLinearAncestry(TestLogWithLogCatcher):
163
189
 
167
193
        # stop calling run_bzr, there is no point) --vila 100118.
168
194
        builder = branchbuilder.BranchBuilder(self.get_transport())
169
195
        builder.start_series()
 
196
        # 1
 
197
        # | \
 
198
        # 2  1.1.1
 
199
        # | / |
 
200
        # 3  1.1.2
 
201
        # |   |
 
202
        # |  1.1.3
 
203
        # | / |
 
204
        # 4  1.1.4
 
205
        # | /
 
206
        # 5
 
207
 
170
208
        # mainline
171
209
        builder.build_snapshot('1', None, [
172
210
            ('add', ('', 'root-id', 'directory', ''))])
205
243
 
206
244
class Test_GenerateAllRevisions(TestLogWithLogCatcher):
207
245
 
 
246
    def setUp(self):
 
247
        super(Test_GenerateAllRevisions, self).setUp()
 
248
        builder = self.make_branch_with_many_merges()
 
249
        b = builder.get_branch()
 
250
        b.lock_read()
 
251
        self.addCleanup(b.unlock)
 
252
        self.branch = b
 
253
 
208
254
    def make_branch_with_many_merges(self, path='.', format=None):
209
255
        builder = branchbuilder.BranchBuilder(self.get_transport())
210
256
        builder.start_series()
226
272
        return builder
227
273
 
228
274
    def test_not_an_ancestor(self):
229
 
        builder = self.make_branch_with_many_merges()
230
 
        b = builder.get_branch()
231
 
        b.lock_read()
232
 
        self.addCleanup(b.unlock)
233
275
        self.assertRaises(errors.BzrCommandError,
234
276
                          log._generate_all_revisions,
235
 
                          b, '1.1.1', '2.1.3', 'reverse',
 
277
                          self.branch, '1.1.1', '2.1.3', 'reverse',
236
278
                          delayed_graph_generation=True)
237
279
 
238
280
    def test_wrong_order(self):
239
 
        builder = self.make_branch_with_many_merges()
240
 
        b = builder.get_branch()
241
 
        b.lock_read()
242
 
        self.addCleanup(b.unlock)
243
281
        self.assertRaises(errors.BzrCommandError,
244
282
                          log._generate_all_revisions,
245
 
                          b, '5', '2.1.3', 'reverse',
 
283
                          self.branch, '5', '2.1.3', 'reverse',
246
284
                          delayed_graph_generation=True)
247
285
 
 
286
    def test_no_start_rev_id_with_end_rev_id_being_a_merge(self):
 
287
        revs = log._generate_all_revisions(
 
288
            self.branch, None, '2.1.3',
 
289
            'reverse', delayed_graph_generation=True)
 
290
 
248
291
 
249
292
class TestLogRevSpecsWithPaths(TestLogWithLogCatcher):
250
293
 
343
386
 
344
387
    def test_log_bad_message_re(self):
345
388
        """Bad --message argument gives a sensible message
346
 
        
 
389
 
347
390
        See https://bugs.launchpad.net/bzr/+bug/251352
348
391
        """
349
392
        self.make_minimal_branch()
350
393
        out, err = self.run_bzr(['log', '-m', '*'], retcode=3)
351
 
        self.assertEqual("bzr: ERROR: Invalid regular expression"
352
 
            " in log message filter"
353
 
            ": '*'"
354
 
            ": nothing to repeat\n", err)
355
 
        self.assertEqual('', out)
 
394
        self.assertContainsRe(err, "ERROR.*Invalid pattern.*nothing to repeat")
 
395
        self.assertNotContainsRe(err, "Unprintable exception")
 
396
        self.assertEqual(out, '')
356
397
 
357
398
    def test_log_unsupported_timezone(self):
358
399
        self.make_linear_branch()
360
401
                            'options are "utc", "original", "local".'],
361
402
                           ['log', '--timezone', 'foo'])
362
403
 
 
404
    def test_log_exclude_ancestry_no_range(self):
 
405
        self.make_linear_branch()
 
406
        self.run_bzr_error(['bzr: ERROR: --exclude-common-ancestry'
 
407
                            ' requires -r with two revisions'],
 
408
                           ['log', '--exclude-common-ancestry'])
 
409
 
 
410
    def test_log_exclude_ancestry_single_revision(self):
 
411
        self.make_merged_branch()
 
412
        self.run_bzr_error(['bzr: ERROR: --exclude-common-ancestry'
 
413
                            ' requires two different revisions'],
 
414
                           ['log', '--exclude-common-ancestry',
 
415
                            '-r1.1.1..1.1.1'])
363
416
 
364
417
class TestLogTags(TestLog):
365
418
 
394
447
        self.assertContainsRe(log, r'tags: tag1')
395
448
 
396
449
 
 
450
class TestLogSignatures(TestLog):
 
451
 
 
452
    def test_log_with_signatures(self):
 
453
        self.requireFeature(features.gpgme)
 
454
 
 
455
        tree = self.make_linear_branch(format='dirstate-tags')
 
456
 
 
457
        log = self.run_bzr("log --signatures")[0]
 
458
        self.assertTrue('signature: no signature' in log)
 
459
 
 
460
    def test_log_without_signatures(self):
 
461
        self.requireFeature(features.gpgme)
 
462
 
 
463
        tree = self.make_linear_branch(format='dirstate-tags')
 
464
 
 
465
        log = self.run_bzr("log")[0]
 
466
        self.assertFalse('signature: no signature' in log)
 
467
 
 
468
 
397
469
class TestLogVerbose(TestLog):
398
470
 
399
471
    def setUp(self):
415
487
    def test_log_short_verbose(self):
416
488
        self.assertUseShortDeltaFormat(['log', '--short', '-v'])
417
489
 
 
490
    def test_log_s_verbose(self):
 
491
        self.assertUseShortDeltaFormat(['log', '-S', '-v'])
 
492
 
418
493
    def test_log_short_verbose_verbose(self):
419
494
        self.assertUseLongDeltaFormat(['log', '--short', '-vv'])
420
495
 
465
540
 
466
541
    def test_include_merges(self):
467
542
        # Confirm --include-merges gives the same output as -n0
468
 
        self.assertLogRevnos(['--include-merges'],
469
 
                             ['2', '1.1.2', '1.2.1', '1.1.1', '1'],
470
 
                             working_dir='level0')
471
 
        self.assertLogRevnos(['--include-merges'],
472
 
                             ['2', '1.1.2', '1.2.1', '1.1.1', '1'],
473
 
                             working_dir='level0')
 
543
        msg = ("The option '--include-merges' to 'bzr log' "
 
544
               "has been deprecated in bzr 2.5. "
 
545
               "Please use '--include-merged' instead.\n")
 
546
        self.assertLogRevnos(['--include-merges'],
 
547
                             ['2', '1.1.2', '1.2.1', '1.1.1', '1'],
 
548
                             working_dir='level0', err=msg)
 
549
        self.assertLogRevnos(['--include-merges'],
 
550
                             ['2', '1.1.2', '1.2.1', '1.1.1', '1'],
 
551
                             working_dir='level0', err=msg)
474
552
        out_im, err_im = self.run_bzr('log --include-merges',
475
553
                                      working_dir='level0')
476
554
        out_n0, err_n0 = self.run_bzr('log -n0', working_dir='level0')
477
 
        self.assertEqual('', err_im)
 
555
        self.assertEqual(msg, err_im)
478
556
        self.assertEqual('', err_n0)
479
557
        self.assertEqual(out_im, out_n0)
480
558
 
 
559
    def test_include_merged(self):
 
560
        # Confirm --include-merged gives the same output as -n0
 
561
        expected = ['2', '1.1.2', '1.2.1', '1.1.1', '1']
 
562
        self.assertLogRevnos(['--include-merged'],
 
563
                             expected, working_dir='level0')
 
564
        self.assertLogRevnos(['--include-merged'],
 
565
                             expected, working_dir='level0')
 
566
 
481
567
    def test_force_merge_revisions_N(self):
482
568
        self.assertLogRevnos(['-n2'],
483
569
                             ['2', '1.1.2', '1.1.1', '1'],
501
587
                [('2', 0), ('1.1.2', 1), ('1.2.1', 2)],
502
588
                working_dir='level0')
503
589
 
 
590
    def test_omit_merges_with_sidelines(self):
 
591
        self.assertLogRevnos(['--omit-merges', '-n0'], ['1.2.1', '1.1.1', '1'],
 
592
                             working_dir='level0')
 
593
 
 
594
    def test_omit_merges_without_sidelines(self):
 
595
        self.assertLogRevnos(['--omit-merges', '-n1'], ['1'],
 
596
                             working_dir='level0')
 
597
 
504
598
 
505
599
class TestLogDiff(TestLogWithLogCatcher):
506
600
 
876
970
        self.prepare_tree()
877
971
        os.chdir("dir1")
878
972
        self.assertLogRevnos(['dir2', 'file5'], ['5', '3'])
 
973
 
 
974
 
 
975
class MainlineGhostTests(TestLogWithLogCatcher):
 
976
 
 
977
    def setUp(self):
 
978
        super(MainlineGhostTests, self).setUp()
 
979
        tree = self.make_branch_and_tree('')
 
980
        tree.set_parent_ids(["spooky"], allow_leftmost_as_ghost=True)
 
981
        tree.add('')
 
982
        tree.commit('msg1', rev_id='rev1')
 
983
        tree.commit('msg2', rev_id='rev2')
 
984
 
 
985
    def test_log_range(self):
 
986
        self.assertLogRevnos(["-r1..2"], ["2", "1"])
 
987
 
 
988
    def test_log_norange(self):
 
989
        self.assertLogRevnos([], ["2", "1"])
 
990
 
 
991
    def test_log_range_open_begin(self):
 
992
        self.knownFailure("log with ghosts fails. bug #726466")
 
993
        (stdout, stderr) = self.run_bzr(['log', '-r..2'], retcode=3)
 
994
        self.assertEqual(["2", "1"],
 
995
                         [r.revno for r in self.get_captured_revisions()])
 
996
        self.assertEquals("bzr: ERROR: Further revision history missing.", stderr)
 
997
 
 
998
    def test_log_range_open_end(self):
 
999
        self.assertLogRevnos(["-r1.."], ["2", "1"])
 
1000
 
 
1001
class TestLogMatch(TestLogWithLogCatcher):
 
1002
    def prepare_tree(self):
 
1003
        tree = self.make_branch_and_tree('')
 
1004
        self.build_tree(
 
1005
            ['/hello.txt', '/goodbye.txt'])
 
1006
        tree.add('hello.txt')
 
1007
        tree.commit(message='message1', committer='committer1', authors=['author1'])
 
1008
        tree.add('goodbye.txt')
 
1009
        tree.commit(message='message2', committer='committer2', authors=['author2'])
 
1010
    
 
1011
    def test_message(self):
 
1012
        self.prepare_tree()
 
1013
        self.assertLogRevnos(["-m", "message1"], ["1"])
 
1014
        self.assertLogRevnos(["-m", "message2"], ["2"])
 
1015
        self.assertLogRevnos(["-m", "message"], ["2", "1"])
 
1016
        self.assertLogRevnos(["-m", "message1", "-m", "message2"], ["2", "1"])
 
1017
        self.assertLogRevnos(["--match-message", "message1"], ["1"])
 
1018
        self.assertLogRevnos(["--match-message", "message2"], ["2"])
 
1019
        self.assertLogRevnos(["--match-message", "message"], ["2", "1"])
 
1020
        self.assertLogRevnos(["--match-message", "message1", 
 
1021
                              "--match-message", "message2"], ["2", "1"])
 
1022
        self.assertLogRevnos(["--message", "message1"], ["1"])
 
1023
        self.assertLogRevnos(["--message", "message2"], ["2"])
 
1024
        self.assertLogRevnos(["--message", "message"], ["2", "1"])
 
1025
        self.assertLogRevnos(["--match-message", "message1", 
 
1026
                              "--message", "message2"], ["2", "1"])
 
1027
        self.assertLogRevnos(["--message", "message1", 
 
1028
                              "--match-message", "message2"], ["2", "1"])
 
1029
 
 
1030
    def test_committer(self):
 
1031
        self.prepare_tree()
 
1032
        self.assertLogRevnos(["-m", "committer1"], ["1"])
 
1033
        self.assertLogRevnos(["-m", "committer2"], ["2"])
 
1034
        self.assertLogRevnos(["-m", "committer"], ["2", "1"])
 
1035
        self.assertLogRevnos(["-m", "committer1", "-m", "committer2"], 
 
1036
                             ["2", "1"])
 
1037
        self.assertLogRevnos(["--match-committer", "committer1"], ["1"])
 
1038
        self.assertLogRevnos(["--match-committer", "committer2"], ["2"])
 
1039
        self.assertLogRevnos(["--match-committer", "committer"], ["2", "1"])
 
1040
        self.assertLogRevnos(["--match-committer", "committer1", 
 
1041
                              "--match-committer", "committer2"], ["2", "1"])
 
1042
 
 
1043
    def test_author(self):
 
1044
        self.prepare_tree()
 
1045
        self.assertLogRevnos(["-m", "author1"], ["1"])
 
1046
        self.assertLogRevnos(["-m", "author2"], ["2"])
 
1047
        self.assertLogRevnos(["-m", "author"], ["2", "1"])
 
1048
        self.assertLogRevnos(["-m", "author1", "-m", "author2"], 
 
1049
                             ["2", "1"])
 
1050
        self.assertLogRevnos(["--match-author", "author1"], ["1"])
 
1051
        self.assertLogRevnos(["--match-author", "author2"], ["2"])
 
1052
        self.assertLogRevnos(["--match-author", "author"], ["2", "1"])
 
1053
        self.assertLogRevnos(["--match-author", "author1", 
 
1054
                              "--match-author", "author2"], ["2", "1"])