/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/test_revisionspec.py

  • Committer: Jelmer Vernooij
  • Date: 2020-07-28 00:32:38 UTC
  • mfrom: (7490.40.77 work)
  • mto: (7490.40.79 work)
  • mto: This revision was merged to the branch mainline in revision 7521.
  • Revision ID: jelmer@jelmer.uk-20200728003238-vx5u412hn72f18lr
Merge lp:brz/3.1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_revisionspec.py
23
23
    )
24
24
from breezy.tests import TestCaseWithTransport
25
25
from breezy.revisionspec import (
 
26
    InvalidRevisionSpec,
26
27
    RevisionInfo,
27
28
    RevisionSpec,
28
29
    RevisionSpec_dwim,
75
76
                      invalid_as_revision_id=True):
76
77
        try:
77
78
            self.get_in_history(revision_spec)
78
 
        except errors.InvalidRevisionSpec as e:
 
79
        except InvalidRevisionSpec as e:
79
80
            self.assertEqual(revision_spec, e.spec)
80
81
            self.assertEqual(extra, e.extra)
81
82
        else:
85
86
            try:
86
87
                spec = RevisionSpec.from_string(revision_spec)
87
88
                spec.as_revision_id(self.tree.branch)
88
 
            except errors.InvalidRevisionSpec as e:
 
89
            except InvalidRevisionSpec as e:
89
90
                self.assertEqual(revision_spec, e.spec)
90
91
                self.assertEqual(extra, e.extra)
91
92
            else:
141
142
        if self.spec == "bork":
142
143
            return RevisionInfo.from_revision_id(branch, b"r1")
143
144
        else:
144
 
            raise errors.InvalidRevisionSpec(self.spec, branch)
 
145
            raise InvalidRevisionSpec(self.spec, branch)
145
146
 
146
147
 
147
148
class TestRevisionSpec_dwim(TestRevisionSpec):
159
160
        self.tree.branch.tags.set_tag('footag', b'r1')
160
161
        self.assertAsRevisionId(b'r1', 'footag')
161
162
        self.tree.branch.tags.delete_tag('footag')
162
 
        self.assertRaises(errors.InvalidRevisionSpec,
 
163
        self.assertRaises(InvalidRevisionSpec,
163
164
                          self.get_in_history, 'footag')
164
165
 
165
166
    def test_dwim_spec_tag_that_looks_like_revno(self):
678
679
        self.assertAsRevisionId(b'r2', 'mainline:1.1.1')
679
680
        self.assertAsRevisionId(b'r2', 'mainline:revid:alt_r2')
680
681
        spec = RevisionSpec.from_string('mainline:revid:alt_r22')
681
 
        e = self.assertRaises(errors.InvalidRevisionSpec,
 
682
        e = self.assertRaises(InvalidRevisionSpec,
682
683
                              spec.as_revision_id, self.tree.branch)
683
684
        self.assertContainsRe(str(e),
684
685
                              "Requested revision: 'mainline:revid:alt_r22' does not exist in"
708
709
 
709
710
    def test_as_revision_id_uncommitted(self):
710
711
        spec = RevisionSpec.from_string('annotate:annotate-tree/file1:3')
711
 
        e = self.assertRaises(errors.InvalidRevisionSpec,
 
712
        e = self.assertRaises(InvalidRevisionSpec,
712
713
                              spec.as_revision_id, self.tree.branch)
713
714
        self.assertContainsRe(str(e),
714
715
                              r"Requested revision: \'annotate:annotate-tree/file1:3\' does not"
716
717
 
717
718
    def test_non_existent_line(self):
718
719
        spec = RevisionSpec.from_string('annotate:annotate-tree/file1:4')
719
 
        e = self.assertRaises(errors.InvalidRevisionSpec,
 
720
        e = self.assertRaises(InvalidRevisionSpec,
720
721
                              spec.as_revision_id, self.tree.branch)
721
722
        self.assertContainsRe(str(e),
722
723
                              r"Requested revision: \'annotate:annotate-tree/file1:4\' does not"
724
725
 
725
726
    def test_invalid_line(self):
726
727
        spec = RevisionSpec.from_string('annotate:annotate-tree/file1:q')
727
 
        e = self.assertRaises(errors.InvalidRevisionSpec,
 
728
        e = self.assertRaises(InvalidRevisionSpec,
728
729
                              spec.as_revision_id, self.tree.branch)
729
730
        self.assertContainsRe(str(e),
730
731
                              r"Requested revision: \'annotate:annotate-tree/file1:q\' does not"
732
733
 
733
734
    def test_no_such_file(self):
734
735
        spec = RevisionSpec.from_string('annotate:annotate-tree/file2:1')
735
 
        e = self.assertRaises(errors.InvalidRevisionSpec,
 
736
        e = self.assertRaises(InvalidRevisionSpec,
736
737
                              spec.as_revision_id, self.tree.branch)
737
738
        self.assertContainsRe(str(e),
738
739
                              r"Requested revision: \'annotate:annotate-tree/file2:1\' does not"
740
741
 
741
742
    def test_no_such_file_with_colon(self):
742
743
        spec = RevisionSpec.from_string('annotate:annotate-tree/fi:le2:1')
743
 
        e = self.assertRaises(errors.InvalidRevisionSpec,
 
744
        e = self.assertRaises(InvalidRevisionSpec,
744
745
                              spec.as_revision_id, self.tree.branch)
745
746
        self.assertContainsRe(str(e),
746
747
                              r"Requested revision: \'annotate:annotate-tree/fi:le2:1\' does not"