280
274
osutils.normalized_filename = orig_normalized_filename
283
class TestEntryDiffing(TestCaseWithTransport):
286
super(TestEntryDiffing, self).setUp()
287
self.wt = self.make_branch_and_tree('.')
288
self.branch = self.wt.branch
289
print >> open('file', 'wb'), 'foo'
290
print >> open('binfile', 'wb'), 'foo'
291
self.wt.add(['file'], ['fileid'])
292
self.wt.add(['binfile'], ['binfileid'])
294
os.symlink('target1', 'symlink')
295
self.wt.add(['symlink'], ['linkid'])
296
self.wt.commit('message_1', rev_id = '1')
297
print >> open('file', 'wb'), 'bar'
298
print >> open('binfile', 'wb'), 'x' * 1023 + '\x00'
301
os.symlink('target2', 'symlink')
302
self.tree_1 = self.branch.repository.revision_tree('1')
303
self.inv_1 = self.branch.repository.get_inventory('1')
304
self.file_1 = self.inv_1['fileid']
305
self.file_1b = self.inv_1['binfileid']
306
self.tree_2 = self.wt
307
self.inv_2 = self.tree_2.read_working_inventory()
308
self.file_2 = self.inv_2['fileid']
309
self.file_2b = self.inv_2['binfileid']
311
self.link_1 = self.inv_1['linkid']
312
self.link_2 = self.inv_2['linkid']
314
def test_file_diff_deleted(self):
316
self.file_1.diff(internal_diff,
317
"old_label", self.tree_1,
318
"/dev/null", None, None,
320
self.assertEqual(output.getvalue(), "--- old_label\n"
326
def test_file_diff_added(self):
328
self.file_1.diff(internal_diff,
329
"new_label", self.tree_1,
330
"/dev/null", None, None,
331
output, reverse=True)
332
self.assertEqual(output.getvalue(), "--- /dev/null\n"
338
def test_file_diff_changed(self):
340
self.file_1.diff(internal_diff,
341
"/dev/null", self.tree_1,
342
"new_label", self.file_2, self.tree_2,
344
self.assertEqual(output.getvalue(), "--- /dev/null\n"
351
def test_file_diff_binary(self):
353
self.file_1.diff(internal_diff,
354
"/dev/null", self.tree_1,
355
"new_label", self.file_2b, self.tree_2,
357
self.assertEqual(output.getvalue(),
358
"Binary files /dev/null and new_label differ\n")
359
def test_link_diff_deleted(self):
360
if not has_symlinks():
363
self.link_1.diff(internal_diff,
364
"old_label", self.tree_1,
365
"/dev/null", None, None,
367
self.assertEqual(output.getvalue(),
368
"=== target was 'target1'\n")
370
def test_link_diff_added(self):
371
if not has_symlinks():
374
self.link_1.diff(internal_diff,
375
"new_label", self.tree_1,
376
"/dev/null", None, None,
377
output, reverse=True)
378
self.assertEqual(output.getvalue(),
379
"=== target is 'target1'\n")
381
def test_link_diff_changed(self):
382
if not has_symlinks():
385
self.link_1.diff(internal_diff,
386
"/dev/null", self.tree_1,
387
"new_label", self.link_2, self.tree_2,
389
self.assertEqual(output.getvalue(),
390
"=== target changed 'target1' => 'target2'\n")
393
class TestSnapshot(TestCaseWithTransport):
396
# for full testing we'll need a branch
397
# with a subdir to test parent changes.
398
# and a file, link and dir under that.
399
# but right now I only need one attribute
400
# to change, and then test merge patterns
401
# with fake parent entries.
402
super(TestSnapshot, self).setUp()
403
self.wt = self.make_branch_and_tree('.')
404
self.branch = self.wt.branch
405
self.build_tree(['subdir/', 'subdir/file'], line_endings='binary')
406
self.wt.add(['subdir', 'subdir/file'],
410
self.wt.commit('message_1', rev_id = '1')
411
self.tree_1 = self.branch.repository.revision_tree('1')
412
self.inv_1 = self.branch.repository.get_inventory('1')
413
self.file_1 = self.inv_1['fileid']
415
self.addCleanup(self.wt.unlock)
416
self.file_active = self.wt.inventory['fileid']
417
self.builder = self.branch.get_commit_builder([], timestamp=time.time(), revision_id='2')
419
def test_snapshot_new_revision(self):
420
# This tests that a simple commit with no parents makes a new
421
# revision value in the inventory entry
422
self.file_active.snapshot('2', 'subdir/file', {}, self.wt, self.builder)
423
# expected outcome - file_1 has a revision id of '2', and we can get
424
# its text of 'file contents' out of the weave.
425
self.assertEqual(self.file_1.revision, '1')
426
self.assertEqual(self.file_active.revision, '2')
427
# this should be a separate test probably, but lets check it once..
428
lines = self.branch.repository.weave_store.get_weave(
430
self.branch.get_transaction()).get_lines('2')
431
self.assertEqual(lines, ['contents of subdir/file\n'])
433
def test_snapshot_unchanged(self):
434
#This tests that a simple commit does not make a new entry for
435
# an unchanged inventory entry
436
self.file_active.snapshot('2', 'subdir/file', {'1':self.file_1},
437
self.wt, self.builder)
438
self.assertEqual(self.file_1.revision, '1')
439
self.assertEqual(self.file_active.revision, '1')
440
vf = self.branch.repository.weave_store.get_weave(
442
self.branch.repository.get_transaction())
443
self.assertRaises(errors.RevisionNotPresent,
447
def test_snapshot_merge_identical_different_revid(self):
448
# This tests that a commit with two identical parents, one of which has
449
# a different revision id, results in a new revision id in the entry.
450
# 1->other, commit a merge of other against 1, results in 2.
451
other_ie = inventory.InventoryFile('fileid', 'newname', self.file_1.parent_id)
452
other_ie = inventory.InventoryFile('fileid', 'file', self.file_1.parent_id)
453
other_ie.revision = '1'
454
other_ie.text_sha1 = self.file_1.text_sha1
455
other_ie.text_size = self.file_1.text_size
456
self.assertEqual(self.file_1, other_ie)
457
other_ie.revision = 'other'
458
self.assertNotEqual(self.file_1, other_ie)
459
versionfile = self.branch.repository.weave_store.get_weave(
460
'fileid', self.branch.repository.get_transaction())
461
versionfile.clone_text('other', '1', ['1'])
462
self.file_active.snapshot('2', 'subdir/file',
463
{'1':self.file_1, 'other':other_ie},
464
self.wt, self.builder)
465
self.assertEqual(self.file_active.revision, '2')
467
def test_snapshot_changed(self):
468
# This tests that a commit with one different parent results in a new
469
# revision id in the entry.
470
self.wt.rename_one('subdir/file', 'subdir/newname')
471
self.file_active = self.wt.inventory['fileid']
472
self.file_active.snapshot('2', 'subdir/newname', {'1':self.file_1},
473
self.wt, self.builder)
474
# expected outcome - file_1 has a revision id of '2'
475
self.assertEqual(self.file_active.revision, '2')
478
class TestPreviousHeads(TestCaseWithTransport):
481
# we want several inventories, that respectively
482
# give use the following scenarios:
483
# A) fileid not in any inventory (A),
484
# B) fileid present in one inventory (B) and (A,B)
485
# C) fileid present in two inventories, and they
486
# are not mutual descendents (B, C)
487
# D) fileid present in two inventories and one is
488
# a descendent of the other. (B, D)
489
super(TestPreviousHeads, self).setUp()
490
self.wt = self.make_branch_and_tree('.')
491
self.branch = self.wt.branch
492
self.build_tree(['file'])
493
self.wt.commit('new branch', allow_pointless=True, rev_id='A')
494
self.inv_A = self.branch.repository.get_inventory('A')
495
self.wt.add(['file'], ['fileid'])
496
self.wt.commit('add file', rev_id='B')
497
self.inv_B = self.branch.repository.get_inventory('B')
498
uncommit(self.branch, tree=self.wt)
499
self.assertEqual(self.branch.revision_history(), ['A'])
500
self.wt.commit('another add of file', rev_id='C')
501
self.inv_C = self.branch.repository.get_inventory('C')
502
self.wt.add_parent_tree_id('B')
503
self.wt.commit('merge in B', rev_id='D')
504
self.inv_D = self.branch.repository.get_inventory('D')
505
self.file_active = self.wt.inventory['fileid']
506
self.weave = self.branch.repository.weave_store.get_weave('fileid',
507
self.branch.repository.get_transaction())
509
def get_previous_heads(self, inventories):
510
return self.file_active.find_previous_heads(
512
self.branch.repository.weave_store,
513
self.branch.repository.get_transaction())
515
def test_fileid_in_no_inventory(self):
516
self.assertEqual({}, self.get_previous_heads([self.inv_A]))
518
def test_fileid_in_one_inventory(self):
519
self.assertEqual({'B':self.inv_B['fileid']},
520
self.get_previous_heads([self.inv_B]))
521
self.assertEqual({'B':self.inv_B['fileid']},
522
self.get_previous_heads([self.inv_A, self.inv_B]))
523
self.assertEqual({'B':self.inv_B['fileid']},
524
self.get_previous_heads([self.inv_B, self.inv_A]))
526
def test_fileid_in_two_inventories_gives_both_entries(self):
527
self.assertEqual({'B':self.inv_B['fileid'],
528
'C':self.inv_C['fileid']},
529
self.get_previous_heads([self.inv_B, self.inv_C]))
530
self.assertEqual({'B':self.inv_B['fileid'],
531
'C':self.inv_C['fileid']},
532
self.get_previous_heads([self.inv_C, self.inv_B]))
534
def test_fileid_in_two_inventories_already_merged_gives_head(self):
535
self.assertEqual({'D':self.inv_D['fileid']},
536
self.get_previous_heads([self.inv_B, self.inv_D]))
537
self.assertEqual({'D':self.inv_D['fileid']},
538
self.get_previous_heads([self.inv_D, self.inv_B]))
540
# TODO: test two inventories with the same file revision
543
277
class TestDescribeChanges(TestCase):
545
279
def test_describe_change(self):
added
removed
bzrlib/tests/test_inv.py
