/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-07-30 21:23:44 UTC
  • mto: This revision was merged to the branch mainline in revision 6743.
  • Revision ID: jelmer@jelmer.uk-20170730212344-mumrkz1c4jbm9yzc
review comments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_log.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006-2012, 2016 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
 
18
 
"""Black-box tests for bzr log."""
19
 
 
20
 
from itertools import izip
 
18
"""Black-box tests for brz log."""
 
19
 
 
20
from __future__ import absolute_import
 
21
 
 
22
 
21
23
import os
22
 
import re
23
24
 
24
 
from bzrlib import (
 
25
from breezy import (
25
26
    branchbuilder,
26
27
    errors,
27
28
    log,
28
29
    osutils,
29
30
    tests,
30
31
    )
31
 
from bzrlib.tests import (
32
 
    script,
 
32
from breezy.tests import (
33
33
    test_log,
 
34
    features,
34
35
    )
 
36
from breezy.tests.matchers import ContainsNoVfsCalls
35
37
 
36
38
 
37
39
class TestLog(tests.TestCaseWithTransport, test_log.TestLogMixin):
57
59
 
58
60
    def make_merged_branch(self, path='.', format=None):
59
61
        tree = self.make_linear_branch(path, format)
60
 
        tree2 = tree.bzrdir.sprout('tree2',
 
62
        tree2 = tree.controldir.sprout('tree2',
61
63
            revision_id=tree.branch.get_rev_id(1)).open_workingtree()
62
64
        tree2.commit(message='tree2 message2')
63
65
        tree2.commit(message='tree2 message3')
77
79
                self.log_catcher = test_log.LogCatcher(*args, **kwargs)
78
80
                # Always return our own log formatter
79
81
                return self.log_catcher
 
82
        # Break cycle with closure over self on cleanup by removing method
 
83
        self.addCleanup(setattr, MyLogFormatter, "__new__", None)
80
84
 
81
85
        def getme(branch):
82
86
                # Always return our own log formatter class hijacking the
88
92
    def get_captured_revisions(self):
89
93
        return self.log_catcher.revisions
90
94
 
91
 
    def assertLogRevnos(self, args, expected_revnos, working_dir='.'):
92
 
        self.run_bzr(['log'] + args, working_dir=working_dir)
 
95
    def assertLogRevnos(self, args, expected_revnos, working_dir='.',
 
96
                        out='', err=''):
 
97
        actual_out, actual_err = self.run_bzr(['log'] + args,
 
98
                                              working_dir=working_dir)
 
99
        self.assertEqual(out, actual_out)
 
100
        self.assertEqual(err, actual_err)
93
101
        self.assertEqual(expected_revnos,
94
102
                         [r.revno for r in self.get_captured_revisions()])
95
103
 
158
166
        self.make_linear_branch()
159
167
        self.assertLogRevnos(['-c1'], ['1'])
160
168
 
 
169
    def test_branch_revspec(self):
 
170
        foo = self.make_branch_and_tree('foo')
 
171
        bar = self.make_branch_and_tree('bar')
 
172
        self.build_tree(['foo/foo.txt', 'bar/bar.txt'])
 
173
        foo.add('foo.txt')
 
174
        bar.add('bar.txt')
 
175
        foo.commit(message='foo')
 
176
        bar.commit(message='bar')
 
177
        self.run_bzr('log -r branch:../bar', working_dir='foo')
 
178
        self.assertEqual([bar.branch.get_rev_id(1)],
 
179
                         [r.rev.revision_id
 
180
                          for r in self.get_captured_revisions()])
 
181
 
 
182
 
 
183
class TestLogExcludeCommonAncestry(TestLogWithLogCatcher):
 
184
 
 
185
    def test_exclude_common_ancestry_simple_revnos(self):
 
186
        self.make_linear_branch()
 
187
        self.assertLogRevnos(['-r1..3', '--exclude-common-ancestry'],
 
188
                             ['3', '2'])
 
189
 
161
190
 
162
191
class TestLogMergedLinearAncestry(TestLogWithLogCatcher):
163
192
 
167
196
        # stop calling run_bzr, there is no point) --vila 100118.
168
197
        builder = branchbuilder.BranchBuilder(self.get_transport())
169
198
        builder.start_series()
 
199
        # 1
 
200
        # | \
 
201
        # 2  1.1.1
 
202
        # | / |
 
203
        # 3  1.1.2
 
204
        # |   |
 
205
        # |  1.1.3
 
206
        # | / |
 
207
        # 4  1.1.4
 
208
        # | /
 
209
        # 5
 
210
        # | \
 
211
        # | 5.1.1
 
212
        # | /
 
213
        # 6
 
214
 
170
215
        # mainline
171
216
        builder.build_snapshot('1', None, [
172
217
            ('add', ('', 'root-id', 'directory', ''))])
184
229
        builder.build_snapshot('1.1.4', ['1.1.3', '4'], [])
185
230
        # merge branch into mainline
186
231
        builder.build_snapshot('5', ['4', '1.1.4'], [])
 
232
        builder.build_snapshot('5.1.1', ['5'], [])
 
233
        builder.build_snapshot('6', ['5', '5.1.1'], [])
187
234
        builder.finish_series()
188
235
 
189
236
    def test_n0(self):
202
249
        self.assertLogRevnos(['-n1', '-r1.1.1..1.1.4', '--forward'],
203
250
                             ['1.1.1', '1.1.2', '1.1.3', '1.1.4'])
204
251
 
 
252
    def test_fallback_when_end_rev_is_not_on_mainline(self):
 
253
        self.assertLogRevnos(['-n1', '-r1.1.1..5.1.1'],
 
254
                             # We don't get 1.1.1 because we say -n1
 
255
                             ['5.1.1', '5', '4', '3'])
 
256
 
205
257
 
206
258
class Test_GenerateAllRevisions(TestLogWithLogCatcher):
207
259
 
219
271
        # The graph below may look a bit complicated (and it may be but I've
220
272
        # banged my head enough on it) but the bug requires at least dotted
221
273
        # revnos *and* merged revisions below that.
 
274
        # 1
 
275
        # | \
 
276
        # 2  1.1.1
 
277
        # | X
 
278
        # 3  2.1.1
 
279
        # |   |    \
 
280
        # |  2.1.2  2.2.1
 
281
        # |   |    X
 
282
        # |  2.1.3  \
 
283
        # | /       /
 
284
        # 4        /
 
285
        # |       /
 
286
        # 5 -----/
222
287
        builder.build_snapshot('1', None, [
223
288
            ('add', ('', 'root-id', 'directory', ''))])
224
289
        builder.build_snapshot('2', ['1'], [])
277
342
 
278
343
    def test_log_zero_revspec(self):
279
344
        self.make_minimal_branch()
280
 
        self.run_bzr_error(['bzr: ERROR: Logging revision 0 is invalid.'],
 
345
        self.run_bzr_error(['brz: ERROR: Logging revision 0 is invalid.'],
281
346
                           ['log', '-r0'])
282
347
 
283
348
    def test_log_zero_begin_revspec(self):
284
349
        self.make_linear_branch()
285
 
        self.run_bzr_error(['bzr: ERROR: Logging revision 0 is invalid.'],
 
350
        self.run_bzr_error(['brz: ERROR: Logging revision 0 is invalid.'],
286
351
                           ['log', '-r0..2'])
287
352
 
288
353
    def test_log_zero_end_revspec(self):
289
354
        self.make_linear_branch()
290
 
        self.run_bzr_error(['bzr: ERROR: Logging revision 0 is invalid.'],
 
355
        self.run_bzr_error(['brz: ERROR: Logging revision 0 is invalid.'],
291
356
                           ['log', '-r-2..0'])
292
357
 
293
358
    def test_log_nonexistent_revno(self):
294
359
        self.make_minimal_branch()
295
 
        self.run_bzr_error(["bzr: ERROR: Requested revision: '1234' "
 
360
        self.run_bzr_error(["brz: ERROR: Requested revision: '1234' "
296
361
                            "does not exist in branch:"],
297
362
                           ['log', '-r1234'])
298
363
 
299
364
    def test_log_nonexistent_dotted_revno(self):
300
365
        self.make_minimal_branch()
301
 
        self.run_bzr_error(["bzr: ERROR: Requested revision: '123.123' "
 
366
        self.run_bzr_error(["brz: ERROR: Requested revision: '123.123' "
302
367
                            "does not exist in branch:"],
303
368
                           ['log',  '-r123.123'])
304
369
 
305
370
    def test_log_change_nonexistent_revno(self):
306
371
        self.make_minimal_branch()
307
 
        self.run_bzr_error(["bzr: ERROR: Requested revision: '1234' "
 
372
        self.run_bzr_error(["brz: ERROR: Requested revision: '1234' "
308
373
                            "does not exist in branch:"],
309
374
                           ['log',  '-c1234'])
310
375
 
311
376
    def test_log_change_nonexistent_dotted_revno(self):
312
377
        self.make_minimal_branch()
313
 
        self.run_bzr_error(["bzr: ERROR: Requested revision: '123.123' "
 
378
        self.run_bzr_error(["brz: ERROR: Requested revision: '123.123' "
314
379
                            "does not exist in branch:"],
315
380
                           ['log', '-c123.123'])
316
381
 
317
382
    def test_log_change_single_revno_only(self):
318
383
        self.make_minimal_branch()
319
 
        self.run_bzr_error(['bzr: ERROR: Option --change does not'
 
384
        self.run_bzr_error(['brz: ERROR: Option --change does not'
320
385
                           ' accept revision ranges'],
321
386
                           ['log', '--change', '2..3'])
322
387
 
323
388
    def test_log_change_incompatible_with_revision(self):
324
 
        self.run_bzr_error(['bzr: ERROR: --revision and --change'
 
389
        self.run_bzr_error(['brz: ERROR: --revision and --change'
325
390
                           ' are mutually exclusive'],
326
391
                           ['log', '--change', '2', '--revision', '3'])
327
392
 
336
401
 
337
402
    def test_log_reversed_revspecs(self):
338
403
        self.make_linear_branch()
339
 
        self.run_bzr_error(('bzr: ERROR: Start revision must be older than '
 
404
        self.run_bzr_error(('brz: ERROR: Start revision must be older than '
340
405
                            'the end revision.\n',),
341
406
                           ['log', '-r3..1'])
342
407
 
343
408
    def test_log_reversed_dotted_revspecs(self):
344
409
        self.make_merged_branch()
345
 
        self.run_bzr_error(('bzr: ERROR: Start revision not found in '
346
 
                            'left-hand history of end revision.\n',),
 
410
        self.run_bzr_error(('brz: ERROR: Start revision not found in '
 
411
                            'history of end revision.\n',),
347
412
                           "log -r 1.1.1..1")
348
413
 
349
414
    def test_log_bad_message_re(self):
350
415
        """Bad --message argument gives a sensible message
351
 
        
 
416
 
352
417
        See https://bugs.launchpad.net/bzr/+bug/251352
353
418
        """
354
419
        self.make_minimal_branch()
355
420
        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)
 
421
        self.assertContainsRe(err, "ERROR.*Invalid pattern.*nothing to repeat")
 
422
        self.assertNotContainsRe(err, "Unprintable exception")
 
423
        self.assertEqual(out, '')
361
424
 
362
425
    def test_log_unsupported_timezone(self):
363
426
        self.make_linear_branch()
364
 
        self.run_bzr_error(['bzr: ERROR: Unsupported timezone format "foo", '
 
427
        self.run_bzr_error(['brz: ERROR: Unsupported timezone format "foo", '
365
428
                            'options are "utc", "original", "local".'],
366
429
                           ['log', '--timezone', 'foo'])
367
430
 
368
431
    def test_log_exclude_ancestry_no_range(self):
369
432
        self.make_linear_branch()
370
 
        self.run_bzr_error(['bzr: ERROR: --exclude-common-ancestry'
 
433
        self.run_bzr_error(['brz: ERROR: --exclude-common-ancestry'
371
434
                            ' requires -r with two revisions'],
372
435
                           ['log', '--exclude-common-ancestry'])
373
436
 
374
437
    def test_log_exclude_ancestry_single_revision(self):
375
438
        self.make_merged_branch()
376
 
        self.run_bzr_error(['bzr: ERROR: --exclude-common-ancestry'
 
439
        self.run_bzr_error(['brz: ERROR: --exclude-common-ancestry'
377
440
                            ' requires two different revisions'],
378
441
                           ['log', '--exclude-common-ancestry',
379
442
                            '-r1.1.1..1.1.1'])
399
462
        branch1_tree = self.make_linear_branch('branch1',
400
463
                                               format='dirstate-tags')
401
464
        branch1 = branch1_tree.branch
402
 
        branch2_tree = branch1_tree.bzrdir.sprout('branch2').open_workingtree()
 
465
        branch2_tree = branch1_tree.controldir.sprout('branch2').open_workingtree()
403
466
        branch1_tree.commit(message='foobar', allow_pointless=True)
404
467
        branch1.tags.set_tag('tag1', branch1.last_revision())
405
468
        # tags don't propagate if we don't merge
411
474
        self.assertContainsRe(log, r'tags: tag1')
412
475
 
413
476
 
 
477
class TestLogSignatures(TestLog):
 
478
 
 
479
    def test_log_with_signatures(self):
 
480
        self.requireFeature(features.gpg)
 
481
 
 
482
        tree = self.make_linear_branch(format='dirstate-tags')
 
483
 
 
484
        log = self.run_bzr("log --signatures")[0]
 
485
        self.assertTrue('signature: no signature' in log)
 
486
 
 
487
    def test_log_without_signatures(self):
 
488
        self.requireFeature(features.gpg)
 
489
 
 
490
        tree = self.make_linear_branch(format='dirstate-tags')
 
491
 
 
492
        log = self.run_bzr("log")[0]
 
493
        self.assertFalse('signature: no signature' in log)
 
494
 
 
495
 
414
496
class TestLogVerbose(TestLog):
415
497
 
416
498
    def setUp(self):
432
514
    def test_log_short_verbose(self):
433
515
        self.assertUseShortDeltaFormat(['log', '--short', '-v'])
434
516
 
 
517
    def test_log_s_verbose(self):
 
518
        self.assertUseShortDeltaFormat(['log', '-S', '-v'])
 
519
 
435
520
    def test_log_short_verbose_verbose(self):
436
521
        self.assertUseLongDeltaFormat(['log', '--short', '-vv'])
437
522
 
455
540
    def make_branches_with_merges(self):
456
541
        level0 = self.make_branch_and_tree('level0')
457
542
        self.wt_commit(level0, 'in branch level0')
458
 
        level1 = level0.bzrdir.sprout('level1').open_workingtree()
 
543
        level1 = level0.controldir.sprout('level1').open_workingtree()
459
544
        self.wt_commit(level1, 'in branch level1')
460
 
        level2 = level1.bzrdir.sprout('level2').open_workingtree()
 
545
        level2 = level1.controldir.sprout('level2').open_workingtree()
461
546
        self.wt_commit(level2, 'in branch level2')
462
547
        level1.merge_from_branch(level2.branch)
463
548
        self.wt_commit(level1, 'merge branch level2')
480
565
        self.assertLogRevnos(['-n0'], ['2', '1.1.2', '1.2.1', '1.1.1', '1'],
481
566
                             working_dir='level0')
482
567
 
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)
 
568
    def test_include_merged(self):
 
569
        # Confirm --include-merged gives the same output as -n0
 
570
        expected = ['2', '1.1.2', '1.2.1', '1.1.1', '1']
 
571
        self.assertLogRevnos(['--include-merged'],
 
572
                             expected, working_dir='level0')
 
573
        self.assertLogRevnos(['--include-merged'],
 
574
                             expected, working_dir='level0')
497
575
 
498
576
    def test_force_merge_revisions_N(self):
499
577
        self.assertLogRevnos(['-n2'],
518
596
                [('2', 0), ('1.1.2', 1), ('1.2.1', 2)],
519
597
                working_dir='level0')
520
598
 
 
599
    def test_omit_merges_with_sidelines(self):
 
600
        self.assertLogRevnos(['--omit-merges', '-n0'], ['1.2.1', '1.1.1', '1'],
 
601
                             working_dir='level0')
 
602
 
 
603
    def test_omit_merges_without_sidelines(self):
 
604
        self.assertLogRevnos(['--omit-merges', '-n1'], ['1'],
 
605
                             working_dir='level0')
 
606
 
521
607
 
522
608
class TestLogDiff(TestLogWithLogCatcher):
523
609
 
536
622
        level0.add('file2')
537
623
        self.wt_commit(level0, 'in branch level0')
538
624
 
539
 
        level1 = level0.bzrdir.sprout('level1').open_workingtree()
 
625
        level1 = level0.controldir.sprout('level1').open_workingtree()
540
626
        self.build_tree_contents([('level1/file2', 'hello\n')])
541
627
        self.wt_commit(level1, 'in branch level1')
542
628
        level0.merge_from_branch(level1.branch)
591
677
                           for r in self.get_captured_revisions()])
592
678
        # Now check the diffs, adding the revno  in case of failure
593
679
        fmt = 'In revno %s\n%s'
594
 
        for expected_rev, actual_rev in izip(expected,
595
 
                                             self.get_captured_revisions()):
 
680
        for expected_rev, actual_rev in zip(expected,
 
681
                                            self.get_captured_revisions()):
596
682
            revno, depth, expected_diff = expected_rev
597
683
            actual_diff = actual_rev.diff
598
684
            self.assertEqualDiff(fmt % (revno, expected_diff),
669
755
        self.overrideAttr(osutils, '_cached_user_encoding')
670
756
 
671
757
    def create_branch(self):
672
 
        bzr = self.run_bzr
673
 
        bzr('init')
 
758
        brz = self.run_bzr
 
759
        brz('init')
674
760
        self.build_tree_contents([('a', 'some stuff\n')])
675
 
        bzr('add a')
676
 
        bzr(['commit', '-m', self._message])
 
761
        brz('add a')
 
762
        brz(['commit', '-m', self._message])
677
763
 
678
764
    def try_encoding(self, encoding, fail=False):
679
 
        bzr = self.run_bzr
 
765
        brz = self.run_bzr
680
766
        if fail:
681
767
            self.assertRaises(UnicodeEncodeError,
682
768
                self._mu.encode, encoding)
686
772
 
687
773
        old_encoding = osutils._cached_user_encoding
688
774
        # This test requires that 'run_bzr' uses the current
689
 
        # bzrlib, because we override user_encoding, and expect
 
775
        # breezy, because we override user_encoding, and expect
690
776
        # it to be used
691
777
        try:
692
778
            osutils._cached_user_encoding = 'ascii'
693
779
            # We should be able to handle any encoding
694
 
            out, err = bzr('log', encoding=encoding)
 
780
            out, err = brz('log', encoding=encoding)
695
781
            if not fail:
696
782
                # Make sure we wrote mu as we expected it to exist
697
783
                self.assertNotEqual(-1, out.find(encoded_msg))
715
801
            self.try_encoding(encoding, fail=True)
716
802
 
717
803
    def test_stdout_encoding(self):
718
 
        bzr = self.run_bzr
 
804
        brz = self.run_bzr
719
805
        osutils._cached_user_encoding = "cp1251"
720
806
 
721
 
        bzr('init')
 
807
        brz('init')
722
808
        self.build_tree(['a'])
723
 
        bzr('add a')
724
 
        bzr(['commit', '-m', u'\u0422\u0435\u0441\u0442'])
 
809
        brz('add a')
 
810
        brz(['commit', '-m', u'\u0422\u0435\u0441\u0442'])
725
811
        stdout, stderr = self.run_bzr('log', encoding='cp866')
726
812
 
727
813
        message = stdout.splitlines()[-1]
735
821
        test_in_cp866 = '\x92\xa5\xe1\xe2'
736
822
        test_in_cp1251 = '\xd2\xe5\xf1\xf2'
737
823
        # Make sure the log string is encoded in cp866
738
 
        self.assertEquals(test_in_cp866, message[2:])
 
824
        self.assertEqual(test_in_cp866, message[2:])
739
825
        # Make sure the cp1251 string is not found anywhere
740
 
        self.assertEquals(-1, stdout.find(test_in_cp1251))
 
826
        self.assertEqual(-1, stdout.find(test_in_cp1251))
741
827
 
742
828
 
743
829
class TestLogFile(TestLogWithLogCatcher):
748
834
        self.build_tree(['tree/file'])
749
835
        tree.add('file')
750
836
        tree.commit('revision 1')
751
 
        tree.bzrdir.destroy_workingtree()
 
837
        tree.controldir.destroy_workingtree()
752
838
        self.run_bzr('log tree/file')
753
839
 
754
840
    def prepare_tree(self, complex=False):
761
847
        tree.commit('add file2')
762
848
        tree.add('file3')
763
849
        tree.commit('add file3')
764
 
        child_tree = tree.bzrdir.sprout('child').open_workingtree()
 
850
        child_tree = tree.controldir.sprout('child').open_workingtree()
765
851
        self.build_tree_contents([('child/file2', 'hello')])
766
852
        child_tree.commit(message='branch 1')
767
853
        tree.merge_from_branch(child_tree.branch)
854
940
        tree.commit('add file4')
855
941
        tree.add('dir1/file5')
856
942
        tree.commit('add file5')
857
 
        child_tree = tree.bzrdir.sprout('child').open_workingtree()
 
943
        child_tree = tree.controldir.sprout('child').open_workingtree()
858
944
        self.build_tree_contents([('child/file2', 'hello')])
859
945
        child_tree.commit(message='branch 1')
860
946
        tree.merge_from_branch(child_tree.branch)
893
979
        self.prepare_tree()
894
980
        os.chdir("dir1")
895
981
        self.assertLogRevnos(['dir2', 'file5'], ['5', '3'])
 
982
 
 
983
 
 
984
class MainlineGhostTests(TestLogWithLogCatcher):
 
985
 
 
986
    def setUp(self):
 
987
        super(MainlineGhostTests, self).setUp()
 
988
        tree = self.make_branch_and_tree('')
 
989
        tree.set_parent_ids(["spooky"], allow_leftmost_as_ghost=True)
 
990
        tree.add('')
 
991
        tree.commit('msg1', rev_id='rev1')
 
992
        tree.commit('msg2', rev_id='rev2')
 
993
 
 
994
    def test_log_range(self):
 
995
        self.assertLogRevnos(["-r1..2"], ["2", "1"])
 
996
 
 
997
    def test_log_norange(self):
 
998
        self.assertLogRevnos([], ["2", "1"])
 
999
 
 
1000
    def test_log_range_open_begin(self):
 
1001
        (stdout, stderr) = self.run_bzr(['log', '-r..2'], retcode=3)
 
1002
        self.assertEqual(["2", "1"],
 
1003
                         [r.revno for r in self.get_captured_revisions()])
 
1004
        self.assertEqual("brz: ERROR: Further revision history missing.\n",
 
1005
                stderr)
 
1006
 
 
1007
    def test_log_range_open_end(self):
 
1008
        self.assertLogRevnos(["-r1.."], ["2", "1"])
 
1009
 
 
1010
 
 
1011
class TestLogMatch(TestLogWithLogCatcher):
 
1012
 
 
1013
    def prepare_tree(self):
 
1014
        tree = self.make_branch_and_tree('')
 
1015
        self.build_tree(
 
1016
            ['/hello.txt', '/goodbye.txt'])
 
1017
        tree.add('hello.txt')
 
1018
        tree.commit(message='message1', committer='committer1', authors=['author1'])
 
1019
        tree.add('goodbye.txt')
 
1020
        tree.commit(message='message2', committer='committer2', authors=['author2'])
 
1021
 
 
1022
    def test_message(self):
 
1023
        self.prepare_tree()
 
1024
        self.assertLogRevnos(["-m", "message1"], ["1"])
 
1025
        self.assertLogRevnos(["-m", "message2"], ["2"])
 
1026
        self.assertLogRevnos(["-m", "message"], ["2", "1"])
 
1027
        self.assertLogRevnos(["-m", "message1", "-m", "message2"], ["2", "1"])
 
1028
        self.assertLogRevnos(["--match-message", "message1"], ["1"])
 
1029
        self.assertLogRevnos(["--match-message", "message2"], ["2"])
 
1030
        self.assertLogRevnos(["--match-message", "message"], ["2", "1"])
 
1031
        self.assertLogRevnos(["--match-message", "message1", 
 
1032
                              "--match-message", "message2"], ["2", "1"])
 
1033
        self.assertLogRevnos(["--message", "message1"], ["1"])
 
1034
        self.assertLogRevnos(["--message", "message2"], ["2"])
 
1035
        self.assertLogRevnos(["--message", "message"], ["2", "1"])
 
1036
        self.assertLogRevnos(["--match-message", "message1", 
 
1037
                              "--message", "message2"], ["2", "1"])
 
1038
        self.assertLogRevnos(["--message", "message1", 
 
1039
                              "--match-message", "message2"], ["2", "1"])
 
1040
 
 
1041
    def test_committer(self):
 
1042
        self.prepare_tree()
 
1043
        self.assertLogRevnos(["-m", "committer1"], ["1"])
 
1044
        self.assertLogRevnos(["-m", "committer2"], ["2"])
 
1045
        self.assertLogRevnos(["-m", "committer"], ["2", "1"])
 
1046
        self.assertLogRevnos(["-m", "committer1", "-m", "committer2"], 
 
1047
                             ["2", "1"])
 
1048
        self.assertLogRevnos(["--match-committer", "committer1"], ["1"])
 
1049
        self.assertLogRevnos(["--match-committer", "committer2"], ["2"])
 
1050
        self.assertLogRevnos(["--match-committer", "committer"], ["2", "1"])
 
1051
        self.assertLogRevnos(["--match-committer", "committer1", 
 
1052
                              "--match-committer", "committer2"], ["2", "1"])
 
1053
 
 
1054
    def test_author(self):
 
1055
        self.prepare_tree()
 
1056
        self.assertLogRevnos(["-m", "author1"], ["1"])
 
1057
        self.assertLogRevnos(["-m", "author2"], ["2"])
 
1058
        self.assertLogRevnos(["-m", "author"], ["2", "1"])
 
1059
        self.assertLogRevnos(["-m", "author1", "-m", "author2"], 
 
1060
                             ["2", "1"])
 
1061
        self.assertLogRevnos(["--match-author", "author1"], ["1"])
 
1062
        self.assertLogRevnos(["--match-author", "author2"], ["2"])
 
1063
        self.assertLogRevnos(["--match-author", "author"], ["2", "1"])
 
1064
        self.assertLogRevnos(["--match-author", "author1", 
 
1065
                              "--match-author", "author2"], ["2", "1"])
 
1066
 
 
1067
 
 
1068
class TestSmartServerLog(tests.TestCaseWithTransport):
 
1069
 
 
1070
    def test_standard_log(self):
 
1071
        self.setup_smart_server_with_call_log()
 
1072
        t = self.make_branch_and_tree('branch')
 
1073
        self.build_tree_contents([('branch/foo', 'thecontents')])
 
1074
        t.add("foo")
 
1075
        t.commit("message")
 
1076
        self.reset_smart_call_log()
 
1077
        out, err = self.run_bzr(['log', self.get_url('branch')])
 
1078
        # This figure represent the amount of work to perform this use case. It
 
1079
        # is entirely ok to reduce this number if a test fails due to rpc_count
 
1080
        # being too low. If rpc_count increases, more network roundtrips have
 
1081
        # become necessary for this use case. Please do not adjust this number
 
1082
        # upwards without agreement from bzr's network support maintainers.
 
1083
        self.assertThat(self.hpss_calls, ContainsNoVfsCalls)
 
1084
        self.assertLength(1, self.hpss_connections)
 
1085
        self.assertLength(9, self.hpss_calls)
 
1086
 
 
1087
    def test_verbose_log(self):
 
1088
        self.setup_smart_server_with_call_log()
 
1089
        t = self.make_branch_and_tree('branch')
 
1090
        self.build_tree_contents([('branch/foo', 'thecontents')])
 
1091
        t.add("foo")
 
1092
        t.commit("message")
 
1093
        self.reset_smart_call_log()
 
1094
        out, err = self.run_bzr(['log', '-v', self.get_url('branch')])
 
1095
        # This figure represent the amount of work to perform this use case. It
 
1096
        # is entirely ok to reduce this number if a test fails due to rpc_count
 
1097
        # being too low. If rpc_count increases, more network roundtrips have
 
1098
        # become necessary for this use case. Please do not adjust this number
 
1099
        # upwards without agreement from bzr's network support maintainers.
 
1100
        self.assertLength(10, self.hpss_calls)
 
1101
        self.assertLength(1, self.hpss_connections)
 
1102
        self.assertThat(self.hpss_calls, ContainsNoVfsCalls)
 
1103
 
 
1104
    def test_per_file(self):
 
1105
        self.setup_smart_server_with_call_log()
 
1106
        t = self.make_branch_and_tree('branch')
 
1107
        self.build_tree_contents([('branch/foo', 'thecontents')])
 
1108
        t.add("foo")
 
1109
        t.commit("message")
 
1110
        self.reset_smart_call_log()
 
1111
        out, err = self.run_bzr(['log', '-v', self.get_url('branch') + "/foo"])
 
1112
        # This figure represent the amount of work to perform this use case. It
 
1113
        # is entirely ok to reduce this number if a test fails due to rpc_count
 
1114
        # being too low. If rpc_count increases, more network roundtrips have
 
1115
        # become necessary for this use case. Please do not adjust this number
 
1116
        # upwards without agreement from bzr's network support maintainers.
 
1117
        self.assertLength(14, self.hpss_calls)
 
1118
        self.assertLength(1, self.hpss_connections)
 
1119
        self.assertThat(self.hpss_calls, ContainsNoVfsCalls)