← 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-12-14 12:15:44 UTC
  • mto: This revision was merged to the branch mainline in revision 6365.
  • Revision ID: jelmer@samba.org-20111214121544-v07cbvmi30re6q7w
s/NoVfsCalls/ContainsNoVfsCalls/.

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
    )
 
34
from bzrlib.tests.matchers import ContainsNoVfsCalls
35
35
 
36
36
 
37
37
class TestLog(tests.TestCaseWithTransport, test_log.TestLogMixin):
77
77
                self.log_catcher = test_log.LogCatcher(*args, **kwargs)
78
78
                # Always return our own log formatter
79
79
                return self.log_catcher
 
80
        # Break cycle with closure over self on cleanup by removing method
 
81
        self.addCleanup(setattr, MyLogFormatter, "__new__", None)
80
82
 
81
83
        def getme(branch):
82
84
                # Always return our own log formatter class hijacking the
88
90
    def get_captured_revisions(self):
89
91
        return self.log_catcher.revisions
90
92
 
91
 
    def assertLogRevnos(self, args, expected_revnos, working_dir='.'):
92
 
        self.run_bzr(['log'] + args, working_dir=working_dir)
 
93
    def assertLogRevnos(self, args, expected_revnos, working_dir='.',
 
94
                        out='', err=''):
 
95
        actual_out, actual_err = self.run_bzr(['log'] + args,
 
96
                                              working_dir=working_dir)
 
97
        self.assertEqual(out, actual_out)
 
98
        self.assertEqual(err, actual_err)
93
99
        self.assertEqual(expected_revnos,
94
100
                         [r.revno for r in self.get_captured_revisions()])
95
101
 
158
164
        self.make_linear_branch()
159
165
        self.assertLogRevnos(['-c1'], ['1'])
160
166
 
 
167
    def test_branch_revspec(self):
 
168
        foo = self.make_branch_and_tree('foo')
 
169
        bar = self.make_branch_and_tree('bar')
 
170
        self.build_tree(['foo/foo.txt', 'bar/bar.txt'])
 
171
        foo.add('foo.txt')
 
172
        bar.add('bar.txt')
 
173
        foo.commit(message='foo')
 
174
        bar.commit(message='bar')
 
175
        self.run_bzr('log -r branch:../bar', working_dir='foo')
 
176
        self.assertEqual([bar.branch.get_rev_id(1)],
 
177
                         [r.rev.revision_id
 
178
                          for r in self.get_captured_revisions()])
 
179
 
 
180
 
 
181
class TestLogExcludeCommonAncestry(TestLogWithLogCatcher):
 
182
 
 
183
    def test_exclude_common_ancestry_simple_revnos(self):
 
184
        self.make_linear_branch()
 
185
        self.assertLogRevnos(['-r1..3', '--exclude-common-ancestry'],
 
186
                             ['3', '2'])
 
187
 
161
188
 
162
189
class TestLogMergedLinearAncestry(TestLogWithLogCatcher):
163
190
 
167
194
        # stop calling run_bzr, there is no point) --vila 100118.
168
195
        builder = branchbuilder.BranchBuilder(self.get_transport())
169
196
        builder.start_series()
 
197
        # 1
 
198
        # | \
 
199
        # 2  1.1.1
 
200
        # | / |
 
201
        # 3  1.1.2
 
202
        # |   |
 
203
        # |  1.1.3
 
204
        # | / |
 
205
        # 4  1.1.4
 
206
        # | /
 
207
        # 5
 
208
 
170
209
        # mainline
171
210
        builder.build_snapshot('1', None, [
172
211
            ('add', ('', 'root-id', 'directory', ''))])
205
244
 
206
245
class Test_GenerateAllRevisions(TestLogWithLogCatcher):
207
246
 
 
247
    def setUp(self):
 
248
        super(Test_GenerateAllRevisions, self).setUp()
 
249
        builder = self.make_branch_with_many_merges()
 
250
        b = builder.get_branch()
 
251
        b.lock_read()
 
252
        self.addCleanup(b.unlock)
 
253
        self.branch = b
 
254
 
208
255
    def make_branch_with_many_merges(self, path='.', format=None):
209
256
        builder = branchbuilder.BranchBuilder(self.get_transport())
210
257
        builder.start_series()
226
273
        return builder
227
274
 
228
275
    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
276
        self.assertRaises(errors.BzrCommandError,
234
277
                          log._generate_all_revisions,
235
 
                          b, '1.1.1', '2.1.3', 'reverse',
 
278
                          self.branch, '1.1.1', '2.1.3', 'reverse',
236
279
                          delayed_graph_generation=True)
237
280
 
238
281
    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
