/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
2220.2.3 by Martin Pool
Add tag: revision namespace.
1
# Copyright (C) 2004, 2005, 2006, 2007 Canonical Ltd
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
2
#
897 by Martin Pool
- merge john's revision-naming code
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
7
#
897 by Martin Pool
- merge john's revision-naming code
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
12
#
897 by Martin Pool
- merge john's revision-naming code
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
1948.4.12 by John Arbash Meinel
Some tests for the date: spec
17
import datetime
974.1.52 by aaron.bentley at utoronto
Merged mpool's latest changes (~0.0.7)
18
import os
1185.1.39 by Robert Collins
Robey Pointers before: namespace to clear up usage of dates in revision parameters
19
import time
1432 by Robert Collins
branch: namespace
20
1948.4.1 by John Arbash Meinel
Update number parsers to raise InvalidRevisionSpec. Update revno: itself so it supports negative numbers
21
from bzrlib import (
2220.2.11 by mbp at sourcefrog
Get tag tests working again, stored in the Branch
22
    branch,
2220.2.3 by Martin Pool
Add tag: revision namespace.
23
    bzrdir,
1948.4.1 by John Arbash Meinel
Update number parsers to raise InvalidRevisionSpec. Update revno: itself so it supports negative numbers
24
    errors,
2220.2.3 by Martin Pool
Add tag: revision namespace.
25
    repository,
1948.4.1 by John Arbash Meinel
Update number parsers to raise InvalidRevisionSpec. Update revno: itself so it supports negative numbers
26
    )
1534.1.16 by Robert Collins
Merge from jam-integration.
27
from bzrlib.builtins import merge
1988.4.5 by Robert Collins
revisions can now be specified using dotted-decimal revision numbers.
28
from bzrlib.tests import TestCase, TestCaseWithTransport
2220.2.3 by Martin Pool
Add tag: revision namespace.
29
from bzrlib.revisionspec import (
30
    RevisionSpec,
31
    RevisionSpec_revno,
32
    RevisionSpec_tag,
33
    )
1948.4.33 by John Arbash Meinel
Switch from get_revision_spec() to RevisionSpec.from_string() (as advised by Martin)
34
35
36
def spec_in_history(spec, branch):
37
    """A simple helper to change a revision spec into a branch search"""
38
    return RevisionSpec.from_string(spec).in_history(branch)
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
39
40
1948.4.3 by John Arbash Meinel
Create direct tests for RevisionSpec_int
41
# Basic class, which just creates a really basic set of revisions
42
class TestRevisionSpec(TestCaseWithTransport):
43
44
    def setUp(self):
45
        super(TestRevisionSpec, self).setUp()
1988.4.5 by Robert Collins
revisions can now be specified using dotted-decimal revision numbers.
46
        # this sets up a revision graph:
47
        # r1: []             1
48
        # alt_r2: [r1]       1.1.1
49
        # r2: [r1, alt_r2]   2
1948.4.3 by John Arbash Meinel
Create direct tests for RevisionSpec_int
50
51
        self.tree = self.make_branch_and_tree('tree')
52
        self.build_tree(['tree/a'])
53
        self.tree.add(['a'])
54
        self.tree.commit('a', rev_id='r1')
1948.4.4 by John Arbash Meinel
Update the test tree to include a non-mainline revision
55
56
        self.tree2 = self.tree.bzrdir.sprout('tree2').open_workingtree()
57
        self.tree2.commit('alt', rev_id='alt_r2')
58
59
        self.tree.branch.repository.fetch(self.tree2.branch.repository,
60
                                          revision_id='alt_r2')
61
        self.tree.set_pending_merges(['alt_r2'])
1948.4.3 by John Arbash Meinel
Create direct tests for RevisionSpec_int
62
        self.tree.commit('second', rev_id='r2')
63
64
    def get_in_history(self, revision_spec):
1948.4.33 by John Arbash Meinel
Switch from get_revision_spec() to RevisionSpec.from_string() (as advised by Martin)
65
        return spec_in_history(revision_spec, self.tree.branch)
1948.4.3 by John Arbash Meinel
Create direct tests for RevisionSpec_int
66
67
    def assertInHistoryIs(self, exp_revno, exp_revision_id, revision_spec):
68
        rev_info = self.get_in_history(revision_spec)
69
        self.assertEqual(exp_revno, rev_info.revno,
70
                         'Revision spec: %s returned wrong revno: %s != %s'
71
                         % (revision_spec, exp_revno, rev_info.revno))
72
        self.assertEqual(exp_revision_id, rev_info.rev_id,
73
                         'Revision spec: %s returned wrong revision id:'
74
                         ' %s != %s'
75
                         % (revision_spec, exp_revision_id, rev_info.rev_id))
76
1948.4.23 by John Arbash Meinel
Change the handling of negative numbers, to be trapped at revno 1
77
    def assertInvalid(self, revision_spec, extra=''):
1948.4.3 by John Arbash Meinel
Create direct tests for RevisionSpec_int
78
        try:
79
            self.get_in_history(revision_spec)
80
        except errors.InvalidRevisionSpec, e:
1948.4.23 by John Arbash Meinel
Change the handling of negative numbers, to be trapped at revno 1
81
            self.assertEqual(revision_spec, e.spec)
1948.4.3 by John Arbash Meinel
Create direct tests for RevisionSpec_int
82
            self.assertEqual(extra, e.extra)
1948.4.5 by John Arbash Meinel
Fix tests for negative entries, and add tests for revno:
83
        else:
84
            self.fail('Expected InvalidRevisionSpec to be raised for %s'
85
                      % (revision_spec,))
1948.4.3 by John Arbash Meinel
Create direct tests for RevisionSpec_int
86
87
1948.4.19 by John Arbash Meinel
All old tests are covered elsewhere
88
class TestOddRevisionSpec(TestRevisionSpec):
89
    """Test things that aren't normally thought of as revision specs"""
90
91
    def test_none(self):
92
        self.assertInHistoryIs(0, None, None)
93
94
    def test_object(self):
1948.4.33 by John Arbash Meinel
Switch from get_revision_spec() to RevisionSpec.from_string() (as advised by Martin)
95
        self.assertRaises(TypeError, RevisionSpec.from_string, object())
1948.4.19 by John Arbash Meinel
All old tests are covered elsewhere
96
1948.4.25 by John Arbash Meinel
Check that invalid specs are properly handled
97
    def test_unregistered_spec(self):
1948.4.33 by John Arbash Meinel
Switch from get_revision_spec() to RevisionSpec.from_string() (as advised by Martin)
98
        self.assertRaises(errors.NoSuchRevisionSpec,
99
                          RevisionSpec.from_string, 'foo')
100
        self.assertRaises(errors.NoSuchRevisionSpec,
101
                          RevisionSpec.from_string, '123a')
1948.4.32 by John Arbash Meinel
Clean up __repr__, as well as add tests that we can handle -r12:branch/
102
103
1988.4.5 by Robert Collins
revisions can now be specified using dotted-decimal revision numbers.
104
105
class TestRevnoFromString(TestCase):
106
107
    def test_from_string_dotted_decimal(self):
108
        self.assertRaises(errors.NoSuchRevisionSpec, RevisionSpec.from_string, '-1.1')
109
        self.assertRaises(errors.NoSuchRevisionSpec, RevisionSpec.from_string, '.1')
110
        self.assertRaises(errors.NoSuchRevisionSpec, RevisionSpec.from_string, '1..1')
111
        self.assertRaises(errors.NoSuchRevisionSpec, RevisionSpec.from_string, '1.2..1')
112
        self.assertRaises(errors.NoSuchRevisionSpec, RevisionSpec.from_string, '1.')
