← 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: Aaron Bentley
  • Date: 2007-02-06 14:52:16 UTC
  • mfrom: (2266 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2268.
  • Revision ID: abentley@panoramicfeedback.com-20070206145216-fcpi8o3ufvuzwbp9
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_revisionnamespaces.py
1
 
# Copyright (C) 2004, 2005, 2006, 2007 Canonical Ltd
 
1
# Copyright (C) 2004, 2005, 2006 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
19
19
import time
20
20
 
21
21
from bzrlib import (
22
 
    branch,
23
 
    bzrdir,
24
22
    errors,
25
 
    repository,
26
23
    )
 
24
from bzrlib.builtins import merge
27
25
from bzrlib.tests import TestCase, TestCaseWithTransport
28
 
from bzrlib.revisionspec import (
29
 
    RevisionSpec,
30
 
    RevisionSpec_revno,
31
 
    RevisionSpec_tag,
32
 
    )
 
26
from bzrlib.revisionspec import RevisionSpec, RevisionSpec_revno
33
27
 
34
28
 
35
29
def spec_in_history(spec, branch):
49
43
 
50
44
        self.tree = self.make_branch_and_tree('tree')
51
45
        self.build_tree(['tree/a'])
52
 
        self.tree.lock_write()
53
 
        self.addCleanup(self.tree.unlock)
54
46
        self.tree.add(['a'])
55
47
        self.tree.commit('a', rev_id='r1')
56
48
 
57
49
        self.tree2 = self.tree.bzrdir.sprout('tree2').open_workingtree()
58
50
        self.tree2.commit('alt', rev_id='alt_r2')
59
51
 
60
 
        self.tree.merge_from_branch(self.tree2.branch)
 
52
        self.tree.branch.repository.fetch(self.tree2.branch.repository,
 
53
                                          revision_id='alt_r2')
 
54
        self.tree.set_pending_merges(['alt_r2'])
61
55
        self.tree.commit('second', rev_id='r2')
62
56
 
63
57
    def get_in_history(self, revision_spec):
66
60
    def assertInHistoryIs(self, exp_revno, exp_revision_id, revision_spec):
67
61
        rev_info = self.get_in_history(revision_spec)
68
62
        self.assertEqual(exp_revno, rev_info.revno,
69
 
                         'Revision spec: %r returned wrong revno: %r != %r'
 
63
                         'Revision spec: %s returned wrong revno: %s != %s'
70
64
                         % (revision_spec, exp_revno, rev_info.revno))
71
65
        self.assertEqual(exp_revision_id, rev_info.rev_id,
72
 
                         'Revision spec: %r returned wrong revision id:'
73
 
                         ' %r != %r'
 
66
                         'Revision spec: %s returned wrong revision id:'
 
67
                         ' %s != %s'
74
68
                         % (revision_spec, exp_revision_id, rev_info.rev_id))
75
69
 
76
 
    def assertInvalid(self, revision_spec, extra='',
77
 
                      invalid_as_revision_id=True):
 
70
    def assertInvalid(self, revision_spec, extra=''):
78
71
        try:
79
72
            self.get_in_history(revision_spec)
80
73
        except errors.InvalidRevisionSpec, e:
81
74
            self.assertEqual(revision_spec, e.spec)
82
75
            self.assertEqual(extra, e.extra)
83
76
        else:
84
 
            self.fail('Expected InvalidRevisionSpec to be raised for'
85
 
                      ' %r.in_history' % (revision_spec,))
86
 
        if invalid_as_revision_id:
87
 
            try:
88
 
                spec = RevisionSpec.from_string(revision_spec)
89
 
                spec.as_revision_id(self.tree.branch)
90
 
            except errors.InvalidRevisionSpec, e:
91
 
                self.assertEqual(revision_spec, e.spec)
92
 
                self.assertEqual(extra, e.extra)
93
 
            else:
94
 
                self.fail('Expected InvalidRevisionSpec to be raised for'
95
 
                          ' %r.as_revision_id' % (revision_spec,))
96
 
 
97
 
    def assertAsRevisionId(self, revision_id, revision_spec):
98
 
        """Calling as_revision_id() should return the specified id."""
99
 
        spec = RevisionSpec.from_string(revision_spec)
100
 
        self.assertEqual(revision_id,
101
 
                         spec.as_revision_id(self.tree.branch))
102
 
 
103
 
 
104
 
class RevisionSpecMatchOnTrap(RevisionSpec):
105
 
 
106
 
    def _match_on(self, branch, revs):
107
 
        self.last_call = (branch, revs)
108
 
        return super(RevisionSpecMatchOnTrap, self)._match_on(branch, revs)
109
 
 
110
 
 
111
 
class TestRevisionSpecBase(TestRevisionSpec):
112
 
 
113
 
    def test_wants_revision_history(self):
114
 
        # If wants_revision_history = True, then _match_on should get the
115
 
        # branch revision history
116
 
        spec = RevisionSpecMatchOnTrap('foo', _internal=True)
117
 
        spec.in_history(self.tree.branch)
118
 
 
119
 
        self.assertEqual((self.tree.branch, ['r1' ,'r2']),
120
 
                         spec.last_call)
121
 
 
122
 
    def test_wants_no_revision_history(self):
123
 
        # If wants_revision_history = False, then _match_on should get None for
124
 
        # the branch revision history
125
 
        spec = RevisionSpecMatchOnTrap('foo', _internal=True)
126
 
        spec.wants_revision_history = False
127
 
        spec.in_history(self.tree.branch)
128
 
 
129
 
        self.assertEqual((self.tree.branch, None), spec.last_call)
130
 
 
 
77
            self.fail('Expected InvalidRevisionSpec to be raised for %s'
 
78
                      % (revision_spec,))
131
79
 
132
80
 
133
81
class TestOddRevisionSpec(TestRevisionSpec):
134
82
    """Test things that aren't normally thought of as revision specs"""
135
83
 
136
84
    def test_none(self):
137
 
        self.assertInHistoryIs(None, None, None)
 
85
        self.assertInHistoryIs(0, None, None)
138
86
 
139
87
    def test_object(self):
140
88
        self.assertRaises(TypeError, RevisionSpec.from_string, object())
162
110
class TestRevisionSpec_revno(TestRevisionSpec):
163
111
 
164
112
    def test_positive_int(self):
165
 
        self.assertInHistoryIs(0, 'null:', '0')
 
113
        self.assertInHistoryIs(0, None, '0')
166
114
        self.assertInHistoryIs(1, 'r1', '1')
167
115
        self.assertInHistoryIs(2, 'r2', '2')
168
116
        self.assertInvalid('3')
179
127
        self.assertInHistoryIs(1, 'r1', '-100')
180
128
 
181
129
    def test_positive(self):
182
 
        self.assertInHistoryIs(0, 'null:', 'revno:0')
 
130
        self.assertInHistoryIs(0, None, 'revno:0')
183
131
        self.assertInHistoryIs(1, 'r1', 'revno:1')
184
132
        self.assertInHistoryIs(2, 'r2', 'revno:2')
185
133
 
292
240
        self.assertEqual((2, 'b@r-0-2'),
293
241
                         spec_in_history('revno:2:b/', None))
294
242
 
295
 
    def test_as_revision_id(self):
296
 
        self.assertAsRevisionId('null:', '0')
297
 
        self.assertAsRevisionId('r1', '1')
298
 
        self.assertAsRevisionId('r2', '2')
299
 
        self.assertAsRevisionId('r1', '-2')
300
 
        self.assertAsRevisionId('r2', '-1')
301
 
        self.assertAsRevisionId('alt_r2', '1.1.1')
302
243
 
303
244
 
304
245
class TestRevisionSpec_revid(TestRevisionSpec):
310
251
        self.assertInHistoryIs(2, 'r2', 'revid:r2')
311
252
        
312
253
    def test_missing(self):
313
 
        self.assertInvalid('revid:r3', invalid_as_revision_id=False)
 
254
        self.assertInvalid('revid:r3')
314
255
 
315
256
    def test_merged(self):
316
257
        """We can reach revisions in the ancestry"""
319
260
    def test_not_here(self):
320
261
        self.tree2.commit('alt third', rev_id='alt_r3')
321
262
        # It exists in tree2, but not in tree
322
 
        self.assertInvalid('revid:alt_r3', invalid_as_revision_id=False)
 
263
        self.assertInvalid('revid:alt_r3')
323
264
 
324
265
    def test_in_repository(self):
325
266
        """We can get any revision id in the repository"""
329
270
                                          revision_id='alt_r3')
