/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/test_bundle.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2019-09-21 16:35:59 UTC
  • mfrom: (7358.11.10 delta-no-file-ids)
  • Revision ID: breezy.the.bot@gmail.com-20190921163559-inw7zv0fg2j35h68
TreeDelta holds TreeChange objects rather than tuples of various sizes.

Merged from https://code.launchpad.net/~jelmer/brz/delta-no-file-ids/+merge/369480

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_bundle.py
511
511
        for ancestor in ancestors:
512
512
            old = self.b1.repository.revision_tree(ancestor)
513
513
            new = tree.branch.repository.revision_tree(ancestor)
514
 
            old.lock_read()
515
 
            new.lock_read()
516
 
            try:
 
514
            with old.lock_read(), new.lock_read():
517
515
                # Check that there aren't any inventory level changes
518
516
                delta = new.changes_from(old)
519
517
                self.assertFalse(delta.has_changed(),
528
526
                        continue
529
527
                    self.assertEqual(
530
528
                        old_file.read(), new.get_file(path).read())
531
 
            finally:
532
 
                new.unlock()
533
 
                old.unlock()
534
529
        if not _mod_revision.is_null(rev_id):
535
530
            tree.branch.generate_revision_history(rev_id)
536
531
            tree.update()