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

  • Committer: Jelmer Vernooij
  • Date: 2018-03-22 07:52:44 UTC
  • mto: This revision was merged to the branch mainline in revision 6896.
  • Revision ID: jelmer@jelmer.uk-20180322075244-0jmj2ygfmuifii3g
Add a Tree.find_related_paths_across_trees.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/builtins.py
953
953
        if revision is not None:
954
954
            tree = revision.as_tree(work_tree.branch)
955
955
 
956
 
            extra_trees = [tree, work_tree]
 
956
            extra_trees = [work_tree]
957
957
            self.add_cleanup(tree.lock_read().unlock)
958
958
        else:
959
959
            tree = work_tree
960
 
            extra_trees = [tree]
 
960
            extra_trees = []
961
961
 
962
962
        self.add_cleanup(tree.lock_read().unlock)
963
963
        if file_list is not None:
964
 
            paths = _mod_tree.find_related_paths_across_trees(
965
 
                    tree, file_list, lookup_trees, require_versioned=True)
 
964
            paths = tree.find_related_paths_across_trees(
 
965
                    file_list, extra_trees, require_versioned=True)
966
966
            # find_ids_across_trees may include some paths that don't
967
967
            # exist in 'tree'.
968
968
            entries = tree.iter_entries_by_dir(specific_files=paths)