← 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: Martin Pool
  • Date: 2007-10-12 08:00:07 UTC
  • mto: This revision was merged to the branch mainline in revision 2913.
  • Revision ID: mbp@sourcefrog.net-20071012080007-vf80woayyom8s8e1
Rename update_to_one_parent_via_delta to more wieldy update_basis_by_delta

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_revisionnamespaces.py
49
49
 
50
50
        self.tree = self.make_branch_and_tree('tree')
51
51
        self.build_tree(['tree/a'])
52
 
        self.tree.lock_write()
53
 
        self.addCleanup(self.tree.unlock)
54
52
        self.tree.add(['a'])
55
53
        self.tree.commit('a', rev_id='r1')
56
54
 
57
55
        self.tree2 = self.tree.bzrdir.sprout('tree2').open_workingtree()
58
56
        self.tree2.commit('alt', rev_id='alt_r2')
59
57
 
60
 
        self.tree.merge_from_branch(self.tree2.branch)
 
58
        self.tree.branch.repository.fetch(self.tree2.branch.repository,
 
59
                                          revision_id='alt_r2')
 
60
        self.tree.set_pending_merges(['alt_r2'])
61
61
        self.tree.commit('second', rev_id='r2')
62
62
 
63
63
    def get_in_history(self, revision_spec):
73
73
                         ' %r != %r'
74
74
                         % (revision_spec, exp_revision_id, rev_info.rev_id))
75
75
 
76
 
    def assertInvalid(self, revision_spec, extra='',
77
 
                      invalid_as_revision_id=True):
 
76
    def assertInvalid(self, revision_spec, extra=''):
78
77
        try:
79
78
            self.get_in_history(revision_spec)
80
79
        except errors.InvalidRevisionSpec, e:
81
80
            self.assertEqual(revision_spec, e.spec)
82
81
            self.assertEqual(extra, e.extra)
83
82
        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
 
 
 
83
            self.fail('Expected InvalidRevisionSpec to be raised for %s'
 
84
                      % (revision_spec,))
131
85
 
132
86
 
133
87
class TestOddRevisionSpec(TestRevisionSpec):
134
88
    """Test things that aren't normally thought of as revision specs"""
135
89
 
136
90
    def test_none(self):
137
 
        self.assertInHistoryIs(None, None, None)
 
91
        self.assertInHistoryIs(0, None, None)
138
92
 
139
93
    def test_object(self):
140
94
        self.assertRaises(TypeError, RevisionSpec.from_string, object())
292
246
        self.assertEqual((2, 'b@r-0-2'),
293
247
                         spec_in_history('revno:2:b/', None))
294
248
 
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
249
 
303
250
 
304
251
class TestRevisionSpec_revid(TestRevisionSpec):
310
257
        self.assertInHistoryIs(2, 'r2', 'revid:r2')
311
258
        
312
259
    def test_missing(self):
313
 
        self.assertInvalid('revid:r3', invalid_as_revision_id=False)
 
260
        self.assertInvalid('revid:r3')
314
261
 
315
262
    def test_merged(self):
316
263
        """We can reach revisions in the ancestry"""
319
266
    def test_not_here(self):
320
267
        self.tree2.commit('alt third', rev_id='alt_r3')
321
268
        # It exists in tree2, but not in tree
322
 
        self.assertInvalid('revid:alt_r3', invalid_as_revision_id=False)
 
269
        self.assertInvalid('revid:alt_r3')
323
270
 
324
271
    def test_in_repository(self):
325
272
        """We can get any revision id in the repository"""
336
283
        self.assertInHistoryIs(3, revision_id, u'revid:\N{SNOWMAN}')
337
284
        self.assertInHistoryIs(3, revision_id, 'revid:' + revision_id)
338
285
 
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
286
 
345
287
class TestRevisionSpec_last(TestRevisionSpec):
346
288
 
372
314
            pass
373
315
        self.assertInvalid('last:Y', extra='\n' + str(e))
374
316
 
375
 
    def test_as_revision_id(self):
376
 
        self.assertAsRevisionId('r2', 'last:1')
377
 
        self.assertAsRevisionId('r1', 'last:2')
378
 
 
379
317
 
380
318
class TestRevisionSpec_before(TestRevisionSpec):
381
319
 
407
345
                                          revision_id='new_r1')
408
346
        self.assertInHistoryIs(0, 'null:', 'before:revid:new_r1')
409
347
 
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')
415
 
 
416
348
 
417
349
class TestRevisionSpec_tag(TestRevisionSpec):
418
350
    
419
351
    def make_branch_and_tree(self, relpath):
420
352
        # override format as the default one may not support tags
421
 
        return TestRevisionSpec.make_branch_and_tree(
422
 
            self, relpath, format='dirstate-tags')
 
353
        control = bzrdir.BzrDir.create(relpath)
 
354
        control.create_repository()
 
355
        branch.BzrBranchExperimental.initialize(control)
 
356
        return control.create_workingtree()
423
357
 
424
358
    def test_from_string_tag(self):
425
359
        spec = RevisionSpec.from_string('tag:bzr-0.14')
429
363
    def test_lookup_tag(self):
430
364
        self.tree.branch.tags.set_tag('bzr-0.14', 'r1')
431
365
        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
366
 
435
367
    def test_failed_lookup(self):
436
368
        # tags that don't exist give a specific message: arguably we should
439
371
            self.get_in_history,
440
372
            'tag:some-random-tag')
441
373
 
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')
448
 
 
449
374
 
450
375
class TestRevisionSpec_date(TestRevisionSpec):
451
376
 
482
407
        self.assertInHistoryIs(2, 'new_r2',
483
408
            'date:%04d-%02d-%02d' % (now.year, now.month, now.day))
484
409
 
485
 
    def test_as_revision_id(self):
486
 
        self.assertAsRevisionId('new_r2', 'date:today')
487
 
 
488
410
 
489
411
class TestRevisionSpec_ancestor(TestRevisionSpec):
490
412
    
528
450
                          spec_in_history, 'ancestor:tree',
529
451
                                           new_tree.branch)
530
452
 
531
 
    def test_as_revision_id(self):
532
 
        self.assertAsRevisionId('alt_r2', 'ancestor:tree2')
533
 
 
534
453
 
535
454
class TestRevisionSpec_branch(TestRevisionSpec):
536
455
    
565
484
        self.assertRaises(errors.NoCommits,
566
485
                          self.get_in_history, 'branch:new_tree')
567
486
 
568
 
    def test_as_revision_id(self):
569
 
        self.assertAsRevisionId('alt_r2', 'branch:tree2')
570
 
 
571
487
 
572
488
class TestRevisionSpec_submit(TestRevisionSpec):
573
489
 
583
499
        # submit branch overrides parent branch
584
500
        self.tree.branch.set_submit_branch('tree2')
585
501
        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')