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
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
|
# Copyright (C) 2006 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 for the InterTree.compare() function."""
import os
from bzrlib import errors
from bzrlib.tests.intertree_implementations import TestCaseWithTwoTrees
class TestCompare(TestCaseWithTwoTrees):
def test_compare_empty_trees(self):
tree1 = self.make_branch_and_tree('1')
tree2 = self.make_to_branch_and_tree('2')
tree1 = self.get_tree_no_parents_no_content(tree1)
tree2 = self.get_to_tree_no_parents_no_content(tree2)
d = self.intertree_class(tree1, tree2).compare()
self.assertEqual([], d.added)
self.assertEqual([], d.modified)
self.assertEqual([], d.removed)
self.assertEqual([], d.renamed)
self.assertEqual([], d.unchanged)
def test_empty_to_abc_content(self):
tree1 = self.make_branch_and_tree('1')
tree2 = self.make_to_branch_and_tree('2')
tree1 = self.get_tree_no_parents_no_content(tree1)
tree2 = self.get_to_tree_no_parents_abc_content(tree2)
d = self.intertree_class(tree1, tree2).compare()
self.assertEqual([('a', 'a-id', 'file'),
('b', 'b-id', 'directory'),
('b/c', 'c-id', 'file'),
], d.added)
self.assertEqual([], d.modified)
self.assertEqual([], d.removed)
self.assertEqual([], d.renamed)
self.assertEqual([], d.unchanged)
def test_dangling(self):
tree1 = self.make_branch_and_tree('1')
tree2 = self.make_branch_and_tree('2')
self.build_tree(['2/a'])
tree2.add('a')
os.unlink('2/a')
self.build_tree(['1/b'])
tree1.add('b')
os.unlink('1/b')
d = self.intertree_class(tree1, tree2).compare()
self.assertEqual([], d.added)
self.assertEqual([], d.modified)
self.assertEqual([], d.removed)
self.assertEqual([], d.renamed)
self.assertEqual([], d.unchanged)
def test_abc_content_to_empty(self):
tree1 = self.make_branch_and_tree('1')
tree2 = self.make_to_branch_and_tree('2')
tree1 = self.get_tree_no_parents_abc_content(tree1)
tree2 = self.get_to_tree_no_parents_no_content(tree2)
d = self.intertree_class(tree1, tree2).compare()
self.assertEqual([], d.added)
self.assertEqual([], d.modified)
self.assertEqual([('a', 'a-id', 'file'),
('b', 'b-id', 'directory'),
('b/c', 'c-id', 'file'),
], d.removed)
self.assertEqual([], d.renamed)
self.assertEqual([], d.unchanged)
def test_content_modification(self):
tree1 = self.make_branch_and_tree('1')
tree2 = self.make_to_branch_and_tree('2')
tree1 = self.get_tree_no_parents_abc_content(tree1)
tree2 = self.get_to_tree_no_parents_abc_content_2(tree2)
d = self.intertree_class(tree1, tree2).compare()
self.assertEqual([], d.added)
self.assertEqual([('a', 'a-id', 'file', True, False)], d.modified)
self.assertEqual([], d.removed)
self.assertEqual([], d.renamed)
self.assertEqual([], d.unchanged)
def test_meta_modification(self):
tree1 = self.make_branch_and_tree('1')
tree2 = self.make_to_branch_and_tree('2')
tree1 = self.get_tree_no_parents_abc_content(tree1)
tree2 = self.get_to_tree_no_parents_abc_content_3(tree2)
d = self.intertree_class(tree1, tree2).compare()
self.assertEqual([], d.added)
self.assertEqual([('b/c', 'c-id', 'file', False, True)], d.modified)
self.assertEqual([], d.removed)
self.assertEqual([], d.renamed)
self.assertEqual([], d.unchanged)
def test_file_rename(self):
tree1 = self.make_branch_and_tree('1')
tree2 = self.make_to_branch_and_tree('2')
tree1 = self.get_tree_no_parents_abc_content(tree1)
tree2 = self.get_to_tree_no_parents_abc_content_4(tree2)
d = self.intertree_class(tree1, tree2).compare()
self.assertEqual([], d.added)
self.assertEqual([], d.modified)
self.assertEqual([], d.removed)
self.assertEqual([('a', 'd', 'a-id', 'file', False, False)], d.renamed)
self.assertEqual([], d.unchanged)
def test_file_rename_and_modification(self):
tree1 = self.make_branch_and_tree('1')
tree2 = self.make_to_branch_and_tree('2')
tree1 = self.get_tree_no_parents_abc_content(tree1)
tree2 = self.get_to_tree_no_parents_abc_content_5(tree2)
d = self.intertree_class(tree1, tree2).compare()
self.assertEqual([], d.added)
self.assertEqual([], d.modified)
self.assertEqual([], d.removed)
self.assertEqual([('a', 'd', 'a-id', 'file', True, False)], d.renamed)
self.assertEqual([], d.unchanged)
def test_file_rename_and_meta_modification(self):
tree1 = self.make_branch_and_tree('1')
tree2 = self.make_to_branch_and_tree('2')
tree1 = self.get_tree_no_parents_abc_content(tree1)
tree2 = self.get_to_tree_no_parents_abc_content_6(tree2)
d = self.intertree_class(tree1, tree2).compare()
self.assertEqual([], d.added)
self.assertEqual([], d.modified)
self.assertEqual([], d.removed)
self.assertEqual([('b/c', 'e', 'c-id', 'file', False, True)], d.renamed)
self.assertEqual([], d.unchanged)
def test_empty_to_abc_content_a_only(self):
tree1 = self.make_branch_and_tree('1')
tree2 = self.make_to_branch_and_tree('2')
tree1 = self.get_tree_no_parents_no_content(tree1)
tree2 = self.get_to_tree_no_parents_abc_content(tree2)
d = self.intertree_class(tree1, tree2).compare(specific_files=['a'])
self.assertEqual([('a', 'a-id', 'file')], d.added)
self.assertEqual([], d.modified)
self.assertEqual([], d.removed)
self.assertEqual([], d.renamed)
self.assertEqual([], d.unchanged)
def test_empty_to_abc_content_a_and_c_only(self):
tree1 = self.make_branch_and_tree('1')
tree2 = self.make_to_branch_and_tree('2')
tree1 = self.get_tree_no_parents_no_content(tree1)
tree2 = self.get_to_tree_no_parents_abc_content(tree2)
d = self.intertree_class(tree1, tree2).compare(
specific_files=['a', 'b/c'])
self.assertEqual(
[('a', 'a-id', 'file'), ('b/c', 'c-id', 'file')],
d.added)
self.assertEqual([], d.modified)
self.assertEqual([], d.removed)
self.assertEqual([], d.renamed)
self.assertEqual([], d.unchanged)
def test_empty_to_abc_content_b_only(self):
"""Restricting to a dir matches the children of the dir."""
tree1 = self.make_branch_and_tree('1')
tree2 = self.make_to_branch_and_tree('2')
tree1 = self.get_tree_no_parents_no_content(tree1)
tree2 = self.get_to_tree_no_parents_abc_content(tree2)
d = self.intertree_class(tree1, tree2).compare(specific_files=['b'])
self.assertEqual(
[('b', 'b-id', 'directory'),('b/c', 'c-id', 'file')],
d.added)
self.assertEqual([], d.modified)
self.assertEqual([], d.removed)
self.assertEqual([], d.renamed)
self.assertEqual([], d.unchanged)
def test_unchanged_with_renames_and_modifications(self):
"""want_unchanged should generate a list of unchanged entries."""
tree1 = self.make_branch_and_tree('1')
tree2 = self.make_to_branch_and_tree('2')
tree1 = self.get_tree_no_parents_abc_content(tree1)
tree2 = self.get_to_tree_no_parents_abc_content_5(tree2)
d = self.intertree_class(tree1, tree2).compare(want_unchanged=True)
self.assertEqual([], d.added)
self.assertEqual([], d.modified)
self.assertEqual([], d.removed)
self.assertEqual([('a', 'd', 'a-id', 'file', True, False)], d.renamed)
self.assertEqual(
[(u'b', 'b-id', 'directory'), (u'b/c', 'c-id', 'file')],
d.unchanged)
def test_extra_trees_finds_ids(self):
"""Ask for a delta between two trees with a path present in a third."""
tree1 = self.make_branch_and_tree('1')
tree2 = self.make_to_branch_and_tree('2')
tree1 = self.get_tree_no_parents_abc_content(tree1)
tree2 = self.get_to_tree_no_parents_abc_content_3(tree2)
# the type of tree-3 does not matter - it is used as a lookup, not
# a dispatch
tree3 = self.make_branch_and_tree('3')
tree3 = self.get_tree_no_parents_abc_content_6(tree3)
# tree 3 has 'e' which is 'c-id'. Tree 1 has c-id at b/c, and Tree 2
# has c-id at b/c with its exec flag toggled.
# without extra_trees, we should get no modifications from this
# so do one, to be sure the test is valid.
d = self.intertree_class(tree1, tree2).compare(
specific_files=['e'])
self.assertEqual([], d.modified)
# now give it an additional lookup:
d = self.intertree_class(tree1, tree2).compare(
specific_files=['e'], extra_trees=[tree3])
self.assertEqual([], d.added)
self.assertEqual([('b/c', 'c-id', 'file', False, True)], d.modified)
self.assertEqual([], d.removed)
self.assertEqual([], d.renamed)
self.assertEqual([], d.unchanged)
def test_require_versioned(self):
# this does not quite robustly test, as it is passing in missing paths
# rather than present-but-not-versioned paths. At the moment there is
# no mechanism for managing the test trees (which are readonly) to
# get present-but-not-versioned files for trees that can do that.
tree1 = self.make_branch_and_tree('1')
tree2 = self.make_to_branch_and_tree('2')
tree1 = self.get_tree_no_parents_no_content(tree1)
tree2 = self.get_to_tree_no_parents_abc_content(tree2)
self.assertRaises(errors.PathsNotVersionedError,
self.intertree_class(tree1, tree2).compare,
specific_files=['d'],
require_versioned=True)
class TestIterChanges(TestCaseWithTwoTrees):
"""Test the comparison iterator"""
def test_compare_empty_trees(self):
tree1 = self.make_branch_and_tree('1')
tree2 = self.make_to_branch_and_tree('2')
tree1 = self.get_tree_no_parents_no_content(tree1)
tree2 = self.get_to_tree_no_parents_no_content(tree2)
self.assertEqual([], list(tree2._iter_changes(tree1)))
def added(self, tree, file_id):
entry = tree.inventory[file_id]
path = tree.id2path(file_id)
return (file_id, path, True, (False, True), (None, entry.parent_id),
(None, entry.name), (None, entry.kind),
(None, entry.executable))
def deleted(self, tree, file_id):
entry = tree.inventory[file_id]
path = tree.id2path(file_id)
return (file_id, path, True, (True, False), (entry.parent_id, None),
(entry.name, None), (entry.kind, None),
(entry.executable, None))
def test_empty_to_abc_content(self):
tree1 = self.make_branch_and_tree('1')
tree2 = self.make_to_branch_and_tree('2')
tree1 = self.get_tree_no_parents_no_content(tree1)
tree2 = self.get_to_tree_no_parents_abc_content(tree2)
self.assertEqual([self.added(tree2, 'root-id'),
self.added(tree2, 'a-id'),
self.added(tree2, 'b-id'),
self.added(tree2, 'c-id'),
self.deleted(tree1, 'empty-root-id')],
list(tree2._iter_changes(tree1)))
def test_empty_to_abc_content_a_only(self):
tree1 = self.make_branch_and_tree('1')
tree2 = self.make_to_branch_and_tree('2')
tree1 = self.get_tree_no_parents_no_content(tree1)
tree2 = self.get_to_tree_no_parents_abc_content(tree2)
self.assertEqual([self.added(tree2, 'a-id')],
list(tree2._iter_changes(tree1,
specific_file_ids=['a-id'])))
self.assertEqual([self.deleted(tree2, 'a-id')],
list(tree1._iter_changes(tree2,
specific_file_ids=['a-id'])))
def test_empty_to_abc_content_a_and_c_only(self):
tree1 = self.make_branch_and_tree('1')
tree2 = self.make_to_branch_and_tree('2')
tree1 = self.get_tree_no_parents_no_content(tree1)
tree2 = self.get_to_tree_no_parents_abc_content(tree2)
self.assertEqual([self.added(tree2, 'a-id'),
self.added(tree2, 'c-id')],
list(tree2._iter_changes(tree1,
specific_file_ids=['a-id',
'c-id'])))
d = self.intertree_class(tree1, tree2).compare(
specific_files=['a', 'b/c'])
def test_abc_content(self):
tree1 = self.make_branch_and_tree('1')
tree2 = self.make_to_branch_and_tree('2')
tree1 = self.get_tree_no_parents_no_content(tree1)
tree2 = self.get_to_tree_no_parents_abc_content(tree2)
def deleted(file_id):
entry = tree2.inventory[file_id]
path = tree2.id2path(file_id)
return (file_id, path, True, (True, False),
(entry.parent_id, None),
(entry.name, None), (entry.kind, None),
(entry.executable, None))
self.assertEqual([self.added(tree1, 'empty-root-id'),
deleted('root-id'), deleted('a-id'),
deleted('b-id'), deleted('c-id')],
list(tree1._iter_changes(tree2)))
def test_content_modification(self):
tree1 = self.make_branch_and_tree('1')
tree2 = self.make_to_branch_and_tree('2')
tree1 = self.get_tree_no_parents_abc_content(tree1)
tree2 = self.get_to_tree_no_parents_abc_content_2(tree2)
root_id = tree1.inventory.root.file_id
self.assertEqual([('a-id', 'a', True, (True, True),
(root_id, root_id), ('a', 'a'),
('file', 'file'), (False, False))],
list(tree2._iter_changes(tree1)))
def test_meta_modification(self):
tree1 = self.make_branch_and_tree('1')
tree2 = self.make_to_branch_and_tree('2')
tree1 = self.get_tree_no_parents_abc_content(tree1)
tree2 = self.get_to_tree_no_parents_abc_content_3(tree2)
self.assertEqual([('c-id', 'b/c', False, (True, True),
('b-id', 'b-id'), ('c', 'c'), ('file', 'file'),
(False, True))], list(tree2._iter_changes(tree1)))
def test_file_rename(self):
tree1 = self.make_branch_and_tree('1')
tree2 = self.make_to_branch_and_tree('2')
tree1 = self.get_tree_no_parents_abc_content(tree1)
tree2 = self.get_to_tree_no_parents_abc_content_4(tree2)
root_id = tree1.inventory.root.file_id
self.assertEqual([('a-id', 'd', False, (True, True),
(root_id, root_id), ('a', 'd'), ('file', 'file'),
(False, False))], list(tree2._iter_changes(tree1)))
def test_file_rename_and_modification(self):
tree1 = self.make_branch_and_tree('1')
tree2 = self.make_to_branch_and_tree('2')
tree1 = self.get_tree_no_parents_abc_content(tree1)
tree2 = self.get_to_tree_no_parents_abc_content_5(tree2)
root_id = tree1.inventory.root.file_id
self.assertEqual([('a-id', 'd', True, (True, True),
(root_id, root_id), ('a', 'd'), ('file', 'file'),
(False, False))], list(tree2._iter_changes(tree1)))
def test_file_rename_and_meta_modification(self):
tree1 = self.make_branch_and_tree('1')
tree2 = self.make_to_branch_and_tree('2')
tree1 = self.get_tree_no_parents_abc_content(tree1)
tree2 = self.get_to_tree_no_parents_abc_content_6(tree2)
root_id = tree1.inventory.root.file_id
self.assertEqual([('c-id', 'e', False, (True, True),
('b-id', root_id), ('c', 'e'), ('file', 'file'),
(False, True))], list(tree2._iter_changes(tree1)))
def test_unchanged_with_renames_and_modifications(self):
"""want_unchanged should generate a list of unchanged entries."""
tree1 = self.make_branch_and_tree('1')
tree2 = self.make_to_branch_and_tree('2')
tree1 = self.get_tree_no_parents_abc_content(tree1)
tree2 = self.get_to_tree_no_parents_abc_content_5(tree2)
root_id = tree1.inventory.root.file_id
def unchanged(file_id):
entry = tree1.inventory[file_id]
parent = entry.parent_id
name = entry.name
kind = entry.kind
executable = entry.executable
return (file_id, tree1.id2path(file_id), False, (True, True),
(parent, parent), (name, name), (kind, kind),
(executable, executable))
self.assertEqual([unchanged(root_id), unchanged('b-id'),
('a-id', 'd', True, (True, True),
(root_id, root_id), ('a', 'd'), ('file', 'file'),
(False, False)), unchanged('c-id')],
list(tree2._iter_changes(tree1,
include_unchanged=True)))
def test_compare_subtrees(self):
"""want_unchanged should generate a list of unchanged entries."""
tree1 = self.make_branch_and_tree('1')
tree1.set_root_id('root-id')
subtree1 = self.make_branch_and_tree('1/sub')
subtree1.set_root_id('subtree-id')
tree1.add_reference(subtree1)
tree2 = self.make_to_branch_and_tree('2')
tree2.set_root_id('root-id')
subtree2 = self.make_to_branch_and_tree('2/sub')
subtree2.set_root_id('subtree-id')
tree2.add_reference(subtree2)
self.assertEqual([], list(tree2._iter_changes(tree1)))
subtree1.commit('commit', rev_id='commit-a')
self.assertEqual([('subtree-id',
'sub',
True,
(True, True),
('root-id', 'root-id'),
('sub', 'sub'),
('tree-reference', 'tree-reference'),
(False, False))],
list(tree2._iter_changes(tree1)))
|