← 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: 2008-03-20 21:14:26 UTC
  • mto: (3298.2.13 revision_id_to_revno)
  • mto: This revision was merged to the branch mainline in revision 3328.
  • Revision ID: john@arbash-meinel.com-20080320211426-5c3jff1u4fnfemtj
Introduce as_revision_id() as a function instead of in_branch(need_revno=False)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_revisionnamespaces.py
114
114
        if info_false.revno is not None:
115
115
            self.assertEqual(info_true.revno, info_false.revno)
116
116
 
 
117
    def assertAsRevisionId(self, revision_id, revision_spec):
 
118
        """Calling as_revision_id() should return the specified id."""
 
119
        spec = RevisionSpec.from_string(revision_spec)
 
120
        self.assertEqual(revision_id,
 
121
                         spec.as_revision_id(self.tree.branch))
 
122
 
117
123
 
118
124
class TestOddRevisionSpec(TestRevisionSpec):
119
125
    """Test things that aren't normally thought of as revision specs"""
283
289
        self.assertInBranchSupportsNeedRevno('1.1.1',
284
290
            has_simple_revno=False)
285
291
 
 
292
    def test_as_revision_id(self):
 
293
        self.assertAsRevisionId('r1', '1')
 
294
        self.assertAsRevisionId('r2', '2')
 
295
        self.assertAsRevisionId('r1', '-2')
 
296
        self.assertAsRevisionId('r2', '-1')
 
297
        self.assertAsRevisionId('alt_r2', '1.1.1')
 
298
 
286
299
 
287
300
class TestRevisionSpec_revid(TestRevisionSpec):
288
301
    
325
338
        self.assertInBranchSupportsNeedRevno('revid:alt_r2',
326
339
            has_simple_revno=False)
327
340
 
 
341
    def test_as_revision_id(self):
 
342
        self.assertAsRevisionId('r1', 'revid:r1')
 
343
        self.assertAsRevisionId('r2', 'revid:r2')
 
344
        self.assertAsRevisionId('alt_r2', 'revid:alt_r2')
 
345
 
328
346
 
329
347
class TestRevisionSpec_last(TestRevisionSpec):
330
348
 
359
377
    def test_supports_need_revno(self):
360
378
        self.assertInBranchSupportsNeedRevno('last:1')
361
379
 
 
380
    def test_as_revision_id(self):
 
381
        self.assertAsRevisionId('r2', 'last:1')
 
382
        self.assertAsRevisionId('r1', 'last:2')
 
383
 
362
384
 
363
385
class TestRevisionSpec_before(TestRevisionSpec):
364
386
 
394
416
        self.assertInBranchSupportsNeedRevno('before:2')
395
417
        self.assertInBranchSupportsNeedRevno('before:revid:r2')
396
418
 
 
419
    def test_as_revision_id(self):
 
420
        self.assertAsRevisionId('r1', 'before:revid:r2')
 
421
        self.assertAsRevisionId('r1', 'before:2')
 
422
        self.assertAsRevisionId('r1', 'before:1.1.1')
 
423
        self.assertAsRevisionId('r1', 'before:revid:alt_r2')
 
424
 
397
425
 
398
426
class TestRevisionSpec_tag(TestRevisionSpec):
399
427
    
422
450
        self.tree.branch.tags.set_tag('bzr-0.14', 'r1')
423
451
        self.assertInBranchSupportsNeedRevno('tag:bzr-0.14')
424
452
 
 
453
    def test_as_revision_id(self):
 
454
        self.tree.branch.tags.set_tag('my-tag', 'r2')
 
455
        self.assertAsRevisionId('r2', 'tag:my-tag')
 
456
        self.assertAsRevisionId('r1', 'before:tag:my-tag')
 
457
 
425
458
 
426
459
class TestRevisionSpec_date(TestRevisionSpec):
427
460
 
461
494
    def test_supports_need_revno(self):
462
495
        self.assertInBranchSupportsNeedRevno('date:today')
463
496
 
 
497
    def test_as_revision_id(self):
 
498
        self.assertAsRevisionId('new_r2', 'date:today')
 
499
 
464
500
 
465
501
class TestRevisionSpec_ancestor(TestRevisionSpec):
466
502
    
508
544
        self.assertInBranchSupportsNeedRevno('ancestor:tree2',
509
545
            has_simple_revno=False)
510
546
 
 
547
    def test_as_revision_id(self):
 
548
        self.assertAsRevisionId('alt_r2', 'ancestor:tree2')
 
549
 
511
550
 
512
551
class TestRevisionSpec_branch(TestRevisionSpec):
513
552
    
546
585
        self.assertInBranchSupportsNeedRevno('branch:tree2',
547
586
            has_simple_revno=False)
548
587
 
 
588
    def test_as_revision_id(self):
 
589
        self.assertAsRevisionId('alt_r2', 'branch:tree2')
 
590
 
549
591
 
550
592
class TestRevisionSpec_submit(TestRevisionSpec):
551
593
 
566
608
        self.tree.branch.set_submit_branch('tree2')
567
609
        self.assertInBranchSupportsNeedRevno('submit:',
568
610
            has_simple_revno=False)
 
611
 
 
612
    def test_as_revision_id(self):
 
613
        self.tree.branch.set_submit_branch('tree2')
 
614
        self.assertAsRevisionId('alt_r2', 'branch:tree2')