1
# Copyright (C) 2005 by Canonical Ltd
1
# Copyright (C) 2005 Canonical Ltd
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
11
# GNU General Public License for more details.
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
16
from bzrlib.missing import find_unmerged
17
from bzrlib.branch import Branch
18
from bzrlib.merge import merge
19
from bzrlib.tests import TestCaseInTempDir
22
class TestMissing(TestCaseInTempDir):
20
from bzrlib.missing import (
25
from bzrlib.symbol_versioning import zero_seventeen
26
from bzrlib.tests import TestCaseWithTransport
27
from bzrlib.workingtree import WorkingTree
30
class TestMissing(TestCaseWithTransport):
23
32
def test_find_unmerged(self):
27
original = Branch.initialize('original')
28
puller = Branch.initialize('puller')
29
merger = Branch.initialize('merger')
33
original_tree = self.make_branch_and_tree('original')
34
original = original_tree.branch
35
puller_tree = self.make_branch_and_tree('puller')
36
puller = puller_tree.branch
37
merger_tree = self.make_branch_and_tree('merger')
38
merger = merger_tree.branch
30
39
self.assertEqual(find_unmerged(original, puller), ([], []))
31
original.working_tree().commit('a', rev_id='a')
40
original_tree.commit('a', rev_id='a')
32
41
self.assertEqual(find_unmerged(original, puller), ([(1, u'a')], []))
42
puller_tree.pull(original)
34
43
self.assertEqual(find_unmerged(original, puller), ([], []))
36
original.working_tree().commit('b', rev_id='b')
37
original.working_tree().commit('c', rev_id='c')
44
merger_tree.pull(original)
45
original_tree.commit('b', rev_id='b')
46
original_tree.commit('c', rev_id='c')
38
47
self.assertEqual(find_unmerged(original, puller), ([(2, u'b'),
50
puller_tree.pull(original)
42
51
self.assertEqual(find_unmerged(original, puller), ([], []))
43
52
self.assertEqual(find_unmerged(original, merger), ([(2, u'b'),
45
merge(['original', -1], [None, None], this_dir='merger')
54
merger_tree.merge_from_branch(original)
46
55
self.assertEqual(find_unmerged(original, merger), ([(2, u'b'),
48
merger.working_tree().commit('d', rev_id='d')
57
merger_tree.commit('d', rev_id='d')
49
58
self.assertEqual(find_unmerged(original, merger), ([], [(2, 'd')]))
60
def test_iter_log_data(self):
61
base_tree = self.make_branch_and_tree('base')
62
self.build_tree(['base/a'])
63
base_tree.add(['a'], ['a-id'])
64
base_tree.commit('add a', rev_id='b-1')
66
child_tree = base_tree.bzrdir.sprout('child').open_workingtree()
68
self.build_tree(['child/b'])
69
child_tree.add(['b'], ['b-id'])
70
child_tree.commit('adding b', rev_id='c-2')
72
child_tree.remove(['a'])
73
child_tree.commit('removing a', rev_id='c-3')
75
self.build_tree_contents([('child/b', 'new contents for b\n')])
76
child_tree.commit('modifying b', rev_id='c-4')
78
child_tree.rename_one('b', 'c')
79
child_tree.commit('rename b=>c', rev_id='c-5')
81
base_extra, child_extra = find_unmerged(base_tree.branch,
83
results = list(self.applyDeprecated(zero_seventeen, iter_log_data,
85
base_tree.branch.repository,
87
self.assertEqual([], results)
89
results = list(self.applyDeprecated(zero_seventeen, iter_log_data,
91
child_tree.branch.repository,
93
self.assertEqual(4, len(results))
97
self.assertEqual((2, 'c-2'), (r0[0], r0[1].revision_id))
98
self.assertEqual((3, 'c-3'), (r1[0], r1[1].revision_id))
99
self.assertEqual((4, 'c-4'), (r2[0], r2[1].revision_id))
100
self.assertEqual((5, 'c-5'), (r3[0], r3[1].revision_id))
103
self.assertNotEqual(None, delta0)
104
self.assertEqual([('b', 'b-id', 'file')], delta0.added)
105
self.assertEqual([], delta0.removed)
106
self.assertEqual([], delta0.renamed)
107
self.assertEqual([], delta0.modified)
110
self.assertNotEqual(None, delta1)
111
self.assertEqual([], delta1.added)
112
self.assertEqual([('a', 'a-id', 'file')], delta1.removed)
113
self.assertEqual([], delta1.renamed)
114
self.assertEqual([], delta1.modified)
117
self.assertNotEqual(None, delta2)
118
self.assertEqual([], delta2.added)
119
self.assertEqual([], delta2.removed)
120
self.assertEqual([], delta2.renamed)
121
self.assertEqual([('b', 'b-id', 'file', True, False)], delta2.modified)
124
self.assertNotEqual(None, delta3)
125
self.assertEqual([], delta3.added)
126
self.assertEqual([], delta3.removed)
127
self.assertEqual([('b', 'c', 'b-id', 'file', False, False)],
129
self.assertEqual([], delta3.modified)
131
def test_iter_log_revisions(self):
132
base_tree = self.make_branch_and_tree('base')
133
self.build_tree(['base/a'])
134
base_tree.add(['a'], ['a-id'])
135
base_tree.commit('add a', rev_id='b-1')
137
child_tree = base_tree.bzrdir.sprout('child').open_workingtree()
139
self.build_tree(['child/b'])
140
child_tree.add(['b'], ['b-id'])
141
child_tree.commit('adding b', rev_id='c-2')
143
child_tree.remove(['a'])
144
child_tree.commit('removing a', rev_id='c-3')
146
self.build_tree_contents([('child/b', 'new contents for b\n')])
147
child_tree.commit('modifying b', rev_id='c-4')
149
child_tree.rename_one('b', 'c')
150
child_tree.commit('rename b=>c', rev_id='c-5')
152
base_extra, child_extra = find_unmerged(base_tree.branch,
154
results = list(iter_log_revisions(base_extra,
155
base_tree.branch.repository,
157
self.assertEqual([], results)
159
results = list(iter_log_revisions(child_extra,
160
child_tree.branch.repository,
162
self.assertEqual(4, len(results))
164
r0,r1,r2,r3 = results
166
self.assertEqual((2, 'c-2'), (r0.revno, r0.rev.revision_id))
167
self.assertEqual((3, 'c-3'), (r1.revno, r1.rev.revision_id))
168
self.assertEqual((4, 'c-4'), (r2.revno, r2.rev.revision_id))
169
self.assertEqual((5, 'c-5'), (r3.revno, r3.rev.revision_id))
172
self.assertNotEqual(None, delta0)
173
self.assertEqual([('b', 'b-id', 'file')], delta0.added)
174
self.assertEqual([], delta0.removed)
175
self.assertEqual([], delta0.renamed)
176
self.assertEqual([], delta0.modified)
179
self.assertNotEqual(None, delta1)
180
self.assertEqual([], delta1.added)
181
self.assertEqual([('a', 'a-id', 'file')], delta1.removed)
182
self.assertEqual([], delta1.renamed)
183
self.assertEqual([], delta1.modified)
186
self.assertNotEqual(None, delta2)
187
self.assertEqual([], delta2.added)
188
self.assertEqual([], delta2.removed)
189
self.assertEqual([], delta2.renamed)
190
self.assertEqual([('b', 'b-id', 'file', True, False)], delta2.modified)
193
self.assertNotEqual(None, delta3)
194
self.assertEqual([], delta3.added)
195
self.assertEqual([], delta3.removed)
196
self.assertEqual([('b', 'c', 'b-id', 'file', False, False)],
198
self.assertEqual([], delta3.modified)