/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/per_repository/test_commit_builder.py

  • Committer: Jelmer Vernooij
  • Date: 2020-06-19 21:26:53 UTC
  • mfrom: (7490.40.19 work)
  • mto: This revision was merged to the branch mainline in revision 7516.
  • Revision ID: jelmer@jelmer.uk-20200619212653-7j6rgywzczhc8cmj
Merge lp:brz/3.1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_repository/test_commit_builder.py
498
498
                builder.abort()
499
499
                raise
500
500
            delta = builder.get_basis_delta()
501
 
            delta_dict = dict((change[2], change) for change in delta)
 
501
            delta_dict = dict((change[1], change) for change in delta)
502
502
            if tree.branch.repository._format.records_per_file_revision:
503
 
                version_recorded = (file_id in delta_dict
504
 
                                    and delta_dict[file_id][3] is not None
505
 
                                    and delta_dict[file_id][3].revision == rev2)
 
503
                version_recorded = (new_name in delta_dict
 
504
                                    and delta_dict[new_name][3] is not None
 
505
                                    and delta_dict[new_name][3].revision == rev2)
506
506
                if records_version:
507
507
                    self.assertTrue(version_recorded)
508
508
                else:
513
513
                specific_files=[new_name]))[1]
514
514
 
515
515
            if delta_against_basis:
516
 
                if tree.supports_rename_tracking() or name == new_name:
517
 
                    expected_delta = (name, new_name, file_id, new_entry)
 
516
                (delta_old_name, delta_new_name,
 
517
                 delta_file_id, delta_entry) = delta_dict[new_name]
 
518
                self.assertEqual(delta_new_name, new_name)
 
519
                if tree.supports_rename_tracking():
 
520
                    self.assertEqual(name, delta_old_name)
518
521
                else:
519
 
                    expected_delta = (None, new_name, file_id, new_entry)
520
 
                self.assertEqual(expected_delta, delta_dict[file_id])
 
522
                    self.assertIn(delta_old_name, (name, None))
 
523
                if tree.supports_setting_file_ids():
 
524
                    self.assertEqual(delta_file_id, file_id)
 
525
                    self.assertEqual(delta_entry.file_id, file_id)
 
526
                self.assertEqual(delta_entry.kind, new_entry.kind)
 
527
                self.assertEqual(delta_entry.name, new_entry.name)
 
528
                self.assertEqual(delta_entry.parent_id, new_entry.parent_id)
 
529
                if delta_entry.kind == 'file':
 
530
                    self.assertEqual(delta_entry.text_size, new_entry.text_size)
 
531
                    self.assertEqual(delta_entry.text_sha1, new_entry.text_sha1)
 
532
                elif delta_entry.kind == 'symlink':
 
533
                    self.assertEqual(delta_entry.symlink_target, new_entry.symlink_target)
521
534
            else:
522
535
                expected_delta = None
523
536
                if tree.branch.repository._format.records_per_file_revision: