|
1773.2.1
by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids. |
1 |
# Copyright (C) 2006 Canonical Ltd
|
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
|
|
16 |
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
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 ( |
21 |
revision, |
|
22 |
)
|
|
|
1773.2.1
by Robert Collins
Teach all trees about unknowns, conflicts and get_parent_ids. |
23 |
import bzrlib |
24 |
from bzrlib.tests import TestCaseWithTransport |
|
25 |
from bzrlib.tree import RevisionTree |
|
26 |
||
27 |
||
28 |
class TestTreeWithCommits(TestCaseWithTransport): |
|
29 |
||
30 |
def setUp(self): |
|
31 |
super(TestTreeWithCommits, self).setUp() |
|
32 |
self.t = self.make_branch_and_tree('.') |
|
33 |
self.rev_id = self.t.commit('foo', allow_pointless=True) |
|
34 |
self.rev_tree = self.t.branch.repository.revision_tree(self.rev_id) |
|
35 |
||
36 |
def test_empty_no_unknowns(self): |
|
37 |
self.assertEqual([], list(self.rev_tree.unknowns())) |
|
38 |
||
39 |
def test_no_conflicts(self): |
|
40 |
self.assertEqual([], list(self.rev_tree.conflicts())) |
|
41 |
||
42 |
def test_parents(self): |
|
43 |
"""RevisionTree.parent_ids should match the revision graph."""
|
|
44 |
# XXX: TODO: Should this be a repository_implementation test ?
|
|
45 |
# at the end of the graph, we get []
|
|
46 |
self.assertEqual([], self.rev_tree.get_parent_ids()) |
|
47 |
# do a commit to look further up
|
|
48 |
revid_2 = self.t.commit('bar', allow_pointless=True) |
|
49 |
self.assertEqual( |
|
50 |
[self.rev_id], |
|
51 |
self.t.branch.repository.revision_tree(revid_2).get_parent_ids()) |
|
52 |
# 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 |
53 |
|
54 |
# the parents for a revision_tree(None) are []:
|
|
55 |
self.assertEqual([], |
|
56 |
self.t.branch.repository.revision_tree(None).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) |
|
61 |
self.assertIs(None, null_tree.inventory.root) |