282
        self.assertRaises(errors.BzrCommandError,
244
283
                          log._generate_all_revisions,
245
 
                          b, '5', '2.1.3', 'reverse',
 
284
                          self.branch, '5', '2.1.3', 'reverse',
246
285
                          delayed_graph_generation=True)
247
286
 
 
287
    def test_no_start_rev_id_with_end_rev_id_being_a_merge(self):
 
288
        revs = log._generate_all_revisions(
 
289
            self.branch, None, '2.1.3',
 
290
            'reverse', delayed_graph_generation=True)
 
291
 
248
292
 
249
293
class TestLogRevSpecsWithPaths(TestLogWithLogCatcher):
250
294
 
343
387
 
344
388
    def test_log_bad_message_re(self):
345
389
        """Bad --message argument gives a sensible message
346
 
        
 
390
 
347
391
        See https://bugs.launchpad.net/bzr/+bug/251352
348
392
        """
349
393
        self.make_minimal_branch()
350
394
        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)
 
395
        self.assertContainsRe(err, "ERROR.*Invalid pattern.*nothing to repeat")
 
396
        self.assertNotContainsRe(err, "Unprintable exception")
 
397
        self.assertEqual(out, '')
356
398
 
357
399
    def test_log_unsupported_timezone(self):
358
400
        self.make_linear_branch()
360
402
                            'options are "utc", "original", "local".'],
361
403
                           ['log', '--timezone', 'foo'])
362
404
 
 
405
    def test_log_exclude_ancestry_no_range(self):
 
406
        self.make_linear_branch()
 
407
        self.run_bzr_error(['bzr: ERROR: --exclude-common-ancestry'
 
408
                            ' requires -r with two revisions'],
 
409
                           ['log', '--exclude-common-ancestry'])
 
410
 
 
411
    def test_log_exclude_ancestry_single_revision(self):
 
412
        self.make_merged_branch()
 
413
        self.run_bzr_error(['bzr: ERROR: --exclude-common-ancestry'
 
414
                            ' requires two different revisions'],
 
415
                           ['log', '--exclude-common-ancestry',
 
416
                            '-r1.1.1..1.1.1'])
363
417
 
364
418
class TestLogTags(TestLog):
365
419
 
394
448
        self.assertContainsRe(log, r'tags: tag1')
395
449
 
396
450
 
 
451
class TestLogSignatures(TestLog):
 
452
 
 
453
    def test_log_with_signatures(self):
 
454
        self.requireFeature(features.gpgme)
 
455
 
 
456
        tree = self.make_linear_branch(format='dirstate-tags')
 
457
 
 
458
        log = self.run_bzr("log --signatures")[0]
 
459
        self.assertTrue('signature: no signature' in log)
 
460
 
 
461
    def test_log_without_signatures(self):
 
462
        self.requireFeature(features.gpgme)
 
463
 
 
464
        tree = self.make_linear_branch(format='dirstate-tags')
 
465
 
 
466
        log = self.run_bzr("log")[0]
 
467
        self.assertFalse('signature: no signature' in log)
 
468
 
 
469
 
397
470
class TestLogVerbose(TestLog):
398
471
 
399
472
    def setUp(self):
415
488
    def test_log_short_verbose(self):
416
489
        self.assertUseShortDeltaFormat(['log', '--short', '-v'])
417
490
 
 
491
    def test_log_s_verbose(self):
 
492
        self.assertUseShortDeltaFormat(['log', '-S', '-v'])
 
493
 
418
494
    def test_log_short_verbose_verbose(self):
419
495
        self.assertUseLongDeltaFormat(['log', '--short', '-vv'])
420
496
 
465
541
 
466
542
    def test_include_merges(self):
467
543
        # 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')
 
544
        msg = ("The option '--include-merges' to 'bzr log' "
 
545
               "has been deprecated in bzr 2.5. "
 
546
               "Please use '--include-merged' instead.\n")
 
547
        self.assertLogRevnos(['--include-merges'],
 
548
                             ['2', '1.1.2', '1.2.1', '1.1.1', '1'],
 
549
                             working_dir='level0', err=msg)
 
550
        self.assertLogRevnos(['--include-merges'],
 
551
                             ['2', '1.1.2', '1.2.1', '1.1.1', '1'],
 
552
                             working_dir='level0', err=msg)
474
553
        out_im, err_im = self.run_bzr('log --include-merges',
475
554
                                      working_dir='level0')
476
555
        out_n0, err_n0 = self.run_bzr('log -n0', working_dir='level0')
477
 
        self.assertEqual('', err_im)
 
556
        self.assertEqual(msg, err_im)
478
557
        self.assertEqual('', err_n0)
479
558
        self.assertEqual(out_im, out_n0)
480
559
 
 
560
    def test_include_merged(self):
 
561
        # Confirm --include-merged gives the same output as -n0
 
562
        expected = ['2', '1.1.2', '1.2.1', '1.1.1', '1']
 