330
271
        self.assertInHistoryIs(None, 'alt_r3', 'revid:alt_r3')
331
272
 
332
 
    def test_unicode(self):
333
 
        """We correctly convert a unicode ui string to an encoded revid."""
334
 
        revision_id = u'\N{SNOWMAN}'.encode('utf-8')
335
 
        self.tree.commit('unicode', rev_id=revision_id)
336
 
        self.assertInHistoryIs(3, revision_id, u'revid:\N{SNOWMAN}')
337
 
        self.assertInHistoryIs(3, revision_id, 'revid:' + revision_id)
338
 
 
339
 
    def test_as_revision_id(self):
340
 
        self.assertAsRevisionId('r1', 'revid:r1')
341
 
        self.assertAsRevisionId('r2', 'revid:r2')
342
 
        self.assertAsRevisionId('alt_r2', 'revid:alt_r2')
343
 
 
344
273
 
345
274
class TestRevisionSpec_last(TestRevisionSpec):
346
275
 
347
276
    def test_positive(self):
348
277
        self.assertInHistoryIs(2, 'r2', 'last:1')
349
278
        self.assertInHistoryIs(1, 'r1', 'last:2')
350
 
        self.assertInHistoryIs(0, 'null:', 'last:3')
 
279
        self.assertInHistoryIs(0, None, 'last:3')
