Merge lp:~cjwatson/loggerhead/more-no-file-ids into lp:~brz/loggerhead/breezy

[Colin Watson]

Avoid use of file_ids some more.

This fixes tests with brz >= r7170.

[Jelmer Vernooij (jelmer)]

review: Approve

=== modified file 'loggerhead/controllers/view_ui.py'
--- loggerhead/controllers/view_ui.py	2018-11-01 21:48:40 +0000
+++ loggerhead/controllers/view_ui.py	2019-09-18 14:21:09 +0000
@@ -55,7 +55,7 @@
         if not isinstance(revid, bytes):
             raise TypeError(revid)
         rev_tree = self._history.revision_tree(revid)
-        file_revid = rev_tree.get_file_revision(rev_tree.id2path(file_id), file_id)
+        file_revid = rev_tree.get_file_revision(rev_tree.id2path(file_id))
         return self._history._branch.repository.revision_tree(file_revid)
 
     def text_lines(self, file_id, revid):
@@ -63,7 +63,7 @@
         file_name = os.path.basename(path)
 
         tree = self.tree_for(file_id, revid)
-        file_text = tree.get_file_text(path, file_id)
+        file_text = tree.get_file_text(path)
 
         encoding = 'utf-8'
         try:
 
=== modified file 'loggerhead/history.py'
--- loggerhead/history.py	2018-11-01 21:48:40 +0000
+++ loggerhead/history.py	2019-09-18 14:21:09 +0000
@@ -772,7 +772,7 @@
         display_path = path
         if not display_path.startswith('/'):
             path = '/' + path
-        return display_path, breezy.osutils.basename(path), rev_tree.get_file_text(path, file_id)
+        return display_path, breezy.osutils.basename(path), rev_tree.get_file_text(path)
 
     def file_changes_for_revision_ids(self, old_revid, new_revid):
         """