563
        self.assertLogRevnos(['--include-merged'],
 
564
                             expected, working_dir='level0')
 
565
        self.assertLogRevnos(['--include-merged'],
 
566
                             expected, working_dir='level0')
 
567
 
481
568
    def test_force_merge_revisions_N(self):
482
569
        self.assertLogRevnos(['-n2'],
483
570
                             ['2', '1.1.2', '1.1.1', '1'],
501
588
                [('2', 0), ('1.1.2', 1), ('1.2.1', 2)],
502
589
                working_dir='level0')
503
590
 
 
591
    def test_omit_merges_with_sidelines(self):
 
592
        self.assertLogRevnos(['--omit-merges', '-n0'], ['1.2.1', '1.1.1', '1'],
 
593
                             working_dir='level0')
 
594
 
 
595
    def test_omit_merges_without_sidelines(self):
 
596
        self.assertLogRevnos(['--omit-merges', '-n1'], ['1'],
 
597
                             working_dir='level0')
 
598
 
504
599
 
505
600
class TestLogDiff(TestLogWithLogCatcher):
506
601
 
876
971
        self.prepare_tree()
877
972
        os.chdir("dir1")
878
973
        self.assertLogRevnos(['dir2', 'file5'], ['5', '3'])
 
974
 
 
975
 
 
976
class MainlineGhostTests(TestLogWithLogCatcher):
 
977
 
 
978
    def setUp(self):
 
979
        super(MainlineGhostTests, self).setUp()
 
980
        tree = self.make_branch_and_tree('')
 
981
        tree.set_parent_ids(["spooky"], allow_leftmost_as_ghost=True)
 
982
        tree.add('')
 
983
        tree.commit('msg1', rev_id='rev1')
 
984
        tree.commit('msg2', rev_id='rev2')
 
985
 
 
986
    def test_log_range(self):
 
987
        self.assertLogRevnos(["-r1..2"], ["2", "1"])
 
988
 
 
989
    def test_log_norange(self):
 
990
        self.assertLogRevnos([], ["2", "1"])
 
991
 
 
992
    def test_log_range_open_begin(self):
 
993
        self.knownFailure("log with ghosts fails. bug #726466")
 
994
        (stdout, stderr) = self.run_bzr(['log', '-r..2'], retcode=3)
 
995
        self.assertEqual(["2", "1"],
 
996
                         [r.revno for r in self.get_captured_revisions()])
 
997
        self.assertEquals("bzr: ERROR: Further revision history missing.", stderr)
 
998
 
 
999
    def test_log_range_open_end(self):
 
1000
        self.assertLogRevnos(["-r1.."], ["2", "1"])
 
1001
 
 
1002
class TestLogMatch(TestLogWithLogCatcher):
 
1003
    def prepare_tree(self):
 
1004
        tree = self.make_branch_and_tree('')
 
1005
        self.build_tree(
 
1006
            ['/hello.txt', '/goodbye.txt'])
 
1007
        tree.add('hello.txt')
 
1008
        tree.commit(message='message1', committer='committer1', authors=['author1'])
 
1009
        tree.add('goodbye.txt')
 
1010
        tree.commit(message='message2', committer='committer2', authors=['author2'])
 
1011
    
 
1012
    def test_message(self):
 
1013
        self.prepare_tree()
 
1014
        self.assertLogRevnos(["-m", "message1"], ["1"])
 
1015
        self.assertLogRevnos(["-m", "message2"], ["2"])
 
1016
        self.assertLogRevnos(["-m", "message"], ["2", "1"])
 
1017
        self.assertLogRevnos(["-m", "message1", "-m", "message2"], ["2", "1"])
 
1018
        self.assertLogRevnos(["--match-message", "message1"], ["1"])
 
1019
        self.assertLogRevnos(["--match-message", "message2"], ["2"])
 
1020
        self.assertLogRevnos(["--match-message", "message"], ["2", "1"])
 
1021
        self.assertLogRevnos(["--match-message", "message1", 
 
1022
                              "--match-message", "message2"], ["2", "1"])
 
1023
        self.assertLogRevnos(["--message", "message1"], ["1"])
 
1024
        self.assertLogRevnos(["--message", "message2"], ["2"])
 
1025
        self.assertLogRevnos(["--message", "message"], ["2", "1"])
 
1026
        self.assertLogRevnos(["--match-message", "message1", 
 
1027
                              "--message", "message2"], ["2", "1"])
 
1028
        self.assertLogRevnos(["--message", "message1", 
 
1029
                              "--match-message", "message2"], ["2", "1"])
 
1030
 
 
1031
    def test_committer(self):
 
1032
        self.prepare_tree()
 
1033
        self.assertLogRevnos(["-m", "committer1"], ["1"])
 
