← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_revisionspec.py

merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_revisionspec.py
23
23
    )
24
24
from bzrlib.tests import TestCaseWithTransport
25
25
from bzrlib.revisionspec import (
 
26
    RevisionInfo,
26
27
    RevisionSpec,
 
28
    RevisionSpec_dwim,
27
29
    RevisionSpec_tag,
28
30
    )
29
31
 
142
144
        self.assertRaises(TypeError, RevisionSpec.from_string, object())
143
145
 
144
146
 
 
147
class RevisionSpec_bork(RevisionSpec):
 
148
 
 
149
    prefix = 'irrelevant:'
 
150
 
 
151
    def _match_on(self, branch, revs):
 
152
        if self.spec == "bork":
 
153
            return RevisionInfo.from_revision_id(branch, "r1", revs)
 
154
        else:
 
155
            raise errors.InvalidRevisionSpec(self.spec, branch)
 
156
 
 
157
 
145
158
class TestRevisionSpec_dwim(TestRevisionSpec):
146
159
 
147
160
    # Don't need to test revno's explicitly since TRS_revno already
185
198
        self.assertInvalid('1.2..1', invalid_as_revision_id=False)
186
199
        self.assertInvalid('1.', invalid_as_revision_id=False)
187
200
 
 
201
    def test_append_dwim_revspec(self):
 
202
        original_dwim_revspecs = list(RevisionSpec_dwim._possible_revspecs)
 
203
        def reset_dwim_revspecs():
 
204
            RevisionSpec_dwim._possible_revspecs = original_dwim_revspecs
 
205
        self.addCleanup(reset_dwim_revspecs)
 
206
        RevisionSpec_dwim.append_possible_revspec(RevisionSpec_bork)
 
207
        self.assertAsRevisionId('r1', 'bork')
 
208
 
 
209
    def test_append_lazy_dwim_revspec(self):
 
210
        original_dwim_revspecs = list(RevisionSpec_dwim._possible_revspecs)
 
211
        def reset_dwim_revspecs():
 
212
            RevisionSpec_dwim._possible_revspecs = original_dwim_revspecs
 
213
        self.addCleanup(reset_dwim_revspecs)
 
214
        RevisionSpec_dwim.append_possible_lazy_revspec(
 
215
            "bzrlib.tests.test_revisionspec", "RevisionSpec_bork")
 
216
        self.assertAsRevisionId('r1', 'bork')
 
217
 
188
218
 
189
219
class TestRevisionSpec_revno(TestRevisionSpec):
190
220