~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_revisionspec.py

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

• reverse the comparison (4224 to 6617)
• stop comparing with revision 6617

Show diffs side-by-side

added

removed

bzrlib/tests/test_revisionspec.py

1

 

# Copyright (C) 2005-2012, 2016 Canonical Ltd

 

1

# Copyright (C) 2004, 2005, 2006, 2007 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

import datetime

 

18

import os

18

19

import time

19

20

 

20

21

from bzrlib import (

 

22

    branch,

 

23

    bzrdir,

21

24

    errors,

 

25

    repository,

22

26

    revision as _mod_revision,

23

 

    symbol_versioning,

24

27

    )

25

 

from bzrlib.tests import TestCaseWithTransport

 

28

from bzrlib.tests import TestCase, TestCaseWithTransport

26

29

from bzrlib.revisionspec import (

27

 

    RevisionInfo,

28

30

    RevisionSpec,

29

 

    RevisionSpec_dwim,

 

31

    RevisionSpec_revno,

30

32

    RevisionSpec_tag,

31

33

    )

32

34

 

119

121

        # If wants_revision_history = True, then _match_on should get the

120

122

        # branch revision history

121

123

        spec = RevisionSpecMatchOnTrap('foo', _internal=True)

122

 

        spec.wants_revision_history = True

123

 

        self.callDeprecated(['RevisionSpec.wants_revision_history was '

124

 

            'deprecated in 2.5 (RevisionSpecMatchOnTrap).'],

125

 

            spec.in_history, self.tree.branch)

 

124

        spec.in_history(self.tree.branch)

126

125

 

127

126

        self.assertEqual((self.tree.branch, ['r1' ,'r2']),

128

127

                         spec.last_call)

131

130

        # If wants_revision_history = False, then _match_on should get None for

132

131

        # the branch revision history

133

132

        spec = RevisionSpecMatchOnTrap('foo', _internal=True)

 

133

        spec.wants_revision_history = False

134

134

        spec.in_history(self.tree.branch)

135

135

 

136

136

        self.assertEqual((self.tree.branch, None), spec.last_call)

146

146

    def test_object(self):

147

147

        self.assertRaises(TypeError, RevisionSpec.from_string, object())

148

148

 

149

 

 

150

 

class RevisionSpec_bork(RevisionSpec):

151

 

 

152

 

    prefix = 'irrelevant:'

153

 

 

154

 

    def _match_on(self, branch, revs):

155

 

        if self.spec == "bork":

156

 

            return RevisionInfo.from_revision_id(branch, "r1")

157

 

        else:

158

 

            raise errors.InvalidRevisionSpec(self.spec, branch)

159

 

 

160

 

 

161

 

class TestRevisionSpec_dwim(TestRevisionSpec):

162

 

 

163

 

    # Don't need to test revno's explicitly since TRS_revno already

164

 

    # covers that well for us

165

 

    def test_dwim_spec_revno(self):

166

 

        self.assertInHistoryIs(2, 'r2', '2')

167

 

        self.assertAsRevisionId('alt_r2', '1.1.1')

168

 

 

169

 

    def test_dwim_spec_revid(self):

170

 

        self.assertInHistoryIs(2, 'r2', 'r2')

171

 

 

172

 

    def test_dwim_spec_tag(self):

173

 

        self.tree.branch.tags.set_tag('footag', 'r1')

174

 

        self.assertAsRevisionId('r1', 'footag')

175

 

        self.tree.branch.tags.delete_tag('footag')

176

 

        self.assertRaises(errors.InvalidRevisionSpec,

177

 

                          self.get_in_history, 'footag')

178

 

 

179

 

    def test_dwim_spec_tag_that_looks_like_revno(self):

180

 

        # Test that we slip past revno with things that look like revnos,

181

 

        # but aren't.  Tags are convenient for testing this since we can

182

 

        # make them look however we want.

183

 

        self.tree.branch.tags.set_tag('3', 'r2')

