← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_revisionspec.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-05-18 13:02:52 UTC
  • mfrom: (5830.3.6 i18n-msgfmt)
  • Revision ID: pqm@pqm.ubuntu.com-20110518130252-ky96qcvzt6o0zg3f
(mbp) add build_mo command to setup.py (INADA Naoki)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_revisionspec.py
1
 
# Copyright (C) 2005-2012, 2016 Canonical Ltd
 
1
# Copyright (C) 2005-2011 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
20
20
from bzrlib import (
21
21
    errors,
22
22
    revision as _mod_revision,
23
 
    symbol_versioning,
24
23
    )
25
24
from bzrlib.tests import TestCaseWithTransport
26
25
from bzrlib.revisionspec import (
119
118
        # If wants_revision_history = True, then _match_on should get the
120
119
        # branch revision history
121
120
        spec = RevisionSpecMatchOnTrap('foo', _internal=True)
122
 
        spec.wants_revision_history = True
123
 
        self.callDeprecated(['RevisionSpec.wants_revision_history was '
124
 
            'deprecated in 2.5 (RevisionSpecMatchOnTrap).'],
125
 
            spec.in_history, self.tree.branch)
 
121
        spec.in_history(self.tree.branch)
126
122
 
127
123
        self.assertEqual((self.tree.branch, ['r1' ,'r2']),
128
124
                         spec.last_call)
131
127
        # If wants_revision_history = False, then _match_on should get None for
132
128
        # the branch revision history
133
129
        spec = RevisionSpecMatchOnTrap('foo', _internal=True)
 
130
        spec.wants_revision_history = False
134
131
        spec.in_history(self.tree.branch)
135
132
 
136
133
        self.assertEqual((self.tree.branch, None), spec.last_call)
153
150
 
154
151
    def _match_on(self, branch, revs):
155
152
        if self.spec == "bork":
156
 
            return RevisionInfo.from_revision_id(branch, "r1")
 
153
            return RevisionInfo.from_revision_id(branch, "r1", revs)
157
154
        else:
158
155
            raise errors.InvalidRevisionSpec(self.spec, branch)
159
156
 
363
360
 
364
361
    def test_as_tree(self):
365
362
        tree = self.get_as_tree('0')
366
 
        self.assertEqual(_mod_revision.NULL_REVISION, tree.get_revision_id())
 
363
        self.assertEquals(_mod_revision.NULL_REVISION, tree.get_revision_id())
367
364
        tree = self.get_as_tree('1')
368
 
        self.assertEqual('r1', tree.get_revision_id())
 
365
        self.assertEquals('r1', tree.get_revision_id())
369
366
        tree = self.get_as_tree('2')
370
 
        self.assertEqual('r2', tree.get_revision_id())
 
367
        self.assertEquals('r2', tree.get_revision_id())
371
368
        tree = self.get_as_tree('-2')
372
 
        self.assertEqual('r1', tree.get_revision_id())
 
369
        self.assertEquals('r1', tree.get_revision_id())
373
370
        tree = self.get_as_tree('-1')
374
 
        self.assertEqual('r2', tree.get_revision_id())
 
371
        self.assertEquals('r2', tree.get_revision_id())
375
372
        tree = self.get_as_tree('1.1.1')
376
 
        self.assertEqual('alt_r2', tree.get_revision_id())
 
373
        self.assertEquals('alt_r2', tree.get_revision_id())
377
374
 
378
375
 
379
376
class TestRevisionSpec_revid(TestRevisionSpec):
656
653
 
657
654
    def test_as_tree(self):
658
655
        tree = self.get_as_tree('branch:tree', self.tree2)
659
 
        self.assertEqual('r2', tree.get_revision_id())
 
656
        self.assertEquals('r2', tree.get_revision_id())
660
657
        self.assertFalse(self.tree2.branch.repository.has_revision('r2'))
661
658
 
662
659
 
700
697
class TestRevisionSpec_annotate(TestRevisionSpec):
701
698
 
702
699
    def setUp(self):
703
 
        super(TestRevisionSpec_annotate, self).setUp()
 
700
        TestRevisionSpec.setUp(self)
704
701
        self.tree = self.make_branch_and_tree('annotate-tree')
705
702
        self.build_tree_contents([('annotate-tree/file1', '1\n')])
706
703
        self.tree.add('file1')