113
        self.assertIsInstance(RevisionSpec.from_string('1.1'), RevisionSpec_revno)
114
        self.assertIsInstance(RevisionSpec.from_string('1.1.3'), RevisionSpec_revno)
115
116
1948.4.32 by John Arbash Meinel
Clean up __repr__, as well as add tests that we can handle -r12:branch/
117
class TestRevisionSpec_revno(TestRevisionSpec):
118
119
    def test_positive_int(self):
1948.4.3 by John Arbash Meinel
Create direct tests for RevisionSpec_int
120
        self.assertInHistoryIs(0, None, '0')
121
        self.assertInHistoryIs(1, 'r1', '1')
122
        self.assertInHistoryIs(2, 'r2', '2')
1948.4.23 by John Arbash Meinel
Change the handling of negative numbers, to be trapped at revno 1
123
        self.assertInvalid('3')
1948.4.3 by John Arbash Meinel
Create direct tests for RevisionSpec_int
124
1988.4.5 by Robert Collins
revisions can now be specified using dotted-decimal revision numbers.
125
    def test_dotted_decimal(self):
126
        self.assertInHistoryIs(None, 'alt_r2', '1.1.1')
127
1948.4.32 by John Arbash Meinel
Clean up __repr__, as well as add tests that we can handle -r12:branch/
128
    def test_negative_int(self):
1948.4.3 by John Arbash Meinel
Create direct tests for RevisionSpec_int
129
        self.assertInHistoryIs(2, 'r2', '-1')
130
        self.assertInHistoryIs(1, 'r1', '-2')
131
1948.4.23 by John Arbash Meinel
Change the handling of negative numbers, to be trapped at revno 1
132
        self.assertInHistoryIs(1, 'r1', '-3')
133
        self.assertInHistoryIs(1, 'r1', '-4')
134
        self.assertInHistoryIs(1, 'r1', '-100')
1948.4.5 by John Arbash Meinel
Fix tests for negative entries, and add tests for revno:
135
136
    def test_positive(self):
137
        self.assertInHistoryIs(0, None, 'revno:0')
138
        self.assertInHistoryIs(1, 'r1', 'revno:1')
139
        self.assertInHistoryIs(2, 'r2', 'revno:2')
140
141
        self.assertInvalid('revno:3')
142
143
    def test_negative(self):
144
        self.assertInHistoryIs(2, 'r2', 'revno:-1')
145
        self.assertInHistoryIs(1, 'r1', 'revno:-2')
146
1948.4.23 by John Arbash Meinel
Change the handling of negative numbers, to be trapped at revno 1
147
        self.assertInHistoryIs(1, 'r1', 'revno:-3')
148
        self.assertInHistoryIs(1, 'r1', 'revno:-4')
1948.4.6 by John Arbash Meinel
A small bugfix, and more tests for revno:
149
150
    def test_invalid_number(self):
151
        # Get the right exception text
152
        try:
153
            int('X')
154
        except ValueError, e:
155
            pass
1948.4.15 by John Arbash Meinel
Change the InvalidRevisionSpec formatting to be more readable
156
        self.assertInvalid('revno:X', extra='\n' + str(e))
1948.4.6 by John Arbash Meinel
A small bugfix, and more tests for revno:
157
158
    def test_missing_number_and_branch(self):
159
        self.assertInvalid('revno::',
1948.4.15 by John Arbash Meinel
Change the InvalidRevisionSpec formatting to be more readable
160
                           extra='\ncannot have an empty revno and no branch')
1948.4.7 by John Arbash Meinel
More revno: tests, now testing the branch/url parameter
161
162
    def test_invalid_number_with_branch(self):
163
        try:
164
            int('X')
165
        except ValueError, e:
166
            pass
1948.4.15 by John Arbash Meinel
Change the InvalidRevisionSpec formatting to be more readable
167
        self.assertInvalid('revno:X:tree2', extra='\n' + str(e))
