~bzr-pqm/bzr/bzr.dev

5557.1.15 by John Arbash Meinel
Merge bzr.dev 5597 to resolve NEWS, aka bzr-2.3.txt
1
# Copyright (C) 2006, 2008-2011 Canonical Ltd
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
2
# Authors:  Robert Collins <robert.collins@canonical.com>
3
#
4
# This program is free software; you can redistribute it and/or modify
5
# it under the terms of the GNU General Public License as published by
6
# the Free Software Foundation; either version 2 of the License, or
7
# (at your option) any later version.
8
#
9
# This program is distributed in the hope that it will be useful,
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
12
# GNU General Public License for more details.
13
#
14
# You should have received a copy of the GNU General Public License
15
# along with this program; if not, write to the Free Software
4183.7.1 by Sabin Iacob
update FSF mailing address
16
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
17
18
"""Tests for the RevisionTree class."""
19
1731.1.59 by Aaron Bentley
Ensure the null revision has no root
20
from bzrlib import (
4976.1.2 by Jelmer Vernooij
Raise FileStampUnavailable if there is no filestamp known.
21
    errors,
1731.1.59 by Aaron Bentley
Ensure the null revision has no root
22
    revision,
23
    )
1773.2.1 by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids.
24
from bzrlib.tests import TestCaseWithTransport
25
26
27
class TestTreeWithCommits(TestCaseWithTransport):
28
29
    def setUp(self):
30
        super(TestTreeWithCommits, self).setUp()
31
        self.t = self.make_branch_and_tree('.')
32
        self.rev_id = self.t.commit('foo', allow_pointless=True)
33
        self.rev_tree = self.t.branch.repository.revision_tree(self.rev_id)
34
35
    def test_empty_no_unknowns(self):
36
        self.assertEqual([], list(self.rev_tree.unknowns()))
37
38
    def test_no_conflicts(self):
39
        self.assertEqual([], list(self.rev_tree.conflicts()))
40
41
    def test_parents(self):
42
        """RevisionTree.parent_ids should match the revision graph."""
43
        # XXX: TODO: Should this be a repository_implementation test ?
44
        # at the end of the graph, we get []
45
        self.assertEqual([], self.rev_tree.get_parent_ids())
46
        # do a commit to look further up
47
        revid_2 = self.t.commit('bar', allow_pointless=True)
48
        self.assertEqual(
49
            [self.rev_id],
50
            self.t.branch.repository.revision_tree(revid_2).get_parent_ids())
51
        # TODO commit a merge and check it is reported correctly.
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
52
3668.5.1 by Jelmer Vernooij
Use NULL_REVISION rather than None for Repository.revision_tree().
53
        # the parents for a revision_tree(NULL_REVISION) are []:
1986.1.2 by Robert Collins
Various changes to allow non-workingtree specific tests to run entirely
54
        self.assertEqual([],
3668.5.1 by Jelmer Vernooij
Use NULL_REVISION rather than None for Repository.revision_tree().
55
            self.t.branch.repository.revision_tree(
3668.5.4 by Jelmer Vernooij
Eliminate more uses of Repository.revision_tree(None).
56
                revision.NULL_REVISION).get_parent_ids())
1731.1.59 by Aaron Bentley
Ensure the null revision has no root
57
58
    def test_empty_no_root(self):
59
        null_tree = self.t.branch.repository.revision_tree(
60
            revision.NULL_REVISION)
5793.2.5 by Jelmer Vernooij
Tests
61
        self.assertIs(None, null_tree.get_root_id())
62
63
    def test_get_file_revision_root(self):
64
        self.assertEquals(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.assertEquals(revid1,
74
            tree.get_file_revision(tree.path2id('a')))
4976.1.2 by Jelmer Vernooij
Raise FileStampUnavailable if there is no filestamp known.
75
76
    def test_get_file_mtime_ghost(self):
5837.2.5 by Jelmer Vernooij
Fix two warnings.
77
        file_id = iter(self.rev_tree.all_file_ids()).next()
4976.1.2 by Jelmer Vernooij
Raise FileStampUnavailable if there is no filestamp known.
78
        self.rev_tree.inventory[file_id].revision = 'ghostrev'
79
        self.assertRaises(errors.FileTimestampUnavailable, 
80
            self.rev_tree.get_file_mtime, file_id)