Breezy

Merge lp://staging/~jelmer/brz/extract-paths2ids into lp://staging/brz

extract-paths2ids
Merge into trunk

Proposed by Jelmer Vernooij on 2018-03-22

Status:	Merged
Approved by:	Jelmer Vernooij on 2018-03-24
Approved revision:	no longer in the source branch.
Merge reported by:	The Breezy Bot
Merged at revision:	not available
Proposed branch:	lp://staging/~jelmer/brz/extract-paths2ids
Merge into:	lp://staging/brz
Prerequisite:	lp://staging/~jelmer/brz/find-previous-paths
Diff against target:	1340 lines (+329/-267) 20 files modified breezy/builtins.py (+13/-14) breezy/bzr/inventory.py (+2/-2) breezy/bzr/inventorytree.py (+138/-12) breezy/bzr/workingtree.py (+4/-7) breezy/filter_tree.py (+2/-2) breezy/merge.py (+15/-31) breezy/rename_map.py (+9/-1) breezy/tests/per_intertree/test_compare.py (+3/-1) breezy/tests/per_tree/test_inv.py (+10/-4) breezy/tests/per_tree/test_test_trees.py (+2/-8) breezy/tests/per_workingtree/test_inv.py (+1/-1) breezy/tests/per_workingtree/test_nested_specifics.py (+1/-1) breezy/tests/per_workingtree/test_paths2ids.py (+37/-0) breezy/tests/test_merge.py (+5/-9) breezy/tests/test_merge_core.py (+5/-5) breezy/tests/test_shelf.py (+2/-2) breezy/tests/test_transform.py (+5/-4) breezy/tests/test_workingtree.py (+2/-1) breezy/transform.py (+22/-22) breezy/tree.py (+51/-140)
To merge this branch:	bzr merge lp://staging/~jelmer/brz/extract-paths2ids
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Martin Packman		2018-03-22	Approve on 2018-03-24
Review via email: mp+341923@code.staging.launchpad.net

Commit message

Add a new Tree.find_related_paths_across_trees() method and pass files rather than file ids in various places.

Description of the change

Add a new Tree.find_related_paths_across_trees() method.

This finds a set of paths in a specific tree that are related to a set of specified paths in trees to look up in.

This allows further eliminating the use of file ids in public APIs:

* Tree.paths2ids can now be InventoryTree-specific.
* Merge now only takes a list of interesting files rather than a list of interesting file ids or interesting files.
* Tree.iter_entries_by_dir() now takes a list of specific_files