131
86
link = inventory.InventoryLink('123', 'hello.c', ROOT_ID)
132
87
self.failIf(link.has_text())
135
class TestEntryDiffing(TestCaseWithTransport):
138
super(TestEntryDiffing, self).setUp()
139
self.wt = self.make_branch_and_tree('.')
140
self.branch = self.wt.branch
141
print >> open('file', 'wb'), 'foo'
142
self.wt.add(['file'], ['fileid'])
144
os.symlink('target1', 'symlink')
145
self.wt.add(['symlink'], ['linkid'])
146
self.wt.commit('message_1', rev_id = '1')
147
print >> open('file', 'wb'), 'bar'
150
os.symlink('target2', 'symlink')
151
self.tree_1 = self.branch.repository.revision_tree('1')
152
self.inv_1 = self.branch.repository.get_inventory('1')
153
self.file_1 = self.inv_1['fileid']
154
self.tree_2 = self.wt
155
self.inv_2 = self.tree_2.read_working_inventory()
156
self.file_2 = self.inv_2['fileid']
158
self.link_1 = self.inv_1['linkid']
159
self.link_2 = self.inv_2['linkid']
161
def test_file_diff_deleted(self):
163
self.file_1.diff(internal_diff,
164
"old_label", self.tree_1,
165
"/dev/null", None, None,
167
self.assertEqual(output.getvalue(), "--- old_label\t\n"
173
def test_file_diff_added(self):
175
self.file_1.diff(internal_diff,
176
"new_label", self.tree_1,
177
"/dev/null", None, None,
178
output, reverse=True)
179
self.assertEqual(output.getvalue(), "--- /dev/null\t\n"
185
def test_file_diff_changed(self):
187
self.file_1.diff(internal_diff,
188
"/dev/null", self.tree_1,
189
"new_label", self.file_2, self.tree_2,
191
self.assertEqual(output.getvalue(), "--- /dev/null\t\n"
198
def test_link_diff_deleted(self):
199
if not has_symlinks():
202
self.link_1.diff(internal_diff,
203
"old_label", self.tree_1,
204
"/dev/null", None, None,
206
self.assertEqual(output.getvalue(),
207
"=== target was 'target1'\n")
209
def test_link_diff_added(self):
210
if not has_symlinks():
213
self.link_1.diff(internal_diff,
214
"new_label", self.tree_1,
215
"/dev/null", None, None,
216
output, reverse=True)
217
self.assertEqual(output.getvalue(),
218
"=== target is 'target1'\n")
220
def test_link_diff_changed(self):
221
if not has_symlinks():
224
self.link_1.diff(internal_diff,
225
"/dev/null", self.tree_1,
226
"new_label", self.link_2, self.tree_2,
228
self.assertEqual(output.getvalue(),
229
"=== target changed 'target1' => 'target2'\n")
232
class TestSnapshot(TestCaseWithTransport):
235
# for full testing we'll need a branch
236
# with a subdir to test parent changes.
237
# and a file, link and dir under that.
238
# but right now I only need one attribute
239
# to change, and then test merge patterns
240
# with fake parent entries.
241
super(TestSnapshot, self).setUp()
242
self.wt = self.make_branch_and_tree('.')
243
self.branch = self.wt.branch
244
self.build_tree(['subdir/', 'subdir/file'], line_endings='binary')
245
self.wt.add(['subdir', 'subdir/file'],
249
self.wt.commit('message_1', rev_id = '1')
250
self.tree_1 = self.branch.repository.revision_tree('1')
251
self.inv_1 = self.branch.repository.get_inventory('1')
252
self.file_1 = self.inv_1['fileid']
253
self.file_active = self.wt.inventory['fileid']
255
def test_snapshot_new_revision(self):
256
# This tests that a simple commit with no parents makes a new
257
# revision value in the inventory entry
258
self.file_active.snapshot('2', 'subdir/file', {}, self.wt,
259
self.branch.repository.weave_store,
260
self.branch.get_transaction())
261
# expected outcome - file_1 has a revision id of '2', and we can get
262
# its text of 'file contents' out of the weave.
263
self.assertEqual(self.file_1.revision, '1')
264
self.assertEqual(self.file_active.revision, '2')
265
# this should be a separate test probably, but lets check it once..
266
lines = self.branch.repository.weave_store.get_lines('fileid','2',
267
self.branch.get_transaction())
268
self.assertEqual(lines, ['contents of subdir/file\n'])
270
def test_snapshot_unchanged(self):
271
#This tests that a simple commit does not make a new entry for
272
# an unchanged inventory entry
273
self.file_active.snapshot('2', 'subdir/file', {'1':self.file_1},
275
self.branch.repository.weave_store,
276
self.branch.get_transaction())
277
self.assertEqual(self.file_1.revision, '1')
278
self.assertEqual(self.file_active.revision, '1')
279
self.assertRaises(errors.WeaveError,
280
self.branch.repository.weave_store.get_lines,
281
'fileid', '2', self.branch.get_transaction())
283
def test_snapshot_merge_identical_different_revid(self):
284
# This tests that a commit with two identical parents, one of which has
285
# a different revision id, results in a new revision id in the entry.
286
# 1->other, commit a merge of other against 1, results in 2.
287
other_ie = inventory.InventoryFile('fileid', 'newname', self.file_1.parent_id)
288
other_ie = inventory.InventoryFile('fileid', 'file', self.file_1.parent_id)
289
other_ie.revision = '1'
290
other_ie.text_sha1 = self.file_1.text_sha1
291
other_ie.text_size = self.file_1.text_size
292
self.assertEqual(self.file_1, other_ie)
293
other_ie.revision = 'other'
294
self.assertNotEqual(self.file_1, other_ie)
295
self.branch.repository.weave_store.add_identical_text('fileid', '1',
296
'other', ['1'], self.branch.get_transaction())
297
self.file_active.snapshot('2', 'subdir/file',
298
{'1':self.file_1, 'other':other_ie},
300
self.branch.repository.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.repository.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(TestCaseWithTransport):
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.wt = self.make_branch_and_tree('.')
330
self.branch = self.wt.branch
331
self.build_tree(['file'])
332
self.wt.commit('new branch', allow_pointless=True, rev_id='A')
333
self.inv_A = self.branch.repository.get_inventory('A')
334
self.wt.add(['file'], ['fileid'])
335
self.wt.commit('add file', rev_id='B')
336
self.inv_B = self.branch.repository.get_inventory('B')
337
self.branch.lock_write()
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
339
self.branch.control_files.put_utf8('revision-history', 'A\n')
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)
342
self.assertEqual(self.branch.revision_history(), ['A'])
343
self.wt.commit('another add of file', rev_id='C')
344
self.inv_C = self.branch.repository.get_inventory('C')
345
self.wt.add_pending_merge('B')
346
self.wt.commit('merge in B', rev_id='D')
347
self.inv_D = self.branch.repository.get_inventory('D')
348
self.file_active = self.wt.inventory['fileid']
349
self.weave = self.branch.repository.weave_store.get_weave('fileid',
350
self.branch.get_transaction())
352
def get_previous_heads(self, inventories):
353
return self.file_active.find_previous_heads(inventories, self.weave)
355
def test_fileid_in_no_inventory(self):
356
self.assertEqual({}, self.get_previous_heads([self.inv_A]))
358
def test_fileid_in_one_inventory(self):
359
self.assertEqual({'B':self.inv_B['fileid']},
360
self.get_previous_heads([self.inv_B]))
361
self.assertEqual({'B':self.inv_B['fileid']},
362
self.get_previous_heads([self.inv_A, self.inv_B]))
363
self.assertEqual({'B':self.inv_B['fileid']},
364
self.get_previous_heads([self.inv_B, self.inv_A]))
366
def test_fileid_in_two_inventories_gives_both_entries(self):
367
self.assertEqual({'B':self.inv_B['fileid'],
368
'C':self.inv_C['fileid']},
369
self.get_previous_heads([self.inv_B, self.inv_C]))
370
self.assertEqual({'B':self.inv_B['fileid'],
371
'C':self.inv_C['fileid']},
372
self.get_previous_heads([self.inv_C, self.inv_B]))
374
def test_fileid_in_two_inventories_already_merged_gives_head(self):
375
self.assertEqual({'D':self.inv_D['fileid']},
376
self.get_previous_heads([self.inv_B, self.inv_D]))
377
self.assertEqual({'D':self.inv_D['fileid']},
378
self.get_previous_heads([self.inv_D, self.inv_B]))
380
# TODO: test two inventories with the same file revision
383
class TestExecutable(TestCaseWithTransport):
385
def test_stays_executable(self):
386
basic_inv = """<inventory format="5">
387
<file file_id="a-20051208024829-849e76f7968d7a86" name="a" executable="yes" />
388
<file file_id="b-20051208024829-849e76f7968d7a86" name="b" />
391
wt = self.make_branch_and_tree('b1')
393
open('b1/a', 'wb').write('a test\n')
394
open('b1/b', 'wb').write('b test\n')
395
os.chmod('b1/a', 0755)
396
os.chmod('b1/b', 0644)
397
# Manually writing the inventory, to ensure that
398
# the executable="yes" entry is set for 'a' and not for 'b'
399
open('b1/.bzr/inventory', 'wb').write(basic_inv)
401
a_id = "a-20051208024829-849e76f7968d7a86"
402
b_id = "b-20051208024829-849e76f7968d7a86"
403
wt = wt.bzrdir.open_workingtree()
404
self.assertEqual(['a', 'b'], [cn for cn,ie in wt.inventory.iter_entries()])
406
self.failUnless(wt.is_executable(a_id), "'a' lost the execute bit")
407
self.failIf(wt.is_executable(b_id), "'b' gained an execute bit")
409
wt.commit('adding a,b', rev_id='r1')
411
rev_tree = b.repository.revision_tree('r1')
412
self.failUnless(rev_tree.is_executable(a_id), "'a' lost the execute bit")
413
self.failIf(rev_tree.is_executable(b_id), "'b' gained an execute bit")
415
self.failUnless(rev_tree.inventory[a_id].executable)
416
self.failIf(rev_tree.inventory[b_id].executable)
418
# Make sure the entries are gone
421
self.failIf(wt.has_id(a_id))
422
self.failIf(wt.has_filename('a'))
423
self.failIf(wt.has_id(b_id))
424
self.failIf(wt.has_filename('b'))
426
# Make sure that revert is able to bring them back,
427
# and sets 'a' back to being executable
429
wt.revert(['a', 'b'], rev_tree, backups=False)
430
self.assertEqual(['a', 'b'], [cn for cn,ie in wt.inventory.iter_entries()])
432
self.failUnless(wt.is_executable(a_id), "'a' lost the execute bit")
433
self.failIf(wt.is_executable(b_id), "'b' gained an execute bit")
435
# Now remove them again, and make sure that after a
436
# commit, they are still marked correctly
439
wt.commit('removed', rev_id='r2')
441
self.assertEqual([], [cn for cn,ie in wt.inventory.iter_entries()])
442
self.failIf(wt.has_id(a_id))
443
self.failIf(wt.has_filename('a'))
444
self.failIf(wt.has_id(b_id))
445
self.failIf(wt.has_filename('b'))
447
# Now revert back to the previous commit
448
wt.revert([], rev_tree, backups=False)
449
self.assertEqual(['a', 'b'], [cn for cn,ie in wt.inventory.iter_entries()])
451
self.failUnless(wt.is_executable(a_id), "'a' lost the execute bit")
452
self.failIf(wt.is_executable(b_id), "'b' gained an execute bit")
454
# Now make sure that 'bzr branch' also preserves the
456
# TODO: Maybe this should be a blackbox test
457
d2 = b.bzrdir.clone('b2', revision_id='r1')
458
t2 = d2.open_workingtree()
460
self.assertEquals('r1', b2.last_revision())
462
self.assertEqual(['a', 'b'], [cn for cn,ie in t2.inventory.iter_entries()])
463
self.failUnless(t2.is_executable(a_id), "'a' lost the execute bit")
464
self.failIf(t2.is_executable(b_id), "'b' gained an execute bit")
466
# Make sure pull will delete the files
468
self.assertEquals('r2', b2.last_revision())
469
self.assertEqual([], [cn for cn,ie in t2.inventory.iter_entries()])
471
# Now commit the changes on the first branch
472
# so that the second branch can pull the changes
473
# and make sure that the executable bit has been copied
474
wt.commit('resurrected', rev_id='r3')
477
self.assertEquals('r3', b2.last_revision())
478
self.assertEqual(['a', 'b'], [cn for cn,ie in t2.inventory.iter_entries()])
480
self.failUnless(t2.is_executable(a_id), "'a' lost the execute bit")
481
self.failIf(t2.is_executable(b_id), "'b' gained an execute bit")
483
class TestRevert(TestCaseWithTransport):
484
def test_dangling_id(self):
485
wt = self.make_branch_and_tree('b1')
486
self.assertEqual(len(wt.inventory), 1)
487
open('b1/a', 'wb').write('a test\n')
489
self.assertEqual(len(wt.inventory), 2)
492
self.assertEqual(len(wt.inventory), 1)
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