184

 

        self.assertAsRevisionId('r2', '3')

185

 

        self.build_tree(['tree/b'])

186

 

        self.tree.add(['b'])

187

 

        self.tree.commit('b', rev_id='r3')

188

 

        self.assertAsRevisionId('r3', '3')

189

 

 

190

 

    def test_dwim_spec_date(self):

191

 

        self.assertAsRevisionId('r1', 'today')

192

 

 

193

 

    def test_dwim_spec_branch(self):

194

 

        self.assertInHistoryIs(None, 'alt_r2', 'tree2')

195

 

 

196

 

    def test_dwim_spec_nonexistent(self):

197

 

        self.assertInvalid('somethingrandom', invalid_as_revision_id=False)

198

 

        self.assertInvalid('-1.1', invalid_as_revision_id=False)

199

 

        self.assertInvalid('.1', invalid_as_revision_id=False)

200

 

        self.assertInvalid('1..1', invalid_as_revision_id=False)

201

 

        self.assertInvalid('1.2..1', invalid_as_revision_id=False)

202

 

        self.assertInvalid('1.', invalid_as_revision_id=False)

203

 

 

204

 

    def test_append_dwim_revspec(self):

205

 

        original_dwim_revspecs = list(RevisionSpec_dwim._possible_revspecs)

206

 

        def reset_dwim_revspecs():

207

 

            RevisionSpec_dwim._possible_revspecs = original_dwim_revspecs

208

 

        self.addCleanup(reset_dwim_revspecs)

209

 

        RevisionSpec_dwim.append_possible_revspec(RevisionSpec_bork)

210

 

        self.assertAsRevisionId('r1', 'bork')

211

 

 

212

 

    def test_append_lazy_dwim_revspec(self):

213

 

        original_dwim_revspecs = list(RevisionSpec_dwim._possible_revspecs)

214

 

        def reset_dwim_revspecs():

215

 

            RevisionSpec_dwim._possible_revspecs = original_dwim_revspecs

216

 

        self.addCleanup(reset_dwim_revspecs)

217

 

        RevisionSpec_dwim.append_possible_lazy_revspec(

218

 

            "bzrlib.tests.test_revisionspec", "RevisionSpec_bork")

219

 

        self.assertAsRevisionId('r1', 'bork')

 

149

    def test_unregistered_spec(self):

 

150

        self.assertRaises(errors.NoSuchRevisionSpec,

 

151

                          RevisionSpec.from_string, 'foo')

 

152

        self.assertRaises(errors.NoSuchRevisionSpec,

 

153

                          RevisionSpec.from_string, '123a')

 

154

 

 

155

 

 

156

 

 

157

class TestRevnoFromString(TestCase):

 

158

 

 

159

    def test_from_string_dotted_decimal(self):

 

160

        self.assertRaises(errors.NoSuchRevisionSpec, RevisionSpec.from_string, '-1.1')

 

161

        self.assertRaises(errors.NoSuchRevisionSpec, RevisionSpec.from_string, '.1')

 

162

        self.assertRaises(errors.NoSuchRevisionSpec, RevisionSpec.from_string, '1..1')

 

163

        self.assertRaises(errors.NoSuchRevisionSpec, RevisionSpec.from_string, '1.2..1')

 

164

        self.assertRaises(errors.NoSuchRevisionSpec, RevisionSpec.from_string, '1.')

 

165

        self.assertIsInstance(RevisionSpec.from_string('1.1'), RevisionSpec_revno)

 

166

        self.assertIsInstance(RevisionSpec.from_string('1.1.3'), RevisionSpec_revno)

220

167

 

221

168

 

222

169

class TestRevisionSpec_revno(TestRevisionSpec):

363

310

 

364

311

    def test_as_tree(self):

365

312

        tree = self.get_as_tree('0')

366

 

        self.assertEqual(_mod_revision.NULL_REVISION, tree.get_revision_id())

 

313

        self.assertEquals(_mod_revision.NULL_REVISION, tree.get_revision_id())

