/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/test_revisiontree.py

  • Committer: Jelmer Vernooij
  • Date: 2017-07-23 22:06:41 UTC
  • mfrom: (6738 trunk)
  • mto: This revision was merged to the branch mainline in revision 6739.
  • Revision ID: jelmer@jelmer.uk-20170723220641-69eczax9bmv8d6kk
Merge trunk, address review comments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
18
18
"""Tests for the RevisionTree class."""
19
19
 
20
20
from breezy import (
 
21
    errors,
21
22
    revision,
22
23
    )
23
24
from breezy.tree import FileTimestampUnavailable
52
53
 
53
54
        # the parents for a revision_tree(NULL_REVISION) are []:
54
55
        self.assertEqual([],
55
 
                         self.t.branch.repository.revision_tree(
56
 
            revision.NULL_REVISION).get_parent_ids())
 
56
            self.t.branch.repository.revision_tree(
 
57
                revision.NULL_REVISION).get_parent_ids())
57
58
 
58
59
    def test_empty_no_root(self):
59
60
        null_tree = self.t.branch.repository.revision_tree(
60
61
            revision.NULL_REVISION)
61
 
        self.assertIs(None, null_tree.path2id(''))
 
62
        self.assertIs(None, null_tree.get_root_id())
62
63
 
63
64
    def test_get_file_revision_root(self):
64
 
        self.assertEqual(self.rev_id, self.rev_tree.get_file_revision(u''))
 
65
        self.assertEqual(self.rev_id,
 
66
            self.rev_tree.get_file_revision(self.rev_tree.get_root_id()))
65
67
 
66
68
    def test_get_file_revision(self):
67
 
        self.build_tree_contents([('a', b'initial')])
 
69
        self.build_tree_contents([('a', 'initial')])
68
70
        self.t.add(['a'])
69
71
        revid1 = self.t.commit('add a')
70
72
        revid2 = self.t.commit('another change', allow_pointless=True)
71
73
        tree = self.t.branch.repository.revision_tree(revid2)
72
74
        self.assertEqual(revid1,
73
 
                         tree.get_file_revision('a'))
 
75
            tree.get_file_revision(tree.path2id('a')))
74
76
 
75
77
    def test_get_file_mtime_ghost(self):
76
 
        path = next(iter(self.rev_tree.all_versioned_paths()))
77
 
        self.rev_tree.root_inventory.get_entry(
78
 
            self.rev_tree.path2id(path)).revision = b'ghostrev'
79
 
        self.assertRaises(FileTimestampUnavailable,
80
 
                          self.rev_tree.get_file_mtime, path)
 
78
        file_id = next(iter(self.rev_tree.all_file_ids()))
 
79
        self.rev_tree.root_inventory[file_id].revision = 'ghostrev'
 
80
        self.assertRaises(FileTimestampUnavailable, 
 
81
            self.rev_tree.get_file_mtime, file_id)