/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-05 12:50:01 UTC
  • mfrom: (7490.40.46 work)
  • mto: (7490.40.48 work)
  • mto: This revision was merged to the branch mainline in revision 7519.
  • Revision ID: jelmer@jelmer.uk-20200705125001-7s3vo0p55szbbws7
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,
27
26
    RevisionInfo,
28
27
    RevisionSpec,
29
28
    RevisionSpec_dwim,
76
75
                      invalid_as_revision_id=True):
77
76
        try:
78
77
            self.get_in_history(revision_spec)
79
 
        except InvalidRevisionSpec as e:
 
78
        except errors.InvalidRevisionSpec as e:
80
79
            self.assertEqual(revision_spec, e.spec)
81
80
            self.assertEqual(extra, e.extra)
82
81
        else:
86
85
            try:
87
86
                spec = RevisionSpec.from_string(revision_spec)
88
87
                spec.as_revision_id(self.tree.branch)
89
 
            except InvalidRevisionSpec as e:
 
88
            except errors.InvalidRevisionSpec as e:
90
89
                self.assertEqual(revision_spec, e.spec)
91
90
                self.assertEqual(extra, e.extra)
92
91
            else:
142
141
        if self.spec == "bork":
143
142
            return RevisionInfo.from_revision_id(branch, b"r1")
144
143
        else:
145
 
            raise InvalidRevisionSpec(self.spec, branch)
 
144
            raise errors.InvalidRevisionSpec(self.spec, branch)
146
145
 
147
146
 
148
147
class TestRevisionSpec_dwim(TestRevisionSpec):
160
159
        self.tree.branch.tags.set_tag('footag', b'r1')
161
160
        self.assertAsRevisionId(b'r1', 'footag')
162
161
        self.tree.branch.tags.delete_tag('footag')
163
 
        self.assertRaises(InvalidRevisionSpec, self.get_in_history, 'footag')
 
162
        self.assertRaises(errors.InvalidRevisionSpec,
 
163
                          self.get_in_history, 'footag')
164
164
 
165
165
    def test_dwim_spec_tag_that_looks_like_revno(self):
166
166
        # Test that we slip past revno with things that look like revnos,
678
678
        self.assertAsRevisionId(b'r2', 'mainline:1.1.1')
679
679
        self.assertAsRevisionId(b'r2', 'mainline:revid:alt_r2')
680
680
        spec = RevisionSpec.from_string('mainline:revid:alt_r22')
681
 
        e = self.assertRaises(
682
 
            InvalidRevisionSpec, spec.as_revision_id, self.tree.branch)
 
681
        e = self.assertRaises(errors.InvalidRevisionSpec,
 
682
                              spec.as_revision_id, self.tree.branch)
683
683
        self.assertContainsRe(str(e),
684
684
                              "Requested revision: 'mainline:revid:alt_r22' does not exist in"
685
685
                              " branch: ")
708
708
 
709
709
    def test_as_revision_id_uncommitted(self):
710
710
        spec = RevisionSpec.from_string('annotate:annotate-tree/file1:3')
711
 
        e = self.assertRaises(
712
 
            InvalidRevisionSpec, spec.as_revision_id, self.tree.branch)
 
711
        e = self.assertRaises(errors.InvalidRevisionSpec,
 
712
                              spec.as_revision_id, self.tree.branch)
713
713
        self.assertContainsRe(str(e),
714
714
                              r"Requested revision: \'annotate:annotate-tree/file1:3\' does not"
715
715
                              " exist in branch: .*\nLine 3 has not been committed.")
716
716
 
717
717
    def test_non_existent_line(self):
718
718
        spec = RevisionSpec.from_string('annotate:annotate-tree/file1:4')
719
 
        e = self.assertRaises(InvalidRevisionSpec,
 
719
        e = self.assertRaises(errors.InvalidRevisionSpec,
720
720
                              spec.as_revision_id, self.tree.branch)
721
721
        self.assertContainsRe(str(e),
722
722
                              r"Requested revision: \'annotate:annotate-tree/file1:4\' does not"
724
724
 
725
725
    def test_invalid_line(self):
726
726
        spec = RevisionSpec.from_string('annotate:annotate-tree/file1:q')
727
 
        e = self.assertRaises(InvalidRevisionSpec,
 
727
        e = self.assertRaises(errors.InvalidRevisionSpec,
728
728
                              spec.as_revision_id, self.tree.branch)
729
729
        self.assertContainsRe(str(e),
730
730
                              r"Requested revision: \'annotate:annotate-tree/file1:q\' does not"
732
732
 
733
733
    def test_no_such_file(self):
734
734
        spec = RevisionSpec.from_string('annotate:annotate-tree/file2:1')
735
 
        e = self.assertRaises(InvalidRevisionSpec,
 
735
        e = self.assertRaises(errors.InvalidRevisionSpec,
736
736
                              spec.as_revision_id, self.tree.branch)
737
737
        self.assertContainsRe(str(e),
738
738
                              r"Requested revision: \'annotate:annotate-tree/file2:1\' does not"
740
740
 
741
741
    def test_no_such_file_with_colon(self):
742
742
        spec = RevisionSpec.from_string('annotate:annotate-tree/fi:le2:1')
743
 
        e = self.assertRaises(InvalidRevisionSpec,
 
743
        e = self.assertRaises(errors.InvalidRevisionSpec,
744
744
                              spec.as_revision_id, self.tree.branch)
745
745
        self.assertContainsRe(str(e),
746
746
                              r"Requested revision: \'annotate:annotate-tree/fi:le2:1\' does not"