367

314

        tree = self.get_as_tree('1')

368

 

        self.assertEqual('r1', tree.get_revision_id())

 

315

        self.assertEquals('r1', tree.get_revision_id())

369

316

        tree = self.get_as_tree('2')

370

 

        self.assertEqual('r2', tree.get_revision_id())

 

317

        self.assertEquals('r2', tree.get_revision_id())

371

318

        tree = self.get_as_tree('-2')

372

 

        self.assertEqual('r1', tree.get_revision_id())

 

319

        self.assertEquals('r1', tree.get_revision_id())

373

320

        tree = self.get_as_tree('-1')

374

 

        self.assertEqual('r2', tree.get_revision_id())

 

321

        self.assertEquals('r2', tree.get_revision_id())

375

322

        tree = self.get_as_tree('1.1.1')

376

 

        self.assertEqual('alt_r2', tree.get_revision_id())

 

323

        self.assertEquals('alt_r2', tree.get_revision_id())

377

324

 

378

325

 

379

326

class TestRevisionSpec_revid(TestRevisionSpec):

400

347

        """We can get any revision id in the repository"""

401

348

        # XXX: This may change in the future, but for now, it is true

402

349

        self.tree2.commit('alt third', rev_id='alt_r3')

403

 

        self.tree.branch.fetch(self.tree2.branch, 'alt_r3')

 

350

        self.tree.branch.repository.fetch(self.tree2.branch.repository,

 

351

                                          revision_id='alt_r3')

404

352

        self.assertInHistoryIs(None, 'alt_r3', 'revid:alt_r3')

405

353

 

406

354

    def test_unicode(self):

477

425

    def test_alt_no_parents(self):

478

426

        new_tree = self.make_branch_and_tree('new_tree')

479

427

        new_tree.commit('first', rev_id='new_r1')

480

 

        self.tree.branch.fetch(new_tree.branch, 'new_r1')

 

428

        self.tree.branch.repository.fetch(new_tree.branch.repository,

 

429

                                          revision_id='new_r1')

481

430

        self.assertInHistoryIs(0, 'null:', 'before:revid:new_r1')

482

431

 

483

432

    def test_as_revision_id(self):

642

591

        # XXX: Right now, we use fetch() to make sure the remote revisions

643

592

        # have been pulled into the local branch. We may change that

644

593

        # behavior in the future.

645

 

        self.assertTrue(self.tree.branch.repository.has_revision('new_r3'))

 

594

        self.failUnless(self.tree.branch.repository.has_revision('new_r3'))

646

595

 

647

596

    def test_no_commits(self):

648

597

        new_tree = self.make_branch_and_tree('new_tree')

656

605

 

657

606

    def test_as_tree(self):

658

607

        tree = self.get_as_tree('branch:tree', self.tree2)

659

 

        self.assertEqual('r2', tree.get_revision_id())

 

608

        self.assertEquals('r2', tree.get_revision_id())

660

609

        self.assertFalse(self.tree2.branch.repository.has_revision('r2'))

661

610

 

662

611

 

678

627

    def test_as_revision_id(self):

679

628

        self.tree.branch.set_submit_branch('tree2')

680

629

        self.assertAsRevisionId('alt_r2', 'branch:tree2')

681

 

 

682

 

 

683

 

class TestRevisionSpec_mainline(TestRevisionSpec):

684

 

 

685

 

    def test_as_revision_id(self):

686

 

        self.assertAsRevisionId('r1', 'mainline:1')

687

 

        self.assertAsRevisionId('r2', 'mainline:1.1.1')

688

 

        self.assertAsRevisionId('r2', 'mainline:revid:alt_r2')

689

 

        spec = RevisionSpec.from_string('mainline:revid:alt_r22')

690

 

        e = self.assertRaises(errors.InvalidRevisionSpec,

691

 

                              spec.as_revision_id, self.tree.branch)