1948.4.7 by John Arbash Meinel
More revno: tests, now testing the branch/url parameter
168
1948.4.16 by John Arbash Meinel
Move the tests into the associated tester, remove redundant tests, some small PEP8 changes
169
    def test_non_exact_branch(self):
170
        # It seems better to require an exact path to the branch
171
        # Branch.open() rather than using Branch.open_containing()
1948.4.33 by John Arbash Meinel
Switch from get_revision_spec() to RevisionSpec.from_string() (as advised by Martin)
172
        spec = RevisionSpec.from_string('revno:2:tree2/a')
1948.4.16 by John Arbash Meinel
Move the tests into the associated tester, remove redundant tests, some small PEP8 changes
173
        self.assertRaises(errors.NotBranchError,
1948.4.33 by John Arbash Meinel
Switch from get_revision_spec() to RevisionSpec.from_string() (as advised by Martin)
174
                          spec.in_history, self.tree.branch)
1948.4.16 by John Arbash Meinel
Move the tests into the associated tester, remove redundant tests, some small PEP8 changes
175
1948.4.7 by John Arbash Meinel
More revno: tests, now testing the branch/url parameter
176
    def test_with_branch(self):
177
        # Passing a URL overrides the supplied branch path
178
        revinfo = self.get_in_history('revno:2:tree2')
179
        self.assertNotEqual(self.tree.branch.base, revinfo.branch.base)
180
        self.assertEqual(self.tree2.branch.base, revinfo.branch.base)
181
        self.assertEqual(2, revinfo.revno)
182
        self.assertEqual('alt_r2', revinfo.rev_id)
183
1948.4.32 by John Arbash Meinel
Clean up __repr__, as well as add tests that we can handle -r12:branch/
184
    def test_int_with_branch(self):
185
        revinfo = self.get_in_history('2:tree2')
186
        self.assertNotEqual(self.tree.branch.base, revinfo.branch.base)
187
        self.assertEqual(self.tree2.branch.base, revinfo.branch.base)
188
        self.assertEqual(2, revinfo.revno)
189
        self.assertEqual('alt_r2', revinfo.rev_id)
190
1948.4.7 by John Arbash Meinel
More revno: tests, now testing the branch/url parameter
191
    def test_with_url(self):
192
        url = self.get_url() + '/tree2'
193
        revinfo = self.get_in_history('revno:2:%s' % (url,))
194
        self.assertNotEqual(self.tree.branch.base, revinfo.branch.base)
195
        self.assertEqual(self.tree2.branch.base, revinfo.branch.base)
196
        self.assertEqual(2, revinfo.revno)
197
        self.assertEqual('alt_r2', revinfo.rev_id)
198
199
    def test_negative_with_url(self):
200
        url = self.get_url() + '/tree2'
201
        revinfo = self.get_in_history('revno:-1:%s' % (url,))
202
        self.assertNotEqual(self.tree.branch.base, revinfo.branch.base)
203
        self.assertEqual(self.tree2.branch.base, revinfo.branch.base)
204
        self.assertEqual(2, revinfo.revno)
205
        self.assertEqual('alt_r2', revinfo.rev_id)
206
1948.4.22 by John Arbash Meinel
Refactor common code from integer revno handlers
207
    def test_different_history_lengths(self):
208
        # Make sure we use the revisions and offsets in the supplied branch
209
        # not the ones in the original branch.
210
        self.tree2.commit('three', rev_id='r3')
211
        self.assertInHistoryIs(3, 'r3', 'revno:3:tree2')
212
        self.assertInHistoryIs(3, 'r3', 'revno:-1:tree2')
213
1948.4.7 by John Arbash Meinel
More revno: tests, now testing the branch/url parameter
214
    def test_invalid_branch(self):
215
        self.assertRaises(errors.NotBranchError,
216
                          self.get_in_history, 'revno:-1:tree3')
