Merge lp:~jelmer/brz/fastimport-no-id2path into lp:brz

[Jelmer Vernooij]

Avoid use of id2path in the fastimport plugin.

Avoid use of id2path in the fastimport plugin.

[Martin Packman (gz)]

Thanks!

review: Approve

=== modified file 'breezy/plugins/fastimport/bzr_commit_handler.py'
--- breezy/plugins/fastimport/bzr_commit_handler.py	2019-02-14 19:34:17 +0000
+++ breezy/plugins/fastimport/bzr_commit_handler.py	2019-09-22 13:13:44 +0000
@@ -505,8 +505,8 @@
             if newly_changed:
                 content = self.data_for_commit[file_id]
             else:
-                content = self.rev_store.get_file_text(
-                    self.parents[0], file_id)
+                revtree = self.rev_store.repo.revision_tree(self.parents[0])
+                content = revtree.get_file_text(src_path)
             self._modify_item(dest_path, kind, ie.executable, content, inv)
         elif kind == 'symlink':
             self._modify_item(dest_path, kind, False,
@@ -540,7 +540,7 @@
         # The revision-id for this entry will be/has been updated and
         # that means the loader then needs to know what the "new" text is.
         # We therefore must go back to the revision store to get it.
-        lines = self.rev_store.get_file_lines(rev_id, file_id)
+        lines = self.rev_store.get_file_lines(rev_id, old_path)
         self.data_for_commit[file_id] = b''.join(lines)
 
     def _delete_all_items(self, inv):

=== modified file 'breezy/plugins/fastimport/revision_store.py'
--- breezy/plugins/fastimport/revision_store.py	2019-06-15 12:04:34 +0000
+++ breezy/plugins/fastimport/revision_store.py	2019-09-22 13:13:44 +0000
@@ -227,17 +227,10 @@
         """Get a stored inventory."""
         return self.repo.get_inventory(revision_id)
 
-    def get_file_text(self, revision_id, file_id):
-        """Get the text stored for a file in a given revision."""
-        revtree = self.repo.revision_tree(revision_id)
-        path = revtree.id2path(file_id)
-        return revtree.get_file_text(path)
-
-    def get_file_lines(self, revision_id, file_id):
+    def get_file_lines(self, revision_id, path):
         """Get the lines stored for a file in a given revision."""
         revtree = self.repo.revision_tree(revision_id)
-        path = revtree.id2path(file_id)
-        return osutils.split_lines(revtree.get_file_text(path))
+        return revtree.get_file_lines(path)
 
     def start_new_revision(self, revision, parents, parent_invs):
         """Init the metadata needed for get_parents_and_revision_for_entry().
@@ -398,10 +391,3 @@
             raise AssertionError('signatures not guaranteed yet')
             self.repo.add_signature_text(rev.revision_id, signature)
         return builder.revision_tree().root_inventory
-
-    def get_file_lines(self, revision_id, file_id):
-        record = next(self.repo.texts.get_record_stream([(file_id, revision_id)],
-                                                        'unordered', True))
-        if record.storage_kind == 'absent':
-            raise errors.RevisionNotPresent(record.key, self.repo)
-        return osutils.split_lines(record.get_bytes_as('fulltext'))