← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_revisionnamespaces.py

  • Committer: John Arbash Meinel
  • Date: 2006-08-21 21:45:16 UTC
  • mto: This revision was merged to the branch mainline in revision 1979.
  • Revision ID: john@arbash-meinel.com-20060821214516-03cdcfb040501b72
Update number parsers to raise InvalidRevisionSpec. Update revno: itself so it supports negative numbers

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_revisionnamespaces.py
17
17
import os
18
18
import time
19
19
 
 
20
from bzrlib import (
 
21
    errors,
 
22
    )
20
23
from bzrlib.builtins import merge
21
24
from bzrlib.branch import Branch
22
25
from bzrlib.tests import TestCaseWithTransport
23
26
from bzrlib.errors import NoCommonAncestor, NoCommits
24
 
from bzrlib.errors import NoSuchRevision
25
27
from bzrlib.revisionspec import RevisionSpec
26
28
 
27
29
 
74
76
                          (1, 'a@r-0-1'))
75
77
        self.assertEquals(RevisionSpec('revid:a@r-0-1').in_history(b),
76
78
                          (1, 'a@r-0-1'))
77
 
        self.assertRaises(NoSuchRevision,
 
79
        self.assertRaises(errors.NoSuchRevision,
78
80
                          RevisionSpec('revid:a@r-0-0').in_history, b)
79
81
        self.assertRaises(TypeError, RevisionSpec, object)
80
82
 
81
83
        self.assertEquals(RevisionSpec('date:today').in_history(b),
82
84
                          (2, 'a@r-0-2'))
83
 
        self.assertRaises(NoSuchRevision,
 
85
        self.assertRaises(errors.NoSuchRevision,
84
86
                          RevisionSpec('date:tomorrow').in_history, b)
85
87
        self.assertEquals(RevisionSpec('date:yesterday').in_history(b),
86
88
                          (1, 'a@r-0-1'))
133
135
        rev_info = spec.in_history(branch)
134
136
        self.assertEqual(rev_info, (None, 'A'))
135
137
 
 
138
    def test_invalid_revno(self):
 
139
        self.build_tree(['branch1/', 'branch1/file'])
 
140
        wt = self.make_branch_and_tree('branch1')
 
141
        wt.add('file')
 
142
        wt.commit('first commit', rev_id='r1')
 
143
        wt.commit('second commit', rev_id='r2')
 
144
 
 
145
        # In the future -20 will probably just fall back to 0
 
146
        # but for now, we want to make sure it raises the right error
 
147
        self.assertRaises(errors.InvalidRevisionSpec,
 
148
                          RevisionSpec('-20').in_history, wt.branch)
 
149
        self.assertRaises(errors.InvalidRevisionSpec,
 
150
                          RevisionSpec('10').in_history, wt.branch)
 
151
 
 
152
        self.assertRaises(errors.InvalidRevisionSpec,
 
153
                          RevisionSpec('revno:-20').in_history, wt.branch)
 
154
        self.assertRaises(errors.InvalidRevisionSpec,
 
155
                          RevisionSpec('revno:10').in_history, wt.branch)
 
156
        self.assertRaises(errors.InvalidRevisionSpec,
 
157
                          RevisionSpec('revno:a').in_history, wt.branch)