217
218
    def test_invalid_revno_in_branch(self):
219
        self.tree.commit('three', rev_id='r3')
220
        self.assertInvalid('revno:3:tree2')
1948.4.8 by John Arbash Meinel
Testing the revid: spec
221
1948.4.16 by John Arbash Meinel
Move the tests into the associated tester, remove redundant tests, some small PEP8 changes
222
    def test_revno_n_path(self):
223
        """Old revno:N:path tests"""
224
        wta = self.make_branch_and_tree('a')
225
        ba = wta.branch
226
        
227
        wta.commit('Commit one', rev_id='a@r-0-1')
228
        wta.commit('Commit two', rev_id='a@r-0-2')
229
        wta.commit('Commit three', rev_id='a@r-0-3')
230
231
        wtb = self.make_branch_and_tree('b')
232
        bb = wtb.branch
233
234
        wtb.commit('Commit one', rev_id='b@r-0-1')
235
        wtb.commit('Commit two', rev_id='b@r-0-2')
236
        wtb.commit('Commit three', rev_id='b@r-0-3')
237
1948.4.33 by John Arbash Meinel
Switch from get_revision_spec() to RevisionSpec.from_string() (as advised by Martin)
238
239
        self.assertEqual((1, 'a@r-0-1'),
240
                         spec_in_history('revno:1:a/', ba))
1948.4.16 by John Arbash Meinel
Move the tests into the associated tester, remove redundant tests, some small PEP8 changes
241
        # The argument of in_history should be ignored since it is
242
        # redundant with the path in the spec.
1948.4.33 by John Arbash Meinel
Switch from get_revision_spec() to RevisionSpec.from_string() (as advised by Martin)
243
        self.assertEqual((1, 'a@r-0-1'),
244
                         spec_in_history('revno:1:a/', None))
245
        self.assertEqual((1, 'a@r-0-1'),
246
                         spec_in_history('revno:1:a/', bb))
247
        self.assertEqual((2, 'b@r-0-2'),
248
                         spec_in_history('revno:2:b/', None))
1948.4.16 by John Arbash Meinel
Move the tests into the associated tester, remove redundant tests, some small PEP8 changes
249
250
1948.4.8 by John Arbash Meinel
Testing the revid: spec
251
252
class TestRevisionSpec_revid(TestRevisionSpec):
253
    
254
    def test_in_history(self):
255
        # We should be able to access revisions that are directly
256
        # in the history.
257
        self.assertInHistoryIs(1, 'r1', 'revid:r1')
258
        self.assertInHistoryIs(2, 'r2', 'revid:r2')
259
        
260
    def test_missing(self):
261
        self.assertInvalid('revid:r3')
262
263
    def test_merged(self):
264
        """We can reach revisions in the ancestry"""
265
        self.assertInHistoryIs(None, 'alt_r2', 'revid:alt_r2')
266
267
    def test_not_here(self):
268
        self.tree2.commit('alt third', rev_id='alt_r3')
269
        # It exists in tree2, but not in tree
270
        self.assertInvalid('revid:alt_r3')
271
272
    def test_in_repository(self):
273
        """We can get any revision id in the repository"""
274
        # XXX: This may change in the future, but for now, it is true
275
        self.tree2.commit('alt third', rev_id='alt_r3')
276
        self.tree.branch.repository.fetch(self.tree2.branch.repository,
277
                                          revision_id='alt_r3')
278
        self.assertInHistoryIs(None, 'alt_r3', 'revid:alt_r3')
1948.4.9 by John Arbash Meinel
Cleanup and test last:
279
280
281
class TestRevisionSpec_last(TestRevisionSpec):
282
283
    def test_positive(self):
284
        self.assertInHistoryIs(2, 'r2', 'last:1')
285
        self.assertInHistoryIs(1, 'r1', 'last:2')
