/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: 2017-06-10 01:35:53 UTC
  • mto: (6670.4.8 move-bzr)
  • mto: This revision was merged to the branch mainline in revision 6681.
  • Revision ID: jelmer@jelmer.uk-20170610013553-560y7mn3su4pp763
Fix remaining 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."""
 
18
"""Black-box tests for brz log."""
19
19
 
20
 
from itertools import izip
21
20
import os
22
 
import re
23
21
 
24
 
from bzrlib import (
 
22
from breezy import (
25
23
    branchbuilder,
26
24
    errors,
27
25
    log,
28
26
    osutils,
29
27
    tests,
30
28
    )
31
 
from bzrlib.tests import (
32
 
    script,
 
29
from breezy.tests import (
33
30
    test_log,
 
31
    features,
34
32
    )
 
33
from breezy.tests.matchers import ContainsNoVfsCalls
35
34
 
36
35
 
37
36
class TestLog(tests.TestCaseWithTransport, test_log.TestLogMixin):
57
56
 
58
57
    def make_merged_branch(self, path='.', format=None):
59
58
        tree = self.make_linear_branch(path, format)
60
 
        tree2 = tree.bzrdir.sprout('tree2',
 
59
        tree2 = tree.controldir.sprout('tree2',
61
60
            revision_id=tree.branch.get_rev_id(1)).open_workingtree()
62
61
        tree2.commit(message='tree2 message2')
63
62
        tree2.commit(message='tree2 message3')
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
        # | \
 
208
        # | 5.1.1
 
209
        # | /
 
210
        # 6
 
211
 
170
212
        # mainline
171
213
        builder.build_snapshot('1', None, [
172
214
            ('add', ('', 'root-id', 'directory', ''))])
184
226
        builder.build_snapshot('1.1.4', ['1.1.3', '4'], [])
185
227
        # merge branch into mainline
186
228
        builder.build_snapshot('5', ['4', '1.1.4'], [])
 
229
        builder.build_snapshot('5.1.1', ['5'], [])
 
230
        builder.build_snapshot('6', ['5', '5.1.1'], [])
187
231
        builder.finish_series()
188
232
 
189
233
    def test_n0(self):
202
246
        self.assertLogRevnos(['-n1', '-r1.1.1..1.1.4', '--forward'],
203
247
                             ['1.1.1', '1.1.2', '1.1.3', '1.1.4'])
204
248
 
 
249
    def test_fallback_when_end_rev_is_not_on_mainline(self):
 
250
        self.assertLogRevnos(['-n1', '-r1.1.1..5.1.1'],
 
251
                             # We don't get 1.1.1 because we say -n1
 
252
                             ['5.1.1', '5', '4', '3'])
 
253
 
205
254
 
206
255
class Test_GenerateAllRevisions(TestLogWithLogCatcher):
207
256
 
219
268
        # The graph below may look a bit complicated (and it may be but I've
220
269
        # banged my head enough on it) but the bug requires at least dotted
221
270
        # revnos *and* merged revisions below that.
 
271
        # 1
 
272
        # | \
 
273
        # 2  1.1.1
 
274
        # | X
 
275
        # 3  2.1.1
 
276
        # |   |    \
 
277
        # |  2.1.2  2.2.1
 
278
        # |   |    X
 
279
        # |  2.1.3  \
 
280
        # | /       /
 
281
        # 4        /
 
282
        # |       /
 
283
        # 5 -----/
222
284
        builder.build_snapshot('1', None, [
223
285
            ('add', ('', 'root-id', 'directory', ''))])
224
286
        builder.build_snapshot('2', ['1'], [])
277
339
 
278
340
    def test_log_zero_revspec(self):
279
341
        self.make_minimal_branch()
280
 
        self.run_bzr_error(['bzr: ERROR: Logging revision 0 is invalid.'],
 
342
        self.run_bzr_error(['brz: ERROR: Logging revision 0 is invalid.'],
281
343
                           ['log', '-r0'])
282
344
 
283
345
    def test_log_zero_begin_revspec(self):
284
346
        self.make_linear_branch()
285
 
        self.run_bzr_error(['bzr: ERROR: Logging revision 0 is invalid.'],
 
347
        self.run_bzr_error(['brz: ERROR: Logging revision 0 is invalid.'],
286
348
                           ['log', '-r0..2'])
287
349
 
288
350
    def test_log_zero_end_revspec(self):
289
351
        self.make_linear_branch()
290
 
        self.run_bzr_error(['bzr: ERROR: Logging revision 0 is invalid.'],
 
352
        self.run_bzr_error(['brz: ERROR: Logging revision 0 is invalid.'],
291
353
                           ['log', '-r-2..0'])
292
354
 
293
355
    def test_log_nonexistent_revno(self):
294
356
        self.make_minimal_branch()
295
 
        self.run_bzr_error(["bzr: ERROR: Requested revision: '1234' "
 
357
        self.run_bzr_error(["brz: ERROR: Requested revision: '1234' "
296
358
                            "does not exist in branch:"],
297
359
                           ['log', '-r1234'])
298
360
 
299
361
    def test_log_nonexistent_dotted_revno(self):
300
362
        self.make_minimal_branch()
301
 
        self.run_bzr_error(["bzr: ERROR: Requested revision: '123.123' "
 
363
        self.run_bzr_error(["brz: ERROR: Requested revision: '123.123' "
302
364
                            "does not exist in branch:"],
303
365
                           ['log',  '-r123.123'])
304
366
 
305
367
    def test_log_change_nonexistent_revno(self):
306
368
        self.make_minimal_branch()
307
 
        self.run_bzr_error(["bzr: ERROR: Requested revision: '1234' "
 
369
        self.run_bzr_error(["brz: ERROR: Requested revision: '1234' "
308
370
                            "does not exist in branch:"],
309
371
                           ['log',  '-c1234'])
310
372
 
311
373
    def test_log_change_nonexistent_dotted_revno(self):
312
374
        self.make_minimal_branch()
313
 
        self.run_bzr_error(["bzr: ERROR: Requested revision: '123.123' "
 
375
        self.run_bzr_error(["brz: ERROR: Requested revision: '123.123' "
314
376
                            "does not exist in branch:"],
315
377
                           ['log', '-c123.123'])
316
378
 
317
379
    def test_log_change_single_revno_only(self):
318
380
        self.make_minimal_branch()
319
 
        self.run_bzr_error(['bzr: ERROR: Option --change does not'
 
381
        self.run_bzr_error(['brz: ERROR: Option --change does not'
320
382
                           ' accept revision ranges'],
321
383
                           ['log', '--change', '2..3'])
322
384
 
323
385
    def test_log_change_incompatible_with_revision(self):
324
 
        self.run_bzr_error(['bzr: ERROR: --revision and --change'
 
386
        self.run_bzr_error(['brz: ERROR: --revision and --change'
325
387
                           ' are mutually exclusive'],
326
388
                           ['log', '--change', '2', '--revision', '3'])
327
389
 
336
398
 
337
399
    def test_log_reversed_revspecs(self):
338
400
        self.make_linear_branch()
339
 
        self.run_bzr_error(('bzr: ERROR: Start revision must be older than '
 
401
        self.run_bzr_error(('brz: ERROR: Start revision must be older than '
340
402
                            'the end revision.\n',),
341
403
                           ['log', '-r3..1'])
342
404
 
343
405
    def test_log_reversed_dotted_revspecs(self):
344
406
        self.make_merged_branch()
345
 
        self.run_bzr_error(('bzr: ERROR: Start revision not found in '
346
 
                            'left-hand history of end revision.\n',),
 
407
        self.run_bzr_error(('brz: ERROR: Start revision not found in '
 
408
                            'history of end revision.\n',),
347
409
                           "log -r 1.1.1..1")
348
410
 
349
411
    def test_log_bad_message_re(self):
350
412
        """Bad --message argument gives a sensible message
