← 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: Tarmac
  • Author(s): Vincent Ladeuil
  • Date: 2017-01-30 14:42:05 UTC
  • mfrom: (6620.1.1 trunk)
  • Revision ID: tarmac-20170130144205-r8fh2xpmiuxyozpv
Merge  2.7 into trunk including fix for bug #1657238 [r=vila]

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-2012, 2016 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
25
 
26
26
 
50
50
            self.t.branch.repository.revision_tree(revid_2).get_parent_ids())
51
51
        # TODO commit a merge and check it is reported correctly.
52
52
 
53
 
        # the parents for a revision_tree(None) are []:
 
53
        # the parents for a revision_tree(NULL_REVISION) are []:
54
54
        self.assertEqual([],
55
 
            self.t.branch.repository.revision_tree(None).get_parent_ids())
 
55
            self.t.branch.repository.revision_tree(
 
56
                revision.NULL_REVISION).get_parent_ids())
56
57
 
57
58
    def test_empty_no_root(self):
58
59
        null_tree = self.t.branch.repository.revision_tree(
59
60
            revision.NULL_REVISION)
60
 
        self.assertIs(None, null_tree.inventory.root)
 
61
        self.assertIs(None, null_tree.get_root_id())
 
62
 
 
63
    def test_get_file_revision_root(self):
 
64
        self.assertEqual(self.rev_id,
 
65
            self.rev_tree.get_file_revision(self.rev_tree.get_root_id()))
 
66
 
 
67
    def test_get_file_revision(self):
 
68
        self.build_tree_contents([('a', 'initial')])
 
69
        self.t.add(['a'])
 
70
        revid1 = self.t.commit('add a')
 
71
        revid2 = self.t.commit('another change', allow_pointless=True)
 
72
        tree = self.t.branch.repository.revision_tree(revid2)
 
73
        self.assertEqual(revid1,
 
74
            tree.get_file_revision(tree.path2id('a')))
 
75
 
 
76
    def test_get_file_mtime_ghost(self):
 
77
        file_id = iter(self.rev_tree.all_file_ids()).next()
 
78
        self.rev_tree.root_inventory[file_id].revision = 'ghostrev'
 
79
        self.assertRaises(errors.FileTimestampUnavailable, 
 
80
            self.rev_tree.get_file_mtime, file_id)