286
        self.assertInHistoryIs(0, None, 'last:3')
287
288
    def test_empty(self):
289
        self.assertInHistoryIs(2, 'r2', 'last:')
290
291
    def test_negative(self):
292
        self.assertInvalid('last:-1',
1948.4.15 by John Arbash Meinel
Change the InvalidRevisionSpec formatting to be more readable
293
                           extra='\nyou must supply a positive value')
1948.4.9 by John Arbash Meinel
Cleanup and test last:
294
295
    def test_missing(self):
296
        self.assertInvalid('last:4')
297
298
    def test_no_history(self):
299
        tree = self.make_branch_and_tree('tree3')
300
301
        self.assertRaises(errors.NoCommits,
1948.4.33 by John Arbash Meinel
Switch from get_revision_spec() to RevisionSpec.from_string() (as advised by Martin)
302
                          spec_in_history, 'last:', tree.branch)
1948.4.9 by John Arbash Meinel
Cleanup and test last:
303
304
    def test_not_a_number(self):
305
        try:
306
            int('Y')
307
        except ValueError, e:
308
            pass
1948.4.15 by John Arbash Meinel
Change the InvalidRevisionSpec formatting to be more readable
309
        self.assertInvalid('last:Y', extra='\n' + str(e))
1948.4.10 by John Arbash Meinel
test the before: spec, currently asserting what seems to be buggy behavior
310
311
312
class TestRevisionSpec_before(TestRevisionSpec):
313
314
    def test_int(self):
315
        self.assertInHistoryIs(1, 'r1', 'before:2')
316
        self.assertInHistoryIs(1, 'r1', 'before:-1')
317
318
    def test_before_one(self):
319
        self.assertInHistoryIs(0, None, 'before:1')
320
321
    def test_before_none(self):
1948.4.13 by John Arbash Meinel
Going before:0 is an error, and if you are on another history, use the leftmost parent
322
        self.assertInvalid('before:0',
1948.4.15 by John Arbash Meinel
Change the InvalidRevisionSpec formatting to be more readable
323
                           extra='\ncannot go before the null: revision')
1948.4.10 by John Arbash Meinel
test the before: spec, currently asserting what seems to be buggy behavior
324
325
    def test_revid(self):
326
        self.assertInHistoryIs(1, 'r1', 'before:revid:r2')
327
328
    def test_last(self):
329
        self.assertInHistoryIs(1, 'r1', 'before:last:1')
330
331
    def test_alt_revid(self):
1948.4.13 by John Arbash Meinel
Going before:0 is an error, and if you are on another history, use the leftmost parent
332
        # This will grab the left-most ancestor for alternate histories
333
        self.assertInHistoryIs(1, 'r1', 'before:revid:alt_r2')
1948.4.11 by John Arbash Meinel
Update and test the tag: spec
334
1948.4.14 by John Arbash Meinel
Test the code path for a no-parent alternate history
335
    def test_alt_no_parents(self):
336
        new_tree = self.make_branch_and_tree('new_tree')
337
        new_tree.commit('first', rev_id='new_r1')
338
        self.tree.branch.repository.fetch(new_tree.branch.repository,
339
                                          revision_id='new_r1')
340
        self.assertInHistoryIs(0, None, 'before:revid:new_r1')
341
1948.4.11 by John Arbash Meinel
Update and test the tag: spec
342
343
class TestRevisionSpec_tag(TestRevisionSpec):
344
    
2220.2.3 by Martin Pool
Add tag: revision namespace.
345
    def make_branch_and_tree(self, relpath):
346
        # override format as the default one may not support tags
347
        control = bzrdir.BzrDir.create(relpath)
2220.2.11 by mbp at sourcefrog
Get tag tests working again, stored in the Branch
348
        control.create_repository()
2220.2.12 by mbp at sourcefrog
BzrBranchExperimental can now act as its own format
349
        branch.BzrBranchExperimental.initialize(control)