351
 
        
 
413
 
352
414
        See https://bugs.launchpad.net/bzr/+bug/251352
353
415
        """
354
416
        self.make_minimal_branch()
355
417
        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)
 
418
        self.assertContainsRe(err, "ERROR.*Invalid pattern.*nothing to repeat")
 
419
        self.assertNotContainsRe(err, "Unprintable exception")
 
420
        self.assertEqual(out, '')
361
421
 
362
422
    def test_log_unsupported_timezone(self):
363
423
        self.make_linear_branch()
364
 
        self.run_bzr_error(['bzr: ERROR: Unsupported timezone format "foo", '
 
424
        self.run_bzr_error(['brz: ERROR: Unsupported timezone format "foo", '
365
425
                            'options are "utc", "original", "local".'],
366
426
                           ['log', '--timezone', 'foo'])
367
427
 
368
428
    def test_log_exclude_ancestry_no_range(self):
369
429
        self.make_linear_branch()
370
 
        self.run_bzr_error(['bzr: ERROR: --exclude-common-ancestry'
 
430
        self.run_bzr_error(['brz: ERROR: --exclude-common-ancestry'
371
431
                            ' requires -r with two revisions'],
372
432
                           ['log', '--exclude-common-ancestry'])
373
433
 
374
434
    def test_log_exclude_ancestry_single_revision(self):
375
435
        self.make_merged_branch()
376
 
        self.run_bzr_error(['bzr: ERROR: --exclude-common-ancestry'
 
436
        self.run_bzr_error(['brz: ERROR: --exclude-common-ancestry'
377
437
                            ' requires two different revisions'],
378
438
                           ['log', '--exclude-common-ancestry',
379
439
                            '-r1.1.1..1.1.1'])
399
459
        branch1_tree = self.make_linear_branch('branch1',
400
460
                                               format='dirstate-tags')
401
461
        branch1 = branch1_tree.branch
402
 
        branch2_tree = branch1_tree.bzrdir.sprout('branch2').open_workingtree()
 
462
        branch2_tree = branch1_tree.controldir.sprout('branch2').open_workingtree()
403
463
        branch1_tree.commit(message='foobar', allow_pointless=True)
404
464
        branch1.tags.set_tag('tag1', branch1.last_revision())
405
465
        # tags don't propagate if we don't merge
411
471
        self.assertContainsRe(log, r'tags: tag1')
412
472
 
413
473
 
 
474
class TestLogSignatures(TestLog):
 
475
 
 
476
    def test_log_with_signatures(self):
 
477
        self.requireFeature(features.gpgme)
 
478
 
 
479
        tree = self.make_linear_branch(format='dirstate-tags')
 
480
 
 
481
        log = self.run_bzr("log --signatures")[0]
 
482
        self.assertTrue('signature: no signature' in log)
 
483
 
 
484
    def test_log_without_signatures(self):
 
485
        self.requireFeature(features.gpgme)
 
486
 
 
487
        tree = self.make_linear_branch(format='dirstate-tags')
 
488
 
 
489
        log = self.run_bzr("log")[0]
 
490
        self.assertFalse('signature: no signature' in log)
 
491
 
 
492
 
414
493
class TestLogVerbose(TestLog):
415
494
 
416
495
    def setUp(self):
432
511
    def test_log_short_verbose(self):
433
512
        self.assertUseShortDeltaFormat(['log', '--short', '-v'])
434
513
 
 
514
    def test_log_s_verbose(self):
 
515
        self.assertUseShortDeltaFormat(['log', '-S', '-v'])
 
516
 
435
517
    def test_log_short_verbose_verbose(self):
436
518
        self.assertUseLongDeltaFormat(['log', '--short', '-vv'])
437
519
 
455
537
    def make_branches_with_merges(self):
456
538
        level0 = self.make_branch_and_tree('level0')
457
539
        self.wt_commit(level0, 'in branch level0')
458
 
        level1 = level0.bzrdir.sprout('level1').open_workingtree()
 
540
        level1 = level0.controldir.sprout('level1').open_workingtree()
459
541
        self.wt_commit(level1, 'in branch level1')
460
 
        level2 = level1.bzrdir.sprout('level2').open_workingtree()
 
542
        level2 = level1.controldir.sprout('level2').open_workingtree()
461
543
        self.wt_commit(level2, 'in branch level2')
462
544
        level1.merge_from_branch(level2.branch)
463
545
        self.wt_commit(level1, 'merge branch level2')
480
562
        self.assertLogRevnos(['-n0'], ['2', '1.1.2', '1.2.1', '1.1.1', '1'],
481
563
                             working_dir='level0')
482
564
 
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)
 
565
    def test_include_merged(self):
 
566
        # Confirm --include-merged gives the same output as -n0
 
567
        expected = ['2', '1.1.2', '1.2.1', '1.1.1', '1']
 
568
        self.assertLogRevnos(['--include-merged'],
 
569
                             expected, working_dir='level0')
 
570
        self.assertLogRevnos(['--include-merged'],
 
571
                             expected, working_dir='level0')
497
572
 
498
573
    def test_force_merge_revisions_N(self):
499
574
        self.assertLogRevnos(['-n2'],
518
593
                [('2', 0), ('1.1.2', 1), ('1.2.1', 2)],
519
594
                working_dir='level0')
520
595
 
 
596
    def test_omit_merges_with_sidelines(self):
 
597
        self.assertLogRevnos(['--omit-merges', '-n0'], ['1.2.1', '1.1.1', '1'],
 
598
                             working_dir='level0')
 
599
 
 
600
    def test_omit_merges_without_sidelines(self):
 
601
        self.assertLogRevnos(['--omit-merges', '-n1'], ['1'],
 
602
                             working_dir='level0')
 
603
 
521
604
 
522
605
class TestLogDiff(TestLogWithLogCatcher):
523
606
 
536
619
        level0.add('file2')
537
620
        self.wt_commit(level0, 'in branch level0')
538
621
 
539
 
        level1 = level0.bzrdir.sprout('level1').open_workingtree()
 
622
        level1 = level0.controldir.sprout('level1').open_workingtree()
540
623
        self.build_tree_contents([('level1/file2', 'hello\n')])
541
624
        self.wt_commit(level1, 'in branch level1')
542
625
        level0.merge_from_branch(level1.branch)
591
674
                           for r in self.get_captured_revisions()])
592
675
        # Now check the diffs, adding the revno  in case of failure
593
676
        fmt = 'In revno %s\n%s'
594
 
        for expected_rev, actual_rev in izip(expected,
595
 
                                             self.get_captured_revisions()):
 
677
        for expected_rev, actual_rev in zip(expected,
 
678
                                            self.get_captured_revisions()):
596
679
            revno, depth, expected_diff = expected_rev
597
680
            actual_diff = actual_rev.diff
598
681
            self.assertEqualDiff(fmt % (revno, expected_diff),
669
752
        self.overrideAttr(osutils, '_cached_user_encoding')
670
753
 
671
754
    def create_branch(self):
672
 
        bzr = self.run_bzr
673
 
        bzr('init')
 
755
        brz = self.run_bzr
 
756
        brz('init')
674
757
        self.build_tree_contents([('a', 'some stuff\n')])
675
 
        bzr('add a')
676
 
        bzr(['commit', '-m', self._message])
 
758
        brz('add a')
 
759
        brz(['commit', '-m', self._message])
677
760
 
678
761
    def try_encoding(self, encoding, fail=False):
679
 
        bzr = self.run_bzr
 
762
        brz = self.run_bzr
680
763
        if fail:
681
764
            self.assertRaises(UnicodeEncodeError,
682
765
                self._mu.encode, encoding)
686
769
 
687
770
        old_encoding = osutils._cached_user_encoding
688
771
        # This test requires that 'run_bzr' uses the current
689
 
        # bzrlib, because we override user_encoding, and expect
 
772
        # breezy, because we override user_encoding, and expect
690
773
        # it to be used
691
774
        try:
692
775
            osutils._cached_user_encoding = 'ascii'
693
776
            # We should be able to handle any encoding
694
 
            out, err = bzr('log', encoding=encoding)
 
777
            out, err = brz('log', encoding=encoding)
695
778
            if not fail:
696
779
                # Make sure we wrote mu as we expected it to exist
697
780
                self.assertNotEqual(-1, out.find(encoded_msg))
715
798
            self.try_encoding(encoding, fail=True)
716
799
 
717
800
    def test_stdout_encoding(self):
718
 
        bzr = self.run_bzr
 
801
        brz = self.run_bzr
719
802
        osutils._cached_user_encoding = "cp1251"
720
803
 
721
 
        bzr('init')
 
804
        brz('init')
722
805
        self.build_tree(['a'])
723
 
        bzr('add a')
724
 
        bzr(['commit', '-m', u'\u0422\u0435\u0441\u0442'])
 
806
        brz('add a')
 
807
        brz(['commit', '-m', u'\u0422\u0435\u0441\u0442'])
725
808
        stdout, stderr = self.run_bzr('log', encoding='cp866')
726
809
 
727
810
        message = stdout.splitlines()[-1]
735
818
        test_in_cp866 = '\x92\xa5\xe1\xe2'
736
819
        test_in_cp1251 = '\xd2\xe5\xf1\xf2'
737
820
        # Make sure the log string is encoded in cp866
738
 
        self.assertEquals(test_in_cp866, message[2:])
 
821
        self.assertEqual(test_in_cp866, message[2:])
739
822
        # Make sure the cp1251 string is not found anywhere
740
 
        self.assertEquals(-1, stdout.find(test_in_cp1251))
 
823
        self.assertEqual(-1, stdout.find(test_in_cp1251))
741
824
 
742
825
 
743
826
class TestLogFile(TestLogWithLogCatcher):
748
831
        self.build_tree(['tree/file'])
749
832
        tree.add('file')
750
833
        tree.commit('revision 1')
751
 
        tree.bzrdir.destroy_workingtree()
 
834
        tree.controldir.destroy_workingtree()
752
835
        self.run_bzr('log tree/file')
753
836
 
754
837
    def prepare_tree(self, complex=False):
761
844
        tree.commit('add file2')
762
845
        tree.add('file3')
763
846
        tree.commit('add file3')
764
 
        child_tree = tree.bzrdir.sprout('child').open_workingtree()
 
847
        child_tree = tree.controldir.sprout('child').open_workingtree()
765
848
        self.build_tree_contents([('child/file2', 'hello')])
766
849
        child_tree.commit(message='branch 1')
767
850
        tree.merge_from_branch(child_tree.branch)
854
937
        tree.commit('add file4')
855
938
        tree.add('dir1/file5')
856
939
        tree.commit('add file5')
857
 
        child_tree = tree.bzrdir.sprout('child').open_workingtree()
 
940
        child_tree = tree.controldir.sprout('child').open_workingtree()
858
941
        self.build_tree_contents([('child/file2', 'hello')])
859
942
        child_tree.commit(message='branch 1')
860
943
        tree.merge_from_branch(child_tree.branch)
893
976
        self.prepare_tree()
894
977
        os.chdir("dir1")
895
978
        self.assertLogRevnos(['dir2', 'file5'], ['5', '3'])
 
979
 
 
980
 
 
981
class MainlineGhostTests(TestLogWithLogCatcher):
 
982
 
 
983
    def setUp(self):
 
984
        super(MainlineGhostTests, self).setUp()
 
985
        tree = self.make_branch_and_tree('')
 
986
        tree.set_parent_ids(["spooky"], allow_leftmost_as_ghost=True)
 
987
        tree.add('')
 
988
        tree.commit('msg1', rev_id='rev1')
 
989
        tree.commit('msg2', rev_id='rev2')
 
990
 
 
991
    def test_log_range(self):
 
992
        self.assertLogRevnos(["-r1..2"], ["2", "1"])
 
993
 
 
994
    def test_log_norange(self):
 
995
        self.assertLogRevnos([], ["2", "1"])
 
996
 
 
997
    def test_log_range_open_begin(self):
 
998
        self.knownFailure("log with ghosts fails. bug #726466")
 
999
        (stdout, stderr) = self.run_bzr(['log', '-r..2'], retcode=3)
 
1000
        self.assertEqual(["2", "1"],
 
1001
                         [r.revno for r in self.get_captured_revisions()])
 
1002
        self.assertEqual("brz: ERROR: Further revision history missing.", stderr)
 
1003
 
 
1004
    def test_log_range_open_end(self):
 
1005
        self.assertLogRevnos(["-r1.."], ["2", "1"])
 
1006
 
 
1007
class TestLogMatch(TestLogWithLogCatcher):
 
1008
    def prepare_tree(self):
 
1009
        tree = self.make_branch_and_tree('')
 
1010
        self.build_tree(
 
1011
            ['/hello.txt', '/goodbye.txt'])
 
1012
        tree.add('hello.txt')
 
1013
        tree.commit(message='message1', committer='committer1', authors=['author1'])
 
1014
        tree.add('goodbye.txt')
 
1015
        tree.commit(message='message2', committer='committer2', authors=['author2'])
 
1016
    
 
1017
    def test_message(self):
 
1018
        self.prepare_tree()
 
1019
        self.assertLogRevnos(["-m", "message1"], ["1"])
 
1020
        self.assertLogRevnos(["-m", "message2"], ["2"])
 
1021
        self.assertLogRevnos(["-m", "message"], ["2", "1"])
 
1022
        self.assertLogRevnos(["-m", "message1", "-m", "message2"], ["2", "1"])
 
1023
        self.assertLogRevnos(["--match-message", "message1"], ["1"])
 
1024
        self.assertLogRevnos(["--match-message", "message2"], ["2"])
 
1025
        self.assertLogRevnos(["--match-message", "message"], ["2", "1"])
 
1026
        self.assertLogRevnos(["--match-message", "message1", 
 
1027
                              "--match-message", "message2"], ["2", "1"])
 
1028
        self.assertLogRevnos(["--message", "message1"], ["1"])
 
1029
        self.assertLogRevnos(["--message", "message2"], ["2"])
 
1030
        self.assertLogRevnos(["--message", "message"], ["2", "1"])
 
1031
        self.assertLogRevnos(["--match-message", "message1", 
 
1032
                              "--message", "message2"], ["2", "1"])
 
1033
        self.assertLogRevnos(["--message", "message1", 
 
1034
                              "--match-message", "message2"], ["2", "1"])
 
1035
 
 
1036
    def test_committer(self):
 
1037
        self.prepare_tree()
 
1038
        self.assertLogRevnos(["-m", "committer1"], ["1"])
 
1039
        self.assertLogRevnos(["-m", "committer2"], ["2"])
 
1040
        self.assertLogRevnos(["-m", "committer"], ["2", "1"])
 
1041
        self.assertLogRevnos(["-m", "committer1", "-m", "committer2"], 
 
1042
                             ["2", "1"])
 
1043
        self.assertLogRevnos(["--match-committer", "committer1"], ["1"])
 
1044
        self.assertLogRevnos(["--match-committer", "committer2"], ["2"])
 
1045
        self.assertLogRevnos(["--match-committer", "committer"], ["2", "1"])
 
1046
        self.assertLogRevnos(["--match-committer", "committer1", 
 
1047
                              "--match-committer", "committer2"], ["2", "1"])
 
1048
 
 
1049
    def test_author(self):
 
1050
        self.prepare_tree()
 
1051
        self.assertLogRevnos(["-m", "author1"], ["1"])
 
1052
        self.assertLogRevnos(["-m", "author2"], ["2"])
 
1053
        self.assertLogRevnos(["-m", "author"], ["2", "1"])
 
1054
        self.assertLogRevnos(["-m", "author1", "-m", "author2"], 
 
1055
                             ["2", "1"])
 
1056
        self.assertLogRevnos(["--match-author", "author1"], ["1"])
 
1057
        self.assertLogRevnos(["--match-author", "author2"], ["2"])
 
1058
        self.assertLogRevnos(["--match-author", "author"], ["2", "1"])
 
1059
        self.assertLogRevnos(["--match-author", "author1", 
 
1060
                              "--match-author", "author2"], ["2", "1"])
 
1061
 
 
1062
 
 
1063
class TestSmartServerLog(tests.TestCaseWithTransport):
 
1064
 
 
1065
    def test_standard_log(self):
 
1066
        self.setup_smart_server_with_call_log()
 
1067
        t = self.make_branch_and_tree('branch')
 
1068
        self.build_tree_contents([('branch/foo', 'thecontents')])
 
1069
        t.add("foo")
 
1070
        t.commit("message")
 
1071
        self.reset_smart_call_log()
 
1072
        out, err = self.run_bzr(['log', self.get_url('branch')])
 
1073
        # This figure represent the amount of work to perform this use case. It
 
1074
        # is entirely ok to reduce this number if a test fails due to rpc_count
 
1075
        # being too low. If rpc_count increases, more network roundtrips have
 
1076
        # become necessary for this use case. Please do not adjust this number
 
1077
        # upwards without agreement from bzr's network support maintainers.
 
1078
        self.assertThat(self.hpss_calls, ContainsNoVfsCalls)
 
1079
        self.assertLength(1, self.hpss_connections)
 
1080
        self.assertLength(9, self.hpss_calls)
 
1081
 
 
1082
    def test_verbose_log(self):
 
1083
        self.setup_smart_server_with_call_log()
 
1084
        t = self.make_branch_and_tree('branch')
 
1085
        self.build_tree_contents([('branch/foo', 'thecontents')])
 
1086
        t.add("foo")
 
1087
        t.commit("message")
 
1088
        self.reset_smart_call_log()
 
1089
        out, err = self.run_bzr(['log', '-v', self.get_url('branch')])
 
1090
        # This figure represent the amount of work to perform this use case. It
 
1091
        # is entirely ok to reduce this number if a test fails due to rpc_count
 
1092
        # being too low. If rpc_count increases, more network roundtrips have
 
1093
        # become necessary for this use case. Please do not adjust this number
 
1094
        # upwards without agreement from bzr's network support maintainers.
 
1095
        self.assertLength(10, self.hpss_calls)
 
1096
        self.assertLength(1, self.hpss_connections)
 
1097
        self.assertThat(self.hpss_calls, ContainsNoVfsCalls)
 
1098
 
 
1099
    def test_per_file(self):
 
1100
        self.setup_smart_server_with_call_log()
 
1101
        t = self.make_branch_and_tree('branch')
 
1102
        self.build_tree_contents([('branch/foo', 'thecontents')])
 
1103
        t.add("foo")
 
1104
        t.commit("message")
 
1105
        self.reset_smart_call_log()
 
1106
        out, err = self.run_bzr(['log', '-v', self.get_url('branch') + "/foo"])
 
1107
        # This figure represent the amount of work to perform this use case. It
 
1108
        # is entirely ok to reduce this number if a test fails due to rpc_count
 
1109
        # being too low. If rpc_count increases, more network roundtrips have
 
1110
        # become necessary for this use case. Please do not adjust this number
 
1111
        # upwards without agreement from bzr's network support maintainers.
 
1112
        self.assertLength(14, self.hpss_calls)
 
1113
        self.assertLength(1, self.hpss_connections)
 
1114
        self.assertThat(self.hpss_calls, ContainsNoVfsCalls)