/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_intertree/test_compare.py

  • Committer: Jelmer Vernooij
  • Date: 2018-03-24 17:48:04 UTC
  • mfrom: (6921 work)
  • mto: This revision was merged to the branch mainline in revision 6923.
  • Revision ID: jelmer@jelmer.uk-20180324174804-xf22o05byoj12x1q
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_intertree/test_compare.py
557
557
 
558
558
    @staticmethod
559
559
    def get_path_entry(tree, file_id):
560
 
        iterator = tree.iter_entries_by_dir(specific_file_ids=[file_id])
 
560
        with tree.lock_read():
 
561
            path = tree.id2path(file_id)
 
562
        iterator = tree.iter_entries_by_dir(specific_files=[path])
561
563
        try:
562
564
            return next(iterator)
563
565
        except StopIteration: