Merge lp:~jelmer/brz/id2path-recurse into lp:brz

[Jelmer Vernooij]

Support recurse argument to id2path.

Support recurse argument to id2path.

[Jelmer Vernooij (jelmer)]

review: Approve

=== modified file 'breezy/bzr/bundle/bundle_data.py'
--- breezy/bzr/bundle/bundle_data.py	2019-11-22 04:59:15 +0000
+++ breezy/bzr/bundle/bundle_data.py	2020-01-19 14:53:39 +0000
@@ -47,7 +47,10 @@
     )
 from ..testament import StrictTestament
 from ...trace import mutter, warning
-from ...tree import Tree
+from ...tree import (
+    Tree,
+    find_previous_path,
+    )
 from ..xml5 import serializer_v5
 
 
@@ -595,12 +598,12 @@
             return None
         return self.base_tree.path2id(old_path)
 
-    def id2path(self, file_id):
+    def id2path(self, file_id, recurse='down'):
         """Return the new path in the target tree of the file with id file_id"""
         path = self._new_id_r.get(file_id)
         if path is not None:
             return path
-        old_path = self.base_tree.id2path(file_id)
+        old_path = self.base_tree.id2path(file_id, recurse)
         if old_path is None:
             raise NoSuchId(file_id, self)
         if old_path in self.deleted:
@@ -618,10 +621,8 @@
                 in the text-store, so that the file contents would
                 then be cached.
         """
-        file_id = self.path2id(path)
-        try:
-            old_path = self.base_tree.id2path(file_id)
-        except NoSuchId:
+        old_path = find_previous_path(self, self.base_tree, path)
+        if old_path is None:
             patch_original = None
         else:
             patch_original = self.base_tree.get_file(old_path)
@@ -771,7 +772,7 @@
             paths.append(result)
         for id in self.base_tree.all_file_ids():
             try:
-                path = self.id2path(id)
+                path = self.id2path(id, recurse='none')
             except NoSuchId:
                 continue
             paths.append((path, id))

=== modified file 'breezy/bzr/fetch.py'
--- breezy/bzr/fetch.py	2019-06-29 13:16:26 +0000
+++ breezy/bzr/fetch.py	2020-01-19 14:53:39 +0000
@@ -319,7 +319,8 @@
             else:
                 try:
                     parent_ids.append(
-                        tree.get_file_revision(tree.id2path(root_id)))
+                        tree.get_file_revision(
+                            tree.id2path(root_id, recurse='none')))
                 except errors.NoSuchId:
                     # not in the tree
                     pass

=== modified file 'breezy/bzr/inventorytree.py'
--- breezy/bzr/inventorytree.py	2020-01-19 03:22:04 +0000
+++ breezy/bzr/inventorytree.py	2020-01-19 14:53:39 +0000
@@ -187,7 +187,7 @@
             return None, None
         return inv, ie.file_id
 
-    def id2path(self, file_id):
+    def id2path(self, file_id, recurse='down'):
         """Return the path for a file id.
 
         :raises NoSuchId:
@@ -196,20 +196,17 @@
         try:
             return inventory.id2path(file_id)
         except errors.NoSuchId:
-            if 'evil' in debug.debug_flags:
-                trace.mutter_callsite(
-                    2, "id2path with nested trees scales with tree size.")
-            for path in self.iter_references():
-                try:
+            if recurse == 'down':
+                if 'evil' in debug.debug_flags:
+                    trace.mutter_callsite(
+                        2, "id2path with nested trees scales with tree size.")
+                for path in self.iter_references():
                     subtree = self.get_nested_tree(path)
-                except errors.NotBranchError:
-                    continue
-                try:
-                    return osutils.pathjoin(path, subtree.id2path(file_id))
-                except errors.NoSuchId:
-                    pass
-            else:
-                raise errors.NoSuchId(self, file_id)
+                    try:
+                        return osutils.pathjoin(path, subtree.id2path(file_id))
+                    except errors.NoSuchId:
+                        pass
+            raise errors.NoSuchId(self, file_id)
 
     def all_file_ids(self):
         return {entry.file_id for path, entry in self.iter_entries_by_dir()}