1034
        self.assertLogRevnos(["-m", "committer2"], ["2"])
 
1035
        self.assertLogRevnos(["-m", "committer"], ["2", "1"])
 
1036
        self.assertLogRevnos(["-m", "committer1", "-m", "committer2"], 
 
1037
                             ["2", "1"])
 
1038
        self.assertLogRevnos(["--match-committer", "committer1"], ["1"])
 
1039
        self.assertLogRevnos(["--match-committer", "committer2"], ["2"])
 
1040
        self.assertLogRevnos(["--match-committer", "committer"], ["2", "1"])
 
1041
        self.assertLogRevnos(["--match-committer", "committer1", 
 
1042
                              "--match-committer", "committer2"], ["2", "1"])
 
1043
 
 
1044
    def test_author(self):
 
1045
        self.prepare_tree()
 
1046
        self.assertLogRevnos(["-m", "author1"], ["1"])
 
1047
        self.assertLogRevnos(["-m", "author2"], ["2"])
 
1048
        self.assertLogRevnos(["-m", "author"], ["2", "1"])
 
1049
        self.assertLogRevnos(["-m", "author1", "-m", "author2"], 
 
1050
                             ["2", "1"])
 
1051
        self.assertLogRevnos(["--match-author", "author1"], ["1"])
 
1052
        self.assertLogRevnos(["--match-author", "author2"], ["2"])
 
1053
        self.assertLogRevnos(["--match-author", "author"], ["2", "1"])
 
1054
        self.assertLogRevnos(["--match-author", "author1", 
 
1055
                              "--match-author", "author2"], ["2", "1"])
 
1056
 
 
1057
 
 
1058
class TestSmartServerLog(tests.TestCaseWithTransport):
 
1059
 
 
1060
    def test_standard_log(self):
 
1061
        self.setup_smart_server_with_call_log()
 
1062
        t = self.make_branch_and_tree('branch')
 
1063
        self.build_tree_contents([('branch/foo', 'thecontents')])
 
1064
        t.add("foo")
 
1065
        t.commit("message")
 
1066
        self.reset_smart_call_log()
 
1067
        out, err = self.run_bzr(['log', self.get_url('branch')])
 
1068
        # This figure represent the amount of work to perform this use case. It
 
1069
        # is entirely ok to reduce this number if a test fails due to rpc_count
 
1070
        # being too low. If rpc_count increases, more network roundtrips have
 
1071
        # become necessary for this use case. Please do not adjust this number
 
1072
        # upwards without agreement from bzr's network support maintainers.
 
1073
        self.assertThat(self.hpss_calls, ContainsNoVfsCalls)
 
1074
        self.assertLength(10, self.hpss_calls)
 
1075
 
 
1076
    def test_verbose_log(self):
 
1077
        self.setup_smart_server_with_call_log()
 
1078
        t = self.make_branch_and_tree('branch')
 
1079
        self.build_tree_contents([('branch/foo', 'thecontents')])
 
1080
        t.add("foo")
 
1081
        t.commit("message")
 
1082
        self.reset_smart_call_log()
 
1083
        out, err = self.run_bzr(['log', '-v', self.get_url('branch')])
 
1084
        # This figure represent the amount of work to perform this use case. It
 
1085
        # is entirely ok to reduce this number if a test fails due to rpc_count
 
1086
        # being too low. If rpc_count increases, more network roundtrips have
 
1087
        # become necessary for this use case. Please do not adjust this number
 
1088
        # upwards without agreement from bzr's network support maintainers.
 
1089
        self.assertLength(19, self.hpss_calls)
 
1090
        self.expectFailure("verbose log accesses inventories, which require VFS",
 
1091
            self.assertThat, self.hpss_calls, ContainsNoVfsCalls)
 
1092
 
 
1093
    def test_per_file(self):
 
1094
        self.setup_smart_server_with_call_log()
 
1095
        t = self.make_branch_and_tree('branch')
 
1096
        self.build_tree_contents([('branch/foo', 'thecontents')])
 
1097
        t.add("foo")
 
1098
        t.commit("message")
 
1099
        self.reset_smart_call_log()
 
1100
        out, err = self.run_bzr(['log', '-v', self.get_url('branch') + "/foo"])
 
1101
        # This figure represent the amount of work to perform this use case. It
 
1102
        # is entirely ok to reduce this number if a test fails due to rpc_count
 
1103
        # being too low. If rpc_count increases, more network roundtrips have
 
1104
        # become necessary for this use case. Please do not adjust this number
 
1105
        # upwards without agreement from bzr's network support maintainers.
 
1106
        self.assertLength(21, self.hpss_calls)
 
1107
        self.expectFailure("per-file graph access requires VFS",
 
1108
            self.assertThat, self.hpss_calls, ContainsNoVfsCalls)