2220.2.3 by Martin Pool
Add tag: revision namespace.
350
        return control.create_workingtree()
351
352
    def test_from_string_tag(self):
353
        spec = RevisionSpec.from_string('tag:bzr-0.14')
354
        self.assertIsInstance(spec, RevisionSpec_tag)
355
        self.assertEqual(spec.spec, 'bzr-0.14')
356
357
    def test_lookup_tag(self):
2220.2.20 by Martin Pool
Tag methods now available through Branch.tags.add_tag, etc
358
        self.tree.branch.tags.set_tag('bzr-0.14', 'r1')
2220.2.3 by Martin Pool
Add tag: revision namespace.
359
        self.assertInHistoryIs(1, 'r1', 'tag:bzr-0.14')
360
361
    def test_failed_lookup(self):
362
        # tags that don't exist give a specific message: arguably we should
363
        # just give InvalidRevisionSpec but I think this is more helpful
364
        self.assertRaises(errors.NoSuchTag,
365
            self.get_in_history,
366
            'tag:some-random-tag')
1948.4.12 by John Arbash Meinel
Some tests for the date: spec
367
368
369
class TestRevisionSpec_date(TestRevisionSpec):
370
371
    def setUp(self):
372
        super(TestRevisionSpec, self).setUp()
373
374
        new_tree = self.make_branch_and_tree('new_tree')
375
        new_tree.commit('Commit one', rev_id='new_r1',
376
                        timestamp=time.time() - 60*60*24)
377
        new_tree.commit('Commit two', rev_id='new_r2')
378
        new_tree.commit('Commit three', rev_id='new_r3')
379
380
        self.tree = new_tree
381
382
    def test_tomorrow(self):
383
        self.assertInvalid('date:tomorrow')
384
385
    def test_today(self):
386
        self.assertInHistoryIs(2, 'new_r2', 'date:today')
387
        self.assertInHistoryIs(1, 'new_r1', 'before:date:today')
388
389
    def test_yesterday(self):
390
        self.assertInHistoryIs(1, 'new_r1', 'date:yesterday')
391
392
    def test_invalid(self):
1948.4.15 by John Arbash Meinel
Change the InvalidRevisionSpec formatting to be more readable
393
        self.assertInvalid('date:foobar', extra='\ninvalid date')
1948.4.12 by John Arbash Meinel
Some tests for the date: spec
394
        # You must have '-' between year/month/day
1948.4.15 by John Arbash Meinel
Change the InvalidRevisionSpec formatting to be more readable
395
        self.assertInvalid('date:20040404', extra='\ninvalid date')
1948.4.12 by John Arbash Meinel
Some tests for the date: spec
396
        # Need 2 digits for each date piece
1948.4.15 by John Arbash Meinel
Change the InvalidRevisionSpec formatting to be more readable
397
        self.assertInvalid('date:2004-4-4', extra='\ninvalid date')
1948.4.12 by John Arbash Meinel
Some tests for the date: spec
398
399
    def test_day(self):
400
        now = datetime.datetime.now()
401
        self.assertInHistoryIs(2, 'new_r2',
402
            'date:%04d-%02d-%02d' % (now.year, now.month, now.day))
1948.4.17 by John Arbash Meinel
Update tests for ancestor: spec
403
404
405
class TestRevisionSpec_ancestor(TestRevisionSpec):
406
    
407
    def test_non_exact_branch(self):
408
        # It seems better to require an exact path to the branch
409
        # Branch.open() rather than using Branch.open_containing()
410
        self.assertRaises(errors.NotBranchError,
1948.4.33 by John Arbash Meinel
Switch from get_revision_spec() to RevisionSpec.from_string() (as advised by Martin)
411
                          self.get_in_history, 'ancestor:tree2/a')
1948.4.17 by John Arbash Meinel
Update tests for ancestor: spec
412
413
    def test_simple(self):