692

 

        self.assertContainsRe(str(e),

693

 

            "Requested revision: 'mainline:revid:alt_r22' does not exist in"

694

 

            " branch: ")

695

 

 

696

 

    def test_in_history(self):

697

 

        self.assertInHistoryIs(2, 'r2', 'mainline:revid:alt_r2')

698

 

 

699

 

 

700

 

class TestRevisionSpec_annotate(TestRevisionSpec):

701

 

 

702

 

    def setUp(self):

703

 

        super(TestRevisionSpec_annotate, self).setUp()

704

 

        self.tree = self.make_branch_and_tree('annotate-tree')

705

 

        self.build_tree_contents([('annotate-tree/file1', '1\n')])

706

 

        self.tree.add('file1')

707

 

        self.tree.commit('r1', rev_id='r1')

708

 

        self.build_tree_contents([('annotate-tree/file1', '2\n1\n')])

709

 

        self.tree.commit('r2', rev_id='r2')

710

 

        self.build_tree_contents([('annotate-tree/file1', '2\n1\n3\n')])

711

 

 

712

 

    def test_as_revision_id_r1(self):

713

 

        self.assertAsRevisionId('r1', 'annotate:annotate-tree/file1:2')

714

 

 

715

 

    def test_as_revision_id_r2(self):

716

 

        self.assertAsRevisionId('r2', 'annotate:annotate-tree/file1:1')

717

 

 

718

 

    def test_as_revision_id_uncommitted(self):

719

 

        spec = RevisionSpec.from_string('annotate:annotate-tree/file1:3')

720

 

        e = self.assertRaises(errors.InvalidRevisionSpec,

721

 

                              spec.as_revision_id, self.tree.branch)

722

 

        self.assertContainsRe(str(e),

723

 

            r"Requested revision: \'annotate:annotate-tree/file1:3\' does not"

724

 

            " exist in branch: .*\nLine 3 has not been committed.")

725

 

 

726

 

    def test_non_existent_line(self):

727

 

        spec = RevisionSpec.from_string('annotate:annotate-tree/file1:4')

728

 

        e = self.assertRaises(errors.InvalidRevisionSpec,

729

 

                              spec.as_revision_id, self.tree.branch)

730

 

        self.assertContainsRe(str(e),

731

 

            r"Requested revision: \'annotate:annotate-tree/file1:4\' does not"

732

 

            " exist in branch: .*\nNo such line: 4")

733

 

 

734

 

    def test_invalid_line(self):

735

 

        spec = RevisionSpec.from_string('annotate:annotate-tree/file1:q')

736

 

        e = self.assertRaises(errors.InvalidRevisionSpec,

737

 

                              spec.as_revision_id, self.tree.branch)

738

 

        self.assertContainsRe(str(e),

739

 

            r"Requested revision: \'annotate:annotate-tree/file1:q\' does not"

740

 

            " exist in branch: .*\nNo such line: q")

741

 

 

742

 

    def test_no_such_file(self):

743

 

        spec = RevisionSpec.from_string('annotate:annotate-tree/file2:1')

744

 

        e = self.assertRaises(errors.InvalidRevisionSpec,

745

 

                              spec.as_revision_id, self.tree.branch)

746

 

        self.assertContainsRe(str(e),

747

 

            r"Requested revision: \'annotate:annotate-tree/file2:1\' does not"

748

 

            " exist in branch: .*\nFile 'file2' is not versioned")

749

 

 

750

 

    def test_no_such_file_with_colon(self):

751

 

        spec = RevisionSpec.from_string('annotate:annotate-tree/fi:le2:1')

752

 

        e = self.assertRaises(errors.InvalidRevisionSpec,

753

 

                              spec.as_revision_id, self.tree.branch)

754

 

        self.assertContainsRe(str(e),

755

 

            r"Requested revision: \'annotate:annotate-tree/fi:le2:1\' does not"

756

 

            " exist in branch: .*\nFile 'fi:le2' is not versioned")

• Older »

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