Merge lp:~twom/loggerhead/use-rev-not-file-rev into lp:loggerhead

[Tom Wardill]

Use current rev, not file rev

Looking up the file revision to get the tree doesn't work if the file is in a subdirectory that has moved.
Instead, use the revision that we've got from the URL to get the tree, then look up the file.

[Colin Watson (cjwatson)]

I don't completely follow this, but I'm happy to give it a go and see if it works better in some of those corner cases.

review: Approve

[Otto Co-Pilot (otto-copilot)]

Running landing tests failed
https://jenkins.ols.canonical.com/online-services/job/loggerhead/2/

[Otto Co-Pilot (otto-copilot)]

Running landing tests failed
https://jenkins.ols.canonical.com/online-services/job/loggerhead/3/

[Otto Co-Pilot (otto-copilot)]

Running landing tests failed
https://jenkins.ols.canonical.com/online-services/job/loggerhead/4/

[Otto Co-Pilot (otto-copilot)]

Running landing tests failed
https://jenkins.ols.canonical.com/online-services/job/loggerhead/5/

[Otto Co-Pilot (otto-copilot)]

Running landing tests failed
https://jenkins.ols.canonical.com/online-services/job/loggerhead/6/

=== modified file 'loggerhead/controllers/view_ui.py'
--- loggerhead/controllers/view_ui.py	2020-07-08 16:57:56 +0000
+++ loggerhead/controllers/view_ui.py	2020-07-09 08:53:02 +0000
@@ -54,9 +54,7 @@
             raise TypeError(path)
         if not isinstance(revid, bytes):
             raise TypeError(revid)
-        rev_tree = self._history.revision_tree(revid)
-        file_revid = rev_tree.get_file_revision(path)
-        return self._history._branch.repository.revision_tree(file_revid)
+        return self._history._branch.repository.revision_tree(revid)
 
     def text_lines(self, path, revid):
         file_name = os.path.basename(path)