414
        # Common ancestor of trees is 'alt_r2'
415
        self.assertInHistoryIs(None, 'alt_r2', 'ancestor:tree2')
416
417
        # Going the other way, we get a valid revno
418
        tmp = self.tree
419
        self.tree = self.tree2
420
        self.tree2 = tmp
421
        self.assertInHistoryIs(2, 'alt_r2', 'ancestor:tree')
422
423
    def test_self(self):
424
        self.assertInHistoryIs(2, 'r2', 'ancestor:tree')
425
426
    def test_unrelated(self):
427
        new_tree = self.make_branch_and_tree('new_tree')
428
429
        new_tree.commit('Commit one', rev_id='new_r1')
430
        new_tree.commit('Commit two', rev_id='new_r2')
431
        new_tree.commit('Commit three', rev_id='new_r3')
432
433
        # With no common ancestor, we should raise another user error
434
        self.assertRaises(errors.NoCommonAncestor,
1948.4.33 by John Arbash Meinel
Switch from get_revision_spec() to RevisionSpec.from_string() (as advised by Martin)
435
                          self.get_in_history, 'ancestor:new_tree')
1948.4.17 by John Arbash Meinel
Update tests for ancestor: spec
436
437
    def test_no_commits(self):
438
        new_tree = self.make_branch_and_tree('new_tree')
439
        self.assertRaises(errors.NoCommits,
1948.4.33 by John Arbash Meinel
Switch from get_revision_spec() to RevisionSpec.from_string() (as advised by Martin)
440
                          spec_in_history, 'ancestor:new_tree',
441
                                           self.tree.branch)
1948.4.17 by John Arbash Meinel
Update tests for ancestor: spec
442
                        
443
        self.assertRaises(errors.NoCommits,
1948.4.33 by John Arbash Meinel
Switch from get_revision_spec() to RevisionSpec.from_string() (as advised by Martin)
444
                          spec_in_history, 'ancestor:tree',
445
                                           new_tree.branch)
1948.4.18 by John Arbash Meinel
Update branch: spec and tests
446
447
448
class TestRevisionSpec_branch(TestRevisionSpec):
449
    
450
    def test_non_exact_branch(self):
451
        # It seems better to require an exact path to the branch
452
        # Branch.open() rather than using Branch.open_containing()
453
        self.assertRaises(errors.NotBranchError,
1948.4.33 by John Arbash Meinel
Switch from get_revision_spec() to RevisionSpec.from_string() (as advised by Martin)
454
                          self.get_in_history, 'branch:tree2/a')
1948.4.18 by John Arbash Meinel
Update branch: spec and tests
455
456
    def test_simple(self):
457
        self.assertInHistoryIs(None, 'alt_r2', 'branch:tree2')
458
459
    def test_self(self):
460
        self.assertInHistoryIs(2, 'r2', 'branch:tree')
461
462
    def test_unrelated(self):
463
        new_tree = self.make_branch_and_tree('new_tree')
464
465
        new_tree.commit('Commit one', rev_id='new_r1')
466
        new_tree.commit('Commit two', rev_id='new_r2')
467
        new_tree.commit('Commit three', rev_id='new_r3')
468
469
        self.assertInHistoryIs(None, 'new_r3', 'branch:new_tree')
470
471
        # XXX: Right now, we use fetch() to make sure the remote revisions
472
        # have been pulled into the local branch. We may change that
473
        # behavior in the future.
474
        self.failUnless(self.tree.branch.repository.has_revision('new_r3'))
475
476
    def test_no_commits(self):
477
        new_tree = self.make_branch_and_tree('new_tree')
478
        self.assertRaises(errors.NoCommits,
1948.4.33 by John Arbash Meinel
Switch from get_revision_spec() to RevisionSpec.from_string() (as advised by Martin)
479
                          self.get_in_history, 'branch:new_tree')