Merge lp:~twom/loggerhead/fix-per-file-revision-ui into lp:loggerhead

[Tom Wardill]

Use path instead of file_id in RevisionUI

The use of file_id has gone away, so use the path instead.

[Colin Watson (cjwatson)]

review: Approve

[lp:~twom/loggerhead/fix-per-file-revision-ui]

507. By Tom Wardill on 2020-07-10

assertEqual, not assertIs

=== modified file 'loggerhead/controllers/revision_ui.py'
--- loggerhead/controllers/revision_ui.py	2020-07-08 17:14:19 +0000
+++ loggerhead/controllers/revision_ui.py	2020-07-10 09:58:00 +0000
@@ -128,7 +128,7 @@
                 except (KeyError, ValueError):
                     context_lines = None
                 diff_chunks = diff_chunks_for_file(
-                    self._history._branch.repository, item.file_id,
+                    self._history._branch.repository, path,
                     item.old_revision, item.new_revision,
                     context_lines=context_lines)
             else:

=== modified file 'loggerhead/tests/test_controllers.py'
--- loggerhead/tests/test_controllers.py	2020-07-08 16:29:40 +0000
+++ loggerhead/tests/test_controllers.py	2020-07-10 09:58:00 +0000
@@ -148,6 +148,22 @@
         revision_ui.add_template_values(values)
         self.assertIs(values['diff_chunks'], None)
 
+    def test_add_template_values_with_changes(self):
+        branch_app = self.make_branch_app_for_revision_ui(
+                [('file', b'content\n')], [('file', b'new content\n')])
+        env = {'SCRIPT_NAME': '/',
+               'PATH_INFO': '/revision/1/file',
+               'QUERY_STRING':'start_revid=1',
+               'REQUEST_METHOD': 'GET',
+               'wsgi.url_scheme': 'http',
+               'SERVER_NAME': 'localhost',
+               'SERVER_PORT': '80'}
+        revision_ui = branch_app.lookup_app(env)
+        path = revision_ui.parse_args(env)
+        values = revision_ui.get_values(path, revision_ui.kwargs, {})
+        revision_ui.add_template_values(values)
+        self.assertEqual(len(values['diff_chunks']), 1)
+
     def test_get_values_smoke(self):
         branch_app = self.make_branch_app_for_revision_ui(
                 [('file', b'content\n'), ('other-file', b'other\n')],