1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
|
# Copyright (C) 2006 by Canonical Ltd
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
"""Tests of the parent related functions of WorkingTrees."""
import os
from bzrlib.tests.workingtree_implementations import TestCaseWithWorkingTree
from bzrlib.branch import Branch
from bzrlib.revision import Revision
from bzrlib.uncommit import uncommit
import bzrlib.xml5
class TestParents(TestCaseWithWorkingTree):
def assertConsistentParents(self, expected, tree):
self.assertEqual(expected, tree.get_parent_ids())
if expected == []:
self.assertEqual(None, tree.last_revision())
else:
self.assertEqual(expected[0], tree.last_revision())
self.assertEqual(expected[1:], tree.pending_merges())
class TestSetParents(TestParents):
def test_set_no_parents(self):
t = self.make_branch_and_tree('.')
t.set_parent_trees([])
self.assertEqual([], t.get_parent_ids())
# now give it a real parent, and then set it to no parents again.
t.commit('first post')
t.set_parent_trees([])
self.assertConsistentParents([], t)
def test_set_one_ghost_parent(self):
t = self.make_branch_and_tree('.')
t.set_parent_trees([('missing-revision-id', None)])
self.assertConsistentParents(['missing-revision-id'], t)
def test_set_two_parents_one_ghost(self):
t = self.make_branch_and_tree('.')
revision_in_repo = t.commit('first post')
# remove the tree's history
uncommit(t.branch, tree=t)
rev_tree = t.branch.repository.revision_tree(revision_in_repo)
t.set_parent_trees([(revision_in_repo, rev_tree),
('another-missing', None)])
self.assertConsistentParents([revision_in_repo, 'another-missing'], t)
def test_set_three_parents(self):
t = self.make_branch_and_tree('.')
first_revision = t.commit('first post')
uncommit(t.branch, tree=t)
second_revision = t.commit('second post')
uncommit(t.branch, tree=t)
third_revision = t.commit('third post')
uncommit(t.branch, tree=t)
rev_tree1 = t.branch.repository.revision_tree(first_revision)
rev_tree2 = t.branch.repository.revision_tree(second_revision)
rev_tree3 = t.branch.repository.revision_tree(third_revision)
t.set_parent_trees([(first_revision, rev_tree1),
(second_revision, rev_tree2),
(third_revision, rev_tree3)])
self.assertConsistentParents(
[first_revision, second_revision, third_revision], t)
def test_set_no_parents_ids(self):
t = self.make_branch_and_tree('.')
t.set_parent_ids([])
self.assertEqual([], t.get_parent_ids())
# now give it a real parent, and then set it to no parents again.
t.commit('first post')
t.set_parent_ids([])
self.assertConsistentParents([], t)
def test_set_one_ghost_parent_ids(self):
t = self.make_branch_and_tree('.')
t.set_parent_ids(['missing-revision-id'])
self.assertConsistentParents(['missing-revision-id'], t)
def test_set_two_parents_one_ghost_ids(self):
t = self.make_branch_and_tree('.')
revision_in_repo = t.commit('first post')
# remove the tree's history
uncommit(t.branch, tree=t)
rev_tree = t.branch.repository.revision_tree(revision_in_repo)
t.set_parent_ids([revision_in_repo, 'another-missing'])
self.assertConsistentParents([revision_in_repo, 'another-missing'], t)
def test_set_three_parents_ids(self):
t = self.make_branch_and_tree('.')
first_revision = t.commit('first post')
uncommit(t.branch, tree=t)
second_revision = t.commit('second post')
uncommit(t.branch, tree=t)
third_revision = t.commit('third post')
uncommit(t.branch, tree=t)
rev_tree1 = t.branch.repository.revision_tree(first_revision)
rev_tree2 = t.branch.repository.revision_tree(second_revision)
rev_tree3 = t.branch.repository.revision_tree(third_revision)
t.set_parent_ids([first_revision, second_revision, third_revision])
self.assertConsistentParents(
[first_revision, second_revision, third_revision], t)
class TestAddParentId(TestParents):
def test_add_first_parent_id(self):
"""Test adding the first parent id"""
tree = self.make_branch_and_tree('.')
first_revision = tree.commit('first post')
uncommit(tree.branch, tree=tree)
tree.add_parent_tree_id(first_revision)
self.assertConsistentParents([first_revision], tree)
def test_add_first_parent_id_ghost(self):
"""Test adding the first parent id - as a ghost"""
tree = self.make_branch_and_tree('.')
tree.add_parent_tree_id('first-revision')
self.assertConsistentParents(['first-revision'], tree)
def test_add_second_parent_id(self):
"""Test adding the second parent id"""
tree = self.make_branch_and_tree('.')
first_revision = tree.commit('first post')
uncommit(tree.branch, tree=tree)
second_revision = tree.commit('second post')
tree.add_parent_tree_id(first_revision)
self.assertConsistentParents([second_revision, first_revision], tree)
def test_add_second_parent_id_ghost(self):
"""Test adding the second parent id - as a ghost"""
tree = self.make_branch_and_tree('.')
first_revision = tree.commit('first post')
tree.add_parent_tree_id('second')
self.assertConsistentParents([first_revision, 'second'], tree)
|