351
280
 
352
281
    def test_empty(self):
353
282
        self.assertInHistoryIs(2, 'r2', 'last:')
372
301
            pass
373
302
        self.assertInvalid('last:Y', extra='\n' + str(e))
374
303
 
375
 
    def test_as_revision_id(self):
376
 
        self.assertAsRevisionId('r2', 'last:1')
377
 
        self.assertAsRevisionId('r1', 'last:2')
378
 
 
379
304
 
380
305
class TestRevisionSpec_before(TestRevisionSpec):
381
306
 
384
309
        self.assertInHistoryIs(1, 'r1', 'before:-1')
385
310
 
386
311
    def test_before_one(self):
387
 
        self.assertInHistoryIs(0, 'null:', 'before:1')
 
312
        self.assertInHistoryIs(0, None, 'before:1')
388
313
 
389
314
    def test_before_none(self):
390
315
        self.assertInvalid('before:0',
405
330
        new_tree.commit('first', rev_id='new_r1')
406
331
        self.tree.branch.repository.fetch(new_tree.branch.repository,
407
332
                                          revision_id='new_r1')
408
 
        self.assertInHistoryIs(0, 'null:', 'before:revid:new_r1')
409
 
 
410
 
    def test_as_revision_id(self):
411
 
        self.assertAsRevisionId('r1', 'before:revid:r2')
412
 
        self.assertAsRevisionId('r1', 'before:2')
413
 
        self.assertAsRevisionId('r1', 'before:1.1.1')
414
 
        self.assertAsRevisionId('r1', 'before:revid:alt_r2')
 
333
        self.assertInHistoryIs(0, None, 'before:revid:new_r1')
415
334
 
416
335
 
417
336
class TestRevisionSpec_tag(TestRevisionSpec):
418
337
    
419
 
    def make_branch_and_tree(self, relpath):
420
 
        # override format as the default one may not support tags
421
 
        return TestRevisionSpec.make_branch_and_tree(
422
 
            self, relpath, format='dirstate-tags')
423
 
 
424
 
    def test_from_string_tag(self):
425
 
        spec = RevisionSpec.from_string('tag:bzr-0.14')
426
 
        self.assertIsInstance(spec, RevisionSpec_tag)
427
 
        self.assertEqual(spec.spec, 'bzr-0.14')
428
 
 
429
 
    def test_lookup_tag(self):
430
 
        self.tree.branch.tags.set_tag('bzr-0.14', 'r1')
431
 
        self.assertInHistoryIs(1, 'r1', 'tag:bzr-0.14')
432
 
        self.tree.branch.tags.set_tag('null_rev', 'null:')
433
 
        self.assertInHistoryIs(0, 'null:', 'tag:null_rev')
434
 
 
435
 
    def test_failed_lookup(self):
436
 
        # tags that don't exist give a specific message: arguably we should
437
 
        # just give InvalidRevisionSpec but I think this is more helpful
438
 
        self.assertRaises(errors.NoSuchTag,
439
 
            self.get_in_history,
440
 
            'tag:some-random-tag')
441
 
 
442
 
    def test_as_revision_id(self):
443
 
        self.tree.branch.tags.set_tag('my-tag', 'r2')
444
 
        self.tree.branch.tags.set_tag('null_rev', 'null:')
445
 
        self.assertAsRevisionId('r2', 'tag:my-tag')
446
 
        self.assertAsRevisionId('null:', 'tag:null_rev')
447
 
        self.assertAsRevisionId('r1', 'before:tag:my-tag')
 
338
    def test_invalid(self):
 
339
        self.assertInvalid('tag:foo', extra='\ntag: namespace registered,'
 
340
                                            ' but not implemented')
448
341
 
449
342
 
450
343
class TestRevisionSpec_date(TestRevisionSpec):
482
375
        self.assertInHistoryIs(2, 'new_r2',
483
376
            'date:%04d-%02d-%02d' % (now.year, now.month, now.day))
484
377
 
485
 
    def test_as_revision_id(self):
486
 
        self.assertAsRevisionId('new_r2', 'date:today')
487
 
 
488
378
 
489
379
class TestRevisionSpec_ancestor(TestRevisionSpec):
490
380
    
528
418
                          spec_in_history, 'ancestor:tree',
529
419
                                           new_tree.branch)
530
420
 
531
 
    def test_as_revision_id(self):
532
 
        self.assertAsRevisionId('alt_r2', 'ancestor:tree2')
533
 
 
534
421
 
535
422
class TestRevisionSpec_branch(TestRevisionSpec):
536
423
    
564
451
        new_tree = self.make_branch_and_tree('new_tree')
565
452
        self.assertRaises(errors.NoCommits,
566
453
                          self.get_in_history, 'branch:new_tree')
567
 
 
568
 
    def test_as_revision_id(self):
569
 
        self.assertAsRevisionId('alt_r2', 'branch:tree2')
570
 
 
571
 
 
572
 
class TestRevisionSpec_submit(TestRevisionSpec):
573
 
 
574
 
    def test_submit_branch(self):
575
 
        # Common ancestor of trees is 'alt_r2'
576
 
        self.assertRaises(errors.NoSubmitBranch, self.get_in_history,
577
 
                          'submit:')
578
 
        self.tree.branch.set_parent('../tree2')
579
 
        self.assertInHistoryIs(None, 'alt_r2', 'submit:')
580
 
        self.tree.branch.set_parent('bogus')
581
 
        self.assertRaises(errors.NotBranchError, self.get_in_history,
582
 
            'submit:')
583
 
        # submit branch overrides parent branch
584
 
        self.tree.branch.set_submit_branch('tree2')
585
 
        self.assertInHistoryIs(None, 'alt_r2', 'submit:')
586
 
 
587
 
    def test_as_revision_id(self):
588
 
        self.tree.branch.set_submit_branch('tree2')
589
 
        self.assertAsRevisionId('alt_r2', 'branch:tree2')