← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_revisiontree.py

  • Committer: John Arbash Meinel
  • Date: 2013-05-19 14:29:37 UTC
  • mfrom: (6437.63.9 2.5)
  • mto: (6437.63.10 2.5)
  • mto: This revision was merged to the branch mainline in revision 6575.
  • Revision ID: john@arbash-meinel.com-20130519142937-21ykz2n2y2f22za9
Merge in the actual 2.5 branch. It seems I failed before

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_revisiontree.py
1
 
# Copyright (C) 2006 Canonical Ltd
 
1
# Copyright (C) 2006, 2008-2011 Canonical Ltd
2
2
# Authors:  Robert Collins <robert.collins@canonical.com>
3
3
#
4
4
# This program is free software; you can redistribute it and/or modify
13
13
#
14
14
# You should have received a copy of the GNU General Public License
15
15
# along with this program; if not, write to the Free Software
16
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
16
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
17
 
18
18
"""Tests for the RevisionTree class."""
19
19
 
20
20
from bzrlib import (
 
21
    errors,
21
22
    revision,
22
23
    )
23
 
import bzrlib
24
24
from bzrlib.tests import TestCaseWithTransport
25
 
from bzrlib.tree import RevisionTree
26
25
 
27
26
 
28
27
class TestTreeWithCommits(TestCaseWithTransport):
51
50
            self.t.branch.repository.revision_tree(revid_2).get_parent_ids())
52
51
        # TODO commit a merge and check it is reported correctly.
53
52
 
54
 
        # the parents for a revision_tree(None) are []:
 
53
        # the parents for a revision_tree(NULL_REVISION) are []:
55
54
        self.assertEqual([],
56
 
            self.t.branch.repository.revision_tree(None).get_parent_ids())
 
55
            self.t.branch.repository.revision_tree(
 
56
                revision.NULL_REVISION).get_parent_ids())
57
57
 
58
58
    def test_empty_no_root(self):
59
59
        null_tree = self.t.branch.repository.revision_tree(
60
60
            revision.NULL_REVISION)
61
61
        self.assertIs(None, null_tree.inventory.root)
 
62
        self.assertIs(None, null_tree.get_root_id())
 
63
 
 
64
    def test_get_file_revision_root(self):
 
65
        self.assertEquals(self.rev_id,
 
66
            self.rev_tree.get_file_revision(self.rev_tree.get_root_id()))
 
67
 
 
68
    def test_get_file_revision(self):
 
69
        self.build_tree_contents([('a', 'initial')])
 
70
        self.t.add(['a'])
 
71
        revid1 = self.t.commit('add a')
 
72
        revid2 = self.t.commit('another change', allow_pointless=True)
 
73
        tree = self.t.branch.repository.revision_tree(revid2)
 
74
        self.assertEquals(revid1,
 
75
            tree.get_file_revision(tree.path2id('a')))
 
76
 
 
77
    def test_get_file_mtime_ghost(self):
 
78
        file_id = iter(self.rev_tree.all_file_ids()).next()
 
79
        self.rev_tree.inventory[file_id].revision = 'ghostrev'
 
80
        self.assertRaises(errors.FileTimestampUnavailable, 
 
81
            self.rev_tree.get_file_mtime, file_id)