← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_revisionspec.py

  • Committer: Vincent Ladeuil
  • Date: 2010-03-10 09:33:04 UTC
  • mto: (5082.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5083.
  • Revision ID: v.ladeuil+lp@free.fr-20100310093304-4245t4tazd4sxoav
Cleanup test from overly cautious checks.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_revisionspec.py
1
 
# Copyright (C) 2005-2012, 2016 Canonical Ltd
 
1
# Copyright (C) 2005-2010 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)
147
147
        self.assertRaises(TypeError, RevisionSpec.from_string, object())
148
148
 
149
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
150
class TestRevisionSpec_dwim(TestRevisionSpec):
162
151
 
163
152
    # Don't need to test revno's explicitly since TRS_revno already
201
190
        self.assertInvalid('1.2..1', invalid_as_revision_id=False)
202
191
        self.assertInvalid('1.', invalid_as_revision_id=False)
203
192
 
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')
220
 
 
221
193
 
222
194
class TestRevisionSpec_revno(TestRevisionSpec):
223
195
 
363
335
 
364
336
    def test_as_tree(self):
365
337
        tree = self.get_as_tree('0')
366
 
        self.assertEqual(_mod_revision.NULL_REVISION, tree.get_revision_id())
 
338
        self.assertEquals(_mod_revision.NULL_REVISION, tree.get_revision_id())
367
339
        tree = self.get_as_tree('1')
368
 
        self.assertEqual('r1', tree.get_revision_id())
 
340
        self.assertEquals('r1', tree.get_revision_id())
369
341
        tree = self.get_as_tree('2')
370
 
        self.assertEqual('r2', tree.get_revision_id())
 
342
        self.assertEquals('r2', tree.get_revision_id())
371
343
        tree = self.get_as_tree('-2')
372
 
        self.assertEqual('r1', tree.get_revision_id())
 
344
        self.assertEquals('r1', tree.get_revision_id())
373
345
        tree = self.get_as_tree('-1')
374
 
        self.assertEqual('r2', tree.get_revision_id())
 
346
        self.assertEquals('r2', tree.get_revision_id())
375
347
        tree = self.get_as_tree('1.1.1')
376
 
        self.assertEqual('alt_r2', tree.get_revision_id())
 
348
        self.assertEquals('alt_r2', tree.get_revision_id())
377
349
 
378
350
 
379
351
class TestRevisionSpec_revid(TestRevisionSpec):
400
372
        """We can get any revision id in the repository"""
401
373
        # XXX: This may change in the future, but for now, it is true
402
374
        self.tree2.commit('alt third', rev_id='alt_r3')
403
 
        self.tree.branch.fetch(self.tree2.branch, 'alt_r3')
 
375
        self.tree.branch.repository.fetch(self.tree2.branch.repository,
 
376
                                          revision_id='alt_r3')
404
377
        self.assertInHistoryIs(None, 'alt_r3', 'revid:alt_r3')
405
378
 
406
379
    def test_unicode(self):
477
450
    def test_alt_no_parents(self):
478
451
        new_tree = self.make_branch_and_tree('new_tree')
479
452
        new_tree.commit('first', rev_id='new_r1')
480
 
        self.tree.branch.fetch(new_tree.branch, 'new_r1')
 
453
        self.tree.branch.repository.fetch(new_tree.branch.repository,
 
454
                                          revision_id='new_r1')
481
455
        self.assertInHistoryIs(0, 'null:', 'before:revid:new_r1')
482
456
 
483
457
    def test_as_revision_id(self):
642
616
        # XXX: Right now, we use fetch() to make sure the remote revisions
643
617
        # have been pulled into the local branch. We may change that
644
618
        # behavior in the future.
645
 
        self.assertTrue(self.tree.branch.repository.has_revision('new_r3'))
 
619
        self.failUnless(self.tree.branch.repository.has_revision('new_r3'))
646
620
 
647
621
    def test_no_commits(self):
648
622
        new_tree = self.make_branch_and_tree('new_tree')
656
630
 
657
631
    def test_as_tree(self):
658
632
        tree = self.get_as_tree('branch:tree', self.tree2)
659
 
        self.assertEqual('r2', tree.get_revision_id())
 
633
        self.assertEquals('r2', tree.get_revision_id())
660
634
        self.assertFalse(self.tree2.branch.repository.has_revision('r2'))
661
635
 
662
636
 
678
652
    def test_as_revision_id(self):
679
653
        self.tree.branch.set_submit_branch('tree2')
680
654
        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")