132
86
link = inventory.InventoryLink('123', 'hello.c', ROOT_ID)
133
87
self.failIf(link.has_text())
136
class TestEntryDiffing(TestCaseInTempDir):
139
super(TestEntryDiffing, self).setUp()
140
self.branch = Branch.initialize(u'.')
141
self.wt = self.branch.working_tree()
142
print >> open('file', 'wb'), 'foo'
143
self.branch.working_tree().add(['file'], ['fileid'])
145
os.symlink('target1', 'symlink')
146
self.branch.working_tree().add(['symlink'], ['linkid'])
147
self.wt.commit('message_1', rev_id = '1')
148
print >> open('file', 'wb'), 'bar'
151
os.symlink('target2', 'symlink')
152
self.tree_1 = self.branch.revision_tree('1')
153
self.inv_1 = self.branch.get_inventory('1')
154
self.file_1 = self.inv_1['fileid']
155
self.tree_2 = self.branch.working_tree()
156
self.inv_2 = self.tree_2.read_working_inventory()
157
self.file_2 = self.inv_2['fileid']
159
self.link_1 = self.inv_1['linkid']
160
self.link_2 = self.inv_2['linkid']
162
def test_file_diff_deleted(self):
164
self.file_1.diff(internal_diff,
165
"old_label", self.tree_1,
166
"/dev/null", None, None,
168
self.assertEqual(output.getvalue(), "--- old_label\t\n"
174
def test_file_diff_added(self):
176
self.file_1.diff(internal_diff,
177
"new_label", self.tree_1,
178
"/dev/null", None, None,
179
output, reverse=True)
180
self.assertEqual(output.getvalue(), "--- /dev/null\t\n"
186
def test_file_diff_changed(self):
188
self.file_1.diff(internal_diff,
189
"/dev/null", self.tree_1,
190
"new_label", self.file_2, self.tree_2,
192
self.assertEqual(output.getvalue(), "--- /dev/null\t\n"
199
def test_link_diff_deleted(self):
200
if not has_symlinks():
203
self.link_1.diff(internal_diff,
204
"old_label", self.tree_1,
205
"/dev/null", None, None,
207
self.assertEqual(output.getvalue(),
208
"=== target was 'target1'\n")
210
def test_link_diff_added(self):
211
if not has_symlinks():
214
self.link_1.diff(internal_diff,
215
"new_label", self.tree_1,
216
"/dev/null", None, None,
217
output, reverse=True)
218
self.assertEqual(output.getvalue(),
219
"=== target is 'target1'\n")
221
def test_link_diff_changed(self):
222
if not has_symlinks():
225
self.link_1.diff(internal_diff,
226
"/dev/null", self.tree_1,
227
"new_label", self.link_2, self.tree_2,
229
self.assertEqual(output.getvalue(),
230
"=== target changed 'target1' => 'target2'\n")
233
class TestSnapshot(TestCaseInTempDir):
236
# for full testing we'll need a branch
237
# with a subdir to test parent changes.
238
# and a file, link and dir under that.
239
# but right now I only need one attribute
240
# to change, and then test merge patterns
241
# with fake parent entries.
242
super(TestSnapshot, self).setUp()
243
self.branch = Branch.initialize(u'.')
244
self.build_tree(['subdir/', 'subdir/file'], line_endings='binary')
245
self.branch.working_tree().add(['subdir', 'subdir/file'],
249
self.wt = self.branch.working_tree()
250
self.wt.commit('message_1', rev_id = '1')
251
self.tree_1 = self.branch.revision_tree('1')
252
self.inv_1 = self.branch.get_inventory('1')
253
self.file_1 = self.inv_1['fileid']
254
self.work_tree = self.branch.working_tree()
255
self.file_active = self.work_tree.inventory['fileid']
257
def test_snapshot_new_revision(self):
258
# This tests that a simple commit with no parents makes a new
259
# revision value in the inventory entry
260
self.file_active.snapshot('2', 'subdir/file', {}, self.work_tree,
261
self.branch.weave_store,
262
self.branch.get_transaction())
263
# expected outcome - file_1 has a revision id of '2', and we can get
264
# its text of 'file contents' out of the weave.
265
self.assertEqual(self.file_1.revision, '1')
266
self.assertEqual(self.file_active.revision, '2')
267
# this should be a separate test probably, but lets check it once..
268
lines = self.branch.weave_store.get_lines('fileid','2',
269
self.branch.get_transaction())
270
self.assertEqual(lines, ['contents of subdir/file\n'])
272
def test_snapshot_unchanged(self):
273
#This tests that a simple commit does not make a new entry for
274
# an unchanged inventory entry
275
self.file_active.snapshot('2', 'subdir/file', {'1':self.file_1},
276
self.work_tree, self.branch.weave_store,
277
self.branch.get_transaction())
278
self.assertEqual(self.file_1.revision, '1')
279
self.assertEqual(self.file_active.revision, '1')
280
self.assertRaises(errors.WeaveError,
281
self.branch.weave_store.get_lines, 'fileid', '2',
282
self.branch.get_transaction())
284
def test_snapshot_merge_identical_different_revid(self):
285
# This tests that a commit with two identical parents, one of which has
286
# a different revision id, results in a new revision id in the entry.
287
# 1->other, commit a merge of other against 1, results in 2.
288
other_ie = inventory.InventoryFile('fileid', 'newname', self.file_1.parent_id)
289
other_ie = inventory.InventoryFile('fileid', 'file', self.file_1.parent_id)
290
other_ie.revision = '1'
291
other_ie.text_sha1 = self.file_1.text_sha1
292
other_ie.text_size = self.file_1.text_size
293
self.assertEqual(self.file_1, other_ie)
294
other_ie.revision = 'other'
295
self.assertNotEqual(self.file_1, other_ie)
296
self.branch.weave_store.add_identical_text('fileid', '1', 'other', ['1'],
297
self.branch.get_transaction())
298
self.file_active.snapshot('2', 'subdir/file',
299
{'1':self.file_1, 'other':other_ie},
300
self.work_tree, self.branch.weave_store,
301
self.branch.get_transaction())
302
self.assertEqual(self.file_active.revision, '2')
304
def test_snapshot_changed(self):
305
# This tests that a commit with one different parent results in a new
306
# revision id in the entry.
307
self.file_active.name='newname'
308
rename('subdir/file', 'subdir/newname')
309
self.file_active.snapshot('2', 'subdir/newname', {'1':self.file_1},
311
self.branch.weave_store,
312
self.branch.get_transaction())
313
# expected outcome - file_1 has a revision id of '2'
314
self.assertEqual(self.file_active.revision, '2')
317
class TestPreviousHeads(TestCaseInTempDir):
320
# we want several inventories, that respectively
321
# give use the following scenarios:
322
# A) fileid not in any inventory (A),
323
# B) fileid present in one inventory (B) and (A,B)
324
# C) fileid present in two inventories, and they
325
# are not mutual descendents (B, C)
326
# D) fileid present in two inventories and one is
327
# a descendent of the other. (B, D)
328
super(TestPreviousHeads, self).setUp()
329
self.build_tree(['file'])
330
self.branch = Branch.initialize(u'.')
331
self.wt = self.branch.working_tree()
332
self.wt.commit('new branch', allow_pointless=True, rev_id='A')
333
self.inv_A = self.branch.get_inventory('A')
334
self.branch.working_tree().add(['file'], ['fileid'])
335
self.wt.commit('add file', rev_id='B')
336
self.inv_B = self.branch.get_inventory('B')
337
self.branch.put_controlfile('revision-history', 'A\n')
338
self.assertEqual(self.branch.revision_history(), ['A'])
339
self.wt.commit('another add of file', rev_id='C')
340
self.inv_C = self.branch.get_inventory('C')
341
self.wt.add_pending_merge('B')
342
self.wt.commit('merge in B', rev_id='D')
343
self.inv_D = self.branch.get_inventory('D')
344
self.file_active = self.wt.inventory['fileid']
345
self.weave = self.branch.weave_store.get_weave('fileid',
346
self.branch.get_transaction())
348
def get_previous_heads(self, inventories):
349
return self.file_active.find_previous_heads(inventories, self.weave)
351
def test_fileid_in_no_inventory(self):
352
self.assertEqual({}, self.get_previous_heads([self.inv_A]))
354
def test_fileid_in_one_inventory(self):
355
self.assertEqual({'B':self.inv_B['fileid']},
356
self.get_previous_heads([self.inv_B]))
357
self.assertEqual({'B':self.inv_B['fileid']},
358
self.get_previous_heads([self.inv_A, self.inv_B]))
359
self.assertEqual({'B':self.inv_B['fileid']},
360
self.get_previous_heads([self.inv_B, self.inv_A]))
362
def test_fileid_in_two_inventories_gives_both_entries(self):
363
self.assertEqual({'B':self.inv_B['fileid'],
364
'C':self.inv_C['fileid']},
365
self.get_previous_heads([self.inv_B, self.inv_C]))
366
self.assertEqual({'B':self.inv_B['fileid'],
367
'C':self.inv_C['fileid']},
368
self.get_previous_heads([self.inv_C, self.inv_B]))
370
def test_fileid_in_two_inventories_already_merged_gives_head(self):
371
self.assertEqual({'D':self.inv_D['fileid']},
372
self.get_previous_heads([self.inv_B, self.inv_D]))
373
self.assertEqual({'D':self.inv_D['fileid']},
374
self.get_previous_heads([self.inv_D, self.inv_B]))
376
# TODO: test two inventories with the same file revision
379
class TestExecutable(TestCaseInTempDir):
381
def test_stays_executable(self):
382
basic_inv = """<inventory format="5">
383
<file file_id="a-20051208024829-849e76f7968d7a86" name="a" executable="yes" />
384
<file file_id="b-20051208024829-849e76f7968d7a86" name="b" />
388
b = Branch.initialize('b1')
389
open('b1/a', 'wb').write('a test\n')
390
open('b1/b', 'wb').write('b test\n')
391
os.chmod('b1/a', 0755)
392
os.chmod('b1/b', 0644)
393
# Manually writing the inventory, to ensure that
394
# the executable="yes" entry is set for 'a' and not for 'b'
395
open('b1/.bzr/inventory', 'wb').write(basic_inv)
397
a_id = "a-20051208024829-849e76f7968d7a86"
398
b_id = "b-20051208024829-849e76f7968d7a86"
400
self.assertEqual(['a', 'b'], [cn for cn,ie in t.inventory.iter_entries()])
402
self.failUnless(t.is_executable(a_id), "'a' lost the execute bit")
403
self.failIf(t.is_executable(b_id), "'b' gained an execute bit")
405
t.commit('adding a,b', rev_id='r1')
407
rev_tree = b.revision_tree('r1')
408
self.failUnless(rev_tree.is_executable(a_id), "'a' lost the execute bit")
409
self.failIf(rev_tree.is_executable(b_id), "'b' gained an execute bit")
411
self.failUnless(rev_tree.inventory[a_id].executable)
412
self.failIf(rev_tree.inventory[b_id].executable)
414
# Make sure the entries are gone
417
self.failIf(t.has_id(a_id))
418
self.failIf(t.has_filename('a'))
419
self.failIf(t.has_id(b_id))
420
self.failIf(t.has_filename('b'))
422
# Make sure that revert is able to bring them back,
423
# and sets 'a' back to being executable
425
t.revert(['b1/a', 'b1/b'], rev_tree, backups=False)
426
self.assertEqual(['a', 'b'], [cn for cn,ie in t.inventory.iter_entries()])
428
self.failUnless(t.is_executable(a_id), "'a' lost the execute bit")
429
self.failIf(t.is_executable(b_id), "'b' gained an execute bit")
431
# Now remove them again, and make sure that after a
432
# commit, they are still marked correctly
435
t.commit('removed', rev_id='r2')
437
self.assertEqual([], [cn for cn,ie in t.inventory.iter_entries()])
438
self.failIf(t.has_id(a_id))
439
self.failIf(t.has_filename('a'))
440
self.failIf(t.has_id(b_id))
441
self.failIf(t.has_filename('b'))
443
# Now revert back to the previous commit
444
t.revert([], rev_tree, backups=False)
445
# TODO: FIXME: For some reason, after revert, the tree does not
446
# regenerate its working inventory, so we have to manually delete
447
# the working tree, and create a new one
448
# This seems to happen any time you do a merge operation on the
453
self.assertEqual(['a', 'b'], [cn for cn,ie in t.inventory.iter_entries()])
455
self.failUnless(t.is_executable(a_id), "'a' lost the execute bit")
456
self.failIf(t.is_executable(b_id), "'b' gained an execute bit")
458
# Now make sure that 'bzr branch' also preserves the
460
# TODO: Maybe this should be a blackbox test
461
from bzrlib.clone import copy_branch
462
copy_branch(b, 'b2', revision='r1')
463
b2 = Branch.open('b2')
464
self.assertEquals('r1', b2.last_revision())
465
t2 = b2.working_tree()
467
self.assertEqual(['a', 'b'], [cn for cn,ie in t2.inventory.iter_entries()])
468
self.failUnless(t2.is_executable(a_id), "'a' lost the execute bit")
469
self.failIf(t2.is_executable(b_id), "'b' gained an execute bit")
471
# Make sure pull will delete the files
473
self.assertEquals('r2', b2.last_revision())
474
# FIXME: Same thing here, t2 needs to be recreated
476
t2 = b2.working_tree()
477
self.assertEqual([], [cn for cn,ie in t2.inventory.iter_entries()])
479
# Now commit the changes on the first branch
480
# so that the second branch can pull the changes
481
# and make sure that the executable bit has been copied
482
t.commit('resurrected', rev_id='r3')
487
t2 = b2.working_tree()
488
self.assertEquals('r3', b2.last_revision())
489
self.assertEqual(['a', 'b'], [cn for cn,ie in t2.inventory.iter_entries()])
491
self.failUnless(t2.is_executable(a_id), "'a' lost the execute bit")
492
self.failIf(t2.is_executable(b_id), "'b' gained an execute bit")
89
def test_make_entry(self):
90
self.assertIsInstance(inventory.make_entry("file", "name", ROOT_ID),
91
inventory.InventoryFile)
92
self.assertIsInstance(inventory.make_entry("symlink", "name", ROOT_ID),
93
inventory.InventoryLink)
94
self.assertIsInstance(inventory.make_entry("directory", "name", ROOT_ID),
95
inventory.InventoryDirectory)
97
def test_make_entry_non_normalized(self):
98
orig_normalized_filename = osutils.normalized_filename
101
osutils.normalized_filename = osutils._accessible_normalized_filename
102
entry = inventory.make_entry("file", u'a\u030a', ROOT_ID)
103
self.assertEqual(u'\xe5', entry.name)
104
self.assertIsInstance(entry, inventory.InventoryFile)
106
osutils.normalized_filename = osutils._inaccessible_normalized_filename
107
self.assertRaises(errors.InvalidNormalization,
108
inventory.make_entry, 'file', u'a\u030a', ROOT_ID)
110
osutils.normalized_filename = orig_normalized_filename
113
class TestDescribeChanges(TestCase):
115
def test_describe_change(self):
116
# we need to test the following change combinations:
122
# renamed/reparented and modified
123
# change kind (perhaps can't be done yet?)
124
# also, merged in combination with all of these?
125
old_a = InventoryFile('a-id', 'a_file', ROOT_ID)
126
old_a.text_sha1 = '123132'
128
new_a = InventoryFile('a-id', 'a_file', ROOT_ID)
129
new_a.text_sha1 = '123132'
132
self.assertChangeDescription('unchanged', old_a, new_a)
135
new_a.text_sha1 = 'abcabc'
136
self.assertChangeDescription('modified', old_a, new_a)
138
self.assertChangeDescription('added', None, new_a)
139
self.assertChangeDescription('removed', old_a, None)
140
# perhaps a bit questionable but seems like the most reasonable thing...
141
self.assertChangeDescription('unchanged', None, None)
143
# in this case it's both renamed and modified; show a rename and
145
new_a.name = 'newfilename'
146
self.assertChangeDescription('modified and renamed', old_a, new_a)
148
# reparenting is 'renaming'
149
new_a.name = old_a.name
150
new_a.parent_id = 'somedir-id'
151
self.assertChangeDescription('modified and renamed', old_a, new_a)
153
# reset the content values so its not modified
154
new_a.text_size = old_a.text_size
155
new_a.text_sha1 = old_a.text_sha1
156
new_a.name = old_a.name
158
new_a.name = 'newfilename'
159
self.assertChangeDescription('renamed', old_a, new_a)
161
# reparenting is 'renaming'
162
new_a.name = old_a.name
163
new_a.parent_id = 'somedir-id'
164
self.assertChangeDescription('renamed', old_a, new_a)
166
def assertChangeDescription(self, expected_change, old_ie, new_ie):
167
change = InventoryEntry.describe_change(old_ie, new_ie)
168
self.assertEqual(expected_change, change)
added
removed
bzrlib/tests/test_inv.py