=== modified file 'breezy/bzr/workingtree_4.py'
--- breezy/bzr/workingtree_4.py	2020-01-18 00:05:13 +0000
+++ breezy/bzr/workingtree_4.py	2020-01-19 14:53:39 +0000
@@ -474,22 +474,23 @@
     def get_nested_tree(self, path):
         return WorkingTree.open(self.abspath(path))
 
-    def id2path(self, file_id):
+    def id2path(self, file_id, recurse='down'):
         "Convert a file-id to a path."
         with self.lock_read():
             state = self.current_dirstate()
             entry = self._get_entry(file_id=file_id)
             if entry == (None, None):
-                if 'evil' in debug.debug_flags:
-                    trace.mutter_callsite(
-                        2, "Tree.id2path scans all nested trees.")
-                for nested_path in self.iter_references():
-                    nested_tree = self.get_nested_tree(nested_path)
-                    try:
-                        return osutils.pathjoin(
-                            nested_path, nested_tree.id2path(file_id))
-                    except errors.NoSuchId:
-                        pass
+                if recurse == 'down':
+                    if 'evil' in debug.debug_flags:
+                        trace.mutter_callsite(
+                            2, "Tree.id2path scans all nested trees.")
+                    for nested_path in self.iter_references():
+                        nested_tree = self.get_nested_tree(nested_path)
+                        try:
+                            return osutils.pathjoin(
+                                nested_path, nested_tree.id2path(file_id))
+                        except errors.NoSuchId:
+                            pass
                 raise errors.NoSuchId(tree=self, file_id=file_id)
             path_utf8 = osutils.pathjoin(entry[0][0], entry[0][1])
             return path_utf8.decode('utf8')
@@ -1754,17 +1755,22 @@
         pred = self.has_filename
         return set((p for p in paths if not pred(p)))
 
-    def id2path(self, file_id):
+    def id2path(self, file_id, recurse='down'):
         "Convert a file-id to a path."
         with self.lock_read():
             entry = self._get_entry(file_id=file_id)
             if entry == (None, None):
-                for nested_path in self.iter_references():
-                    nested_tree = self.get_nested_tree(nested_path)
-                    try:
-                        return osutils.pathjoin(nested_path, nested_tree.id2path(file_id))
-                    except errors.NoSuchId:
-                        pass
+                if recurse == 'down':
+                    if 'evil' in debug.debug_flags:
+                        trace.mutter_callsite(
+                            2, "Tree.id2path scans all nested trees.")
+
+                    for nested_path in self.iter_references():
+                        nested_tree = self.get_nested_tree(nested_path)
+                        try:
+                            return osutils.pathjoin(nested_path, nested_tree.id2path(file_id))
+                        except errors.NoSuchId:
+                            pass
                 raise errors.NoSuchId(tree=self, file_id=file_id)
             path_utf8 = osutils.pathjoin(entry[0][0], entry[0][1])
             return path_utf8.decode('utf8')

=== modified file 'breezy/git/tree.py'
--- breezy/git/tree.py	2020-01-11 04:11:04 +0000
+++ breezy/git/tree.py	2020-01-19 14:53:39 +0000
@@ -342,7 +342,7 @@
             raise _mod_tree.FileTimestampUnavailable(path)
         return rev.timestamp
 
-    def id2path(self, file_id):
+    def id2path(self, file_id, recurse='down'):
         try:
             path = self.mapping.parse_file_id(file_id)
         except ValueError:
@@ -1072,7 +1072,7 @@
                     osutils.safe_unicode(path))
             return None
 
-    def id2path(self, file_id):
+    def id2path(self, file_id, recurse='down'):
         if file_id is None:
             return ''
         if type(file_id) is not bytes:

=== modified file 'breezy/plugins/fastimport/revision_store.py'
--- breezy/plugins/fastimport/revision_store.py	2019-09-22 13:03:16 +0000
+++ breezy/plugins/fastimport/revision_store.py	2020-01-19 14:53:39 +0000
@@ -47,7 +47,7 @@
         self._new_info_by_path = {new_path: ie
                                   for _, new_path, file_id, ie in inv_delta}
 
-    def id2path(self, file_id):
+    def id2path(self, file_id, recurse='down'):
         if file_id in self._new_info_by_id:
             new_path = self._new_info_by_id[file_id][0]
             if new_path is None:

=== modified file 'breezy/plugins/rewrite/maptree.py'
--- breezy/plugins/rewrite/maptree.py	2019-10-27 15:13:53 +0000
+++ breezy/plugins/rewrite/maptree.py	2020-01-19 14:53:39 +0000
@@ -120,5 +120,5 @@
             return None
         return self.new_id(file_id)
 
-    def id2path(self, file_id):
-        return self.oldtree.id2path(self.old_id(file_id=file_id))
+    def id2path(self, file_id, recurse='down'):
+        return self.oldtree.id2path(self.old_id(file_id=file_id), recurse=recurse)

=== modified file 'breezy/tests/per_tree/test_ids.py'
--- breezy/tests/per_tree/test_ids.py	2019-10-15 19:05:47 +0000
+++ breezy/tests/per_tree/test_ids.py	2020-01-19 14:53:39 +0000
@@ -78,6 +78,8 @@
         self.assertIsNot(None, tree.path2id('subtree/a'))
         self.assertEqual('subtree', tree.id2path(tree.path2id('subtree')))
         self.assertEqual('subtree/a', tree.id2path(tree.path2id('subtree/a')))
+        self.assertIsNot('subtree/a', tree.id2path(tree.path2id('subtree/a'), recurse='down'))
+        self.assertRaises(errors.NoSuchId, tree.id2path, tree.path2id('subtree/a'), recurse='none')
 
 
 class Path2IdsTests(TestCaseWithTree):

=== modified file 'breezy/tests/test_bundle.py'
--- breezy/tests/test_bundle.py	2019-09-27 02:48:17 +0000
+++ breezy/tests/test_bundle.py	2020-01-19 14:53:39 +0000
@@ -147,7 +147,7 @@
     def path2id(self, path):
         return self.ids.get(path)
 
-    def id2path(self, file_id):
+    def id2path(self, file_id, recurse='down'):
         try:
             return self.paths[file_id]
         except KeyError:

=== modified file 'breezy/transform.py'
--- breezy/transform.py	2020-01-18 00:03:58 +0000
+++ breezy/transform.py	2020-01-19 14:53:39 +0000
@@ -2155,7 +2155,7 @@
             path = osutils.pathjoin(*path)
         return self._transform.final_file_id(self._path2trans_id(path))
 
-    def id2path(self, file_id):
+    def id2path(self, file_id, recurse='down'):
         trans_id = self._transform.trans_id_file_id(file_id)
         try:
             return self._final_paths._determine_path(trans_id)

=== modified file 'breezy/tree.py'
--- breezy/tree.py	2020-01-18 22:02:05 +0000
+++ breezy/tree.py	2020-01-19 14:53:39 +0000
@@ -310,7 +310,7 @@
         """Iterate through all paths, including paths for missing files."""
         raise NotImplementedError(self.all_versioned_paths)
 
-    def id2path(self, file_id):
+    def id2path(self, file_id, recurse='down'):
         """Return the path for a file id.
 
         :raises NoSuchId:

=== modified file 'doc/en/release-notes/brz-3.1.txt'
--- doc/en/release-notes/brz-3.1.txt	2020-01-12 23:41:10 +0000
+++ doc/en/release-notes/brz-3.1.txt	2020-01-19 14:53:39 +0000
@@ -161,6 +161,10 @@
   stripping segment parameters from a URL.
   (Jelmer Vernooij)
 
+* ``Tree.id2path`` has a new optional argument ``recurse``,
+  that determines whether it scans through nested trees.
+  (Jelmer Vernooij)
+
 
 Internals
 *********