~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

• browse files at revision 6615
• compare with another revision
• download diff
• download tarball
• view history from revision 6615

• reverse the comparison (6615 to 6079)
• stop comparing with revision 6079

Show diffs side-by-side

added

removed

bzrlib/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

31

31

    test_log,

32

32

    features,

33

33

    )

 

34

from bzrlib.tests.matchers import ContainsNoVfsCalls

34

35

 

35

36

 

36

37

class TestLog(tests.TestCaseWithTransport, test_log.TestLogMixin):

89

90

    def get_captured_revisions(self):

90

91

        return self.log_catcher.revisions

91

92

 

92

 

    def assertLogRevnos(self, args, expected_revnos, working_dir='.'):

93

 

        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)

94

99

        self.assertEqual(expected_revnos,

95

100

                         [r.revno for r in self.get_captured_revisions()])

96

101

 

200

205

        # 4  1.1.4

201

206

        # | /

202

207

        # 5

 

208

        # | \

 

209

        # | 5.1.1

 

210

        # | /

 

211

        # 6

203

212

 

204

213

        # mainline

205

214

        builder.build_snapshot('1', None, [

218

227

        builder.build_snapshot('1.1.4', ['1.1.3', '4'], [])

219

228

        # merge branch into mainline

220

229

        builder.build_snapshot('5', ['4', '1.1.4'], [])

 

230

        builder.build_snapshot('5.1.1', ['5'], [])

 

231

        builder.build_snapshot('6', ['5', '5.1.1'], [])

221

232

        builder.finish_series()

222

233

 

223

234

    def test_n0(self):

236

247

        self.assertLogRevnos(['-n1', '-r1.1.1..1.1.4', '--forward'],

237

248

                             ['1.1.1', '1.1.2', '1.1.3', '1.1.4'])

238

249

 

 

250

    def test_fallback_when_end_rev_is_not_on_mainline(self):

 

251

        self.assertLogRevnos(['-n1', '-r1.1.1..5.1.1'],

 

252

                             # We don't get 1.1.1 because we say -n1

 

253

                             ['5.1.1', '5', '4', '3'])

 

254

 

239

255

 

240

256

class Test_GenerateAllRevisions(TestLogWithLogCatcher):

241

257

 

253

269

        # The graph below may look a bit complicated (and it may be but I've

254

270

        # banged my head enough on it) but the bug requires at least dotted

255

271

        # revnos *and* merged revisions below that.

 

272

        # 1

 

273

        # | \

 

274

        # 2  1.1.1

 

275

        # | X

 

276

        # 3  2.1.1

 

277

        # |   |    \

 

278

        # |  2.1.2  2.2.1

 

279

        # |   |    X

 

280

        # |  2.1.3  \

 

281

        # | /       /

 

282

        # 4        /

 

283

        # |       /

 

284

        # 5 -----/

256

285

        builder.build_snapshot('1', None, [

257

286

            ('add', ('', 'root-id', 'directory', ''))])

258

287

        builder.build_snapshot('2', ['1'], [])

377

406

    def test_log_reversed_dotted_revspecs(self):

378

407

        self.make_merged_branch()

379

408

        self.run_bzr_error(('bzr: ERROR: Start revision not found in '

380

 

                            'left-hand history of end revision.\n',),

 

409

                            'history of end revision.\n',),

381

410

                           "log -r 1.1.1..1")

382

411

 

383

412

    def test_log_bad_message_re(self):

536

565

 

537

566

    def test_include_merges(self):

538

567

        # Confirm --include-merges gives the same output as -n0

539

 

        self.assertLogRevnos(['--include-merges'],

540

 

                             ['2', '1.1.2', '1.2.1', '1.1.1', '1'],

541

 

                             working_dir='level0')

542

 

        self.assertLogRevnos(['--include-merges'],

543

 

                             ['2', '1.1.2', '1.2.1', '1.1.1', '1'],

544

 

                             working_dir='level0')

 

568

        msg = ("The option '--include-merges' to 'bzr log' "

 

569

               "has been deprecated in bzr 2.5. "

 

570

               "Please use '--include-merged' instead.\n")

 

571

        self.assertLogRevnos(['--include-merges'],

 

572

                             ['2', '1.1.2', '1.2.1', '1.1.1', '1'],

 

573

                             working_dir='level0', err=msg)

 

574

        self.assertLogRevnos(['--include-merges'],

 

575

                             ['2', '1.1.2', '1.2.1', '1.1.1', '1'],

 

576

                             working_dir='level0', err=msg)

545

577

        out_im, err_im = self.run_bzr('log --include-merges',

546

578

                                      working_dir='level0')

547

579

        out_n0, err_n0 = self.run_bzr('log -n0', working_dir='level0')

548

 

        self.assertEqual('', err_im)

 

580

        self.assertEqual(msg, err_im)

549

581

        self.assertEqual('', err_n0)

550

582

        self.assertEqual(out_im, out_n0)

551

583

 

 

584

    def test_include_merged(self):

 

585

        # Confirm --include-merged gives the same output as -n0

 

586

        expected = ['2', '1.1.2', '1.2.1', '1.1.1', '1']

 

587

        self.assertLogRevnos(['--include-merged'],

 

588

                             expected, working_dir='level0')

 

589

        self.assertLogRevnos(['--include-merged'],

 

590

                             expected, working_dir='level0')

 

591

 

552

592

    def test_force_merge_revisions_N(self):

553

593

        self.assertLogRevnos(['-n2'],

554

594

                             ['2', '1.1.2', '1.1.1', '1'],

572

612

                [('2', 0), ('1.1.2', 1), ('1.2.1', 2)],

573

613

                working_dir='level0')

574

614

 

 

615

    def test_omit_merges_with_sidelines(self):

 

616

        self.assertLogRevnos(['--omit-merges', '-n0'], ['1.2.1', '1.1.1', '1'],

 

617

                             working_dir='level0')

 

618

 

 

619

    def test_omit_merges_without_sidelines(self):

 

620

        self.assertLogRevnos(['--omit-merges', '-n1'], ['1'],

 

621

                             working_dir='level0')

 

622

 

575

623

 

576

624

class TestLogDiff(TestLogWithLogCatcher):

577

625

 

789

837

        test_in_cp866 = '\x92\xa5\xe1\xe2'

790

838

        test_in_cp1251 = '\xd2\xe5\xf1\xf2'

791

839

        # Make sure the log string is encoded in cp866

792

 

        self.assertEquals(test_in_cp866, message[2:])

 

840

        self.assertEqual(test_in_cp866, message[2:])

793

841

        # Make sure the cp1251 string is not found anywhere

794

 

        self.assertEquals(-1, stdout.find(test_in_cp1251))

 

842

        self.assertEqual(-1, stdout.find(test_in_cp1251))

795

843

 

796

844

 

797

845

class TestLogFile(TestLogWithLogCatcher):

970

1018

        (stdout, stderr) = self.run_bzr(['log', '-r..2'], retcode=3)

971

1019

        self.assertEqual(["2", "1"],

972

1020

                         [r.revno for r in self.get_captured_revisions()])

973

 

        self.assertEquals("bzr: ERROR: Further revision history missing.", stderr)

 

1021

        self.assertEqual("bzr: ERROR: Further revision history missing.", stderr)

974

1022

 

975

1023

    def test_log_range_open_end(self):

976

1024

        self.assertLogRevnos(["-r1.."], ["2", "1"])

1029

1077

        self.assertLogRevnos(["--match-author", "author"], ["2", "1"])

1030

1078

        self.assertLogRevnos(["--match-author", "author1", 

1031

1079

                              "--match-author", "author2"], ["2", "1"])

 

1080

 

 

1081

 

 

1082

class TestSmartServerLog(tests.TestCaseWithTransport):

 

1083

 

 

1084

    def test_standard_log(self):

 

1085

        self.setup_smart_server_with_call_log()

 

1086

        t = self.make_branch_and_tree('branch')

 

1087

        self.build_tree_contents([('branch/foo', 'thecontents')])

 

1088

        t.add("foo")

 

1089

        t.commit("message")

 

1090

        self.reset_smart_call_log()

 

1091

        out, err = self.run_bzr(['log', self.get_url('branch')])

 

1092

        # This figure represent the amount of work to perform this use case. It

 

1093

        # is entirely ok to reduce this number if a test fails due to rpc_count

 

1094

        # being too low. If rpc_count increases, more network roundtrips have

 

1095

        # become necessary for this use case. Please do not adjust this number

 

1096

        # upwards without agreement from bzr's network support maintainers.

 

1097

        self.assertThat(self.hpss_calls, ContainsNoVfsCalls)

 

1098

        self.assertLength(1, self.hpss_connections)

 

1099

        self.assertLength(9, self.hpss_calls)

 

1100

 

 

1101

    def test_verbose_log(self):

 

1102

        self.setup_smart_server_with_call_log()

 

1103

        t = self.make_branch_and_tree('branch')

 

1104

        self.build_tree_contents([('branch/foo', 'thecontents')])

 

1105

        t.add("foo")

 

1106

        t.commit("message")

 

1107

        self.reset_smart_call_log()

 

1108

        out, err = self.run_bzr(['log', '-v', self.get_url('branch')])

 

1109

        # This figure represent the amount of work to perform this use case. It

 

1110

        # is entirely ok to reduce this number if a test fails due to rpc_count

 

1111

        # being too low. If rpc_count increases, more network roundtrips have

 

1112

        # become necessary for this use case. Please do not adjust this number

 

1113

        # upwards without agreement from bzr's network support maintainers.

 

1114

        self.assertLength(10, self.hpss_calls)

 

1115

        self.assertLength(1, self.hpss_connections)

 

1116

        self.assertThat(self.hpss_calls, ContainsNoVfsCalls)

 

1117

 

 

1118

    def test_per_file(self):

 

1119

        self.setup_smart_server_with_call_log()

 

1120

        t = self.make_branch_and_tree('branch')

 

1121

        self.build_tree_contents([('branch/foo', 'thecontents')])

 

1122

        t.add("foo")

 

1123

        t.commit("message")

 

1124

        self.reset_smart_call_log()

 

1125

        out, err = self.run_bzr(['log', '-v', self.get_url('branch') + "/foo"])

 

1126

        # This figure represent the amount of work to perform this use case. It

 

1127

        # is entirely ok to reduce this number if a test fails due to rpc_count

 

1128

        # being too low. If rpc_count increases, more network roundtrips have

 

1129

        # become necessary for this use case. Please do not adjust this number

 

1130

        # upwards without agreement from bzr's network support maintainers.

 

1131

        self.assertLength(14, self.hpss_calls)

 

1132

        self.assertLength(1, self.hpss_connections)

 

1133

        self.assertThat(self.hpss_calls, ContainsNoVfsCalls)

• Older »

Loggerhead is a web-based interface for Breezy
Version: 2.0.1