Merge lp:~jelmer/loggerhead/no-file-ids into lp:loggerhead

[Jelmer Vernooij]

Avoid use of file ids - use paths instead.

Avoid use of file ids - use paths instead.

This prepares loggerhead for upcoming Breezy changes, which remove file ids
from the primary API. The goal behind this is to make the implementation
of non-Bazaar filesystems simpler.

[Colin Watson (cjwatson)]

This does break some old (horrible) URLs, but it seems ultimately necessary, so I'm OK with this. Let's see what the test suite makes of it.

review: Approve

[Otto Co-Pilot (otto-copilot)]

A commit message must be set
https://jenkins.ols.canonical.com/online-services/job/loggerhead/30/

[Otto Co-Pilot (otto-copilot)]

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

=== modified file 'loggerhead/controllers/annotate_ui.py'
--- loggerhead/controllers/annotate_ui.py	2020-07-14 16:41:12 +0000
+++ loggerhead/controllers/annotate_ui.py	2022-07-06 12:59:30 +0000
@@ -24,14 +24,10 @@
 
 class AnnotateUI(ViewUI):
 
-    def annotate_file(self, info):
-        file_id = info['file_id']
+    def annotate_file(self, path, info):
         revid = info['change'].revid
-        if not isinstance(file_id, bytes):
-            raise TypeError(file_id)
         if not isinstance(revid, bytes):
             raise TypeError(revid)
-        path = self._history.get_path(revid, file_id)
 
         tree = self.tree_for(path, revid)
 
@@ -43,7 +39,7 @@
         revisions = {}
 
         lineno = 0
-        for (line_revid, text), lineno in zip(tree.annotate_iter(path, file_id), itertools.count(1)):
+        for (line_revid, text), lineno in zip(tree.annotate_iter(path), itertools.count(1)):
             if line_revid != last_line_revid:
                 last_line_revid = line_revid
 
@@ -84,6 +80,6 @@
 
     def get_values(self, path, kwargs, headers):
         values = super(AnnotateUI, self).get_values(path, kwargs, headers)
-        values['annotated'] = self.annotate_file(values)
+        values['annotated'] = self.annotate_file(path, values)
 
         return values

=== modified file 'loggerhead/controllers/changelog_ui.py'
--- loggerhead/controllers/changelog_ui.py	2020-07-08 17:14:19 +0000
+++ loggerhead/controllers/changelog_ui.py	2022-07-06 12:59:30 +0000
@@ -35,21 +35,16 @@
     def get_values(self, path, kwargs, headers):
         history = self._history
         revid = self.get_revid()
-        filter_file_id = kwargs.get('filter_file_id', None)
-        if filter_file_id is not None:
-            filter_file_id = urlutils.unquote_to_bytes(osutils.safe_utf8(filter_file_id))
+        filter_path = kwargs.get('filter_path', path)
         query = kwargs.get('q', None)
         start_revid = history.fix_revid(kwargs.get('start_revid', None))
         orig_start_revid = start_revid
-        pagesize = 20#int(config.get('pagesize', '20'))
+        pagesize = 20  #int(config.get('pagesize', '20'))
         search_failed = False
 
-        if filter_file_id is None and path is not None:
-            filter_file_id = history.get_file_id(revid, path)
-
         try:
             revid, start_revid, revid_list = history.get_view(
-                revid, start_revid, filter_file_id, query,
+                revid, start_revid, filter_path, query,
                 extra_rev_count=pagesize+1)
             util.set_context(kwargs)
 
@@ -76,7 +71,7 @@
 
         navigation = util.Container(
             pagesize=pagesize, revid=revid, start_revid=start_revid,
-            revid_list=revid_list, filter_file_id=filter_file_id,
+            revid_list=revid_list, filter_path=filter_path,
             scan_url='/changes', branch=self._branch, feed=True, history=history)
         if query is not None:
             navigation.query = query
@@ -104,7 +99,7 @@
             'history': history,
             'revid': revid,
             'navigation': navigation,
-            'filter_file_id': filter_file_id,
+            'filter_path': filter_path,
             'start_revid': start_revid,
             'viewing_from': (orig_start_revid is not None) and
                             (orig_start_revid != history.last_revid),

=== modified file 'loggerhead/controllers/download_ui.py'
--- loggerhead/controllers/download_ui.py	2020-07-08 17:12:21 +0000
+++ loggerhead/controllers/download_ui.py	2022-07-06 12:59:30 +0000
@@ -61,12 +61,7 @@
         try:
             path, filename, content = h.get_file(args[1], revid)
         except (NoSuchFile, NoSuchRevision):
-            # Compatibility API for /download/rev_id/file_id/<filename>
-            try:
-                path, filename, content = h.get_file_by_fileid(
-                    args[1].encode('UTF-8'), revid)
-            except (NoSuchId, NoSuchRevision):
-                raise httpexceptions.HTTPNotFound()
+            raise httpexceptions.HTTPNotFound()
         mime_type, encoding = mimetypes.guess_type(filename)
         if mime_type is None:
             mime_type = 'application/octet-stream'

=== modified file 'loggerhead/controllers/inventory_ui.py'
--- loggerhead/controllers/inventory_ui.py	2018-11-01 21:48:40 +0000
+++ loggerhead/controllers/inventory_ui.py	2022-07-06 12:59:30 +0000
@@ -95,7 +95,7 @@
             file = util.Container(
                 filename=entry.name, executable=entry.executable,
                 kind=entry.kind, absolutepath=child_path,
-                file_id=entry.file_id, size=size, revid=child_revision,
+                size=size, revid=child_revision,
                 change=change_dict[child_revision], contents_changed_rev=contents_changed_rev)
             file_list.append(file)
 
@@ -125,23 +125,15 @@
         except errors.NoSuchRevision:
             raise HTTPNotFound()
 
-        file_id = kwargs.get('file_id', None)
         start_revid = kwargs.get('start_revid', None)
         sort_type = kwargs.get('sort', 'filename')
 
-        if path is not None:
-            path = path.rstrip('/')
-            file_id = rev_tree.path2id(path)
-            if file_id is None:
-                raise HTTPNotFound()
-        else:
-            if file_id is None:
-                path = ''
-            else:
-                try:
-                    path = rev_tree.id2path(file_id)
-                except errors.NoSuchId:
-                    raise HTTPNotFound()
+        if path is None:
+            path = "/"
+
+        path = path.rstrip('/')
+        if not rev_tree.has_filename(path) and not is_null_rev(revid):
+            raise HTTPNotFound()
 
         # Are we at the top of the tree
         if path in ['/', '']:

=== modified file 'loggerhead/controllers/revision_ui.py'
--- loggerhead/controllers/revision_ui.py	2021-03-29 11:18:58 +0000
+++ loggerhead/controllers/revision_ui.py	2022-07-06 12:59:30 +0000
@@ -46,7 +46,7 @@
         h = self._history
         revid = self.get_revid()
 
-        filter_file_id = kwargs.get('filter_file_id', None)
+        filter_path = kwargs.get('filter_path', None)
         start_revid = h.fix_revid(kwargs.get('start_revid', None))
         query = kwargs.get('q', None)
         compare_revid = h.fix_revid(kwargs.get('compare_revid', None))
@@ -56,7 +56,7 @@
         try:
             revid, start_revid, revid_list = h.get_view(revid,
                                                         start_revid,
-                                                        filter_file_id,
+                                                        filter_path,
                                                         query)
         except BaseException:
             self.log.exception('Exception fetching changes')
@@ -102,12 +102,12 @@
         super(RevisionUI, self).add_template_values(values)
         remember = self._history.fix_revid(self.kwargs.get('remember', None))
         query = self.kwargs.get('q', None)
-        filter_file_id = self.kwargs.get('filter_file_id', None)
+        filter_path = self.kwargs.get('filter_path', None)
         start_revid = self.kwargs['start_revid']
         navigation = util.Container(
             revid_list=self.revid_list, revid=values['revid'],
             start_revid=start_revid,
-            filter_file_id=filter_file_id, pagesize=1,
+            filter_path=filter_path, pagesize=1,
             scan_url='/revision', branch=self._branch, feed=True,
             history=self._history)
         if query is not None:
@@ -161,7 +161,7 @@
             'navigation': navigation,
             'remember': remember,
             'compare_revid': self.compare_revid,
-            'filter_file_id': filter_file_id,
+            'filter_path': filter_path,
             'diff_chunks': diff_chunks,
             'query': query,
             'can_export': can_export,

=== modified file 'loggerhead/controllers/view_ui.py'
--- loggerhead/controllers/view_ui.py	2021-11-15 14:40:11 +0000
+++ loggerhead/controllers/view_ui.py	2022-07-06 12:59:30 +0000
@@ -99,19 +99,10 @@
         history = self._history
         branch = history._branch
         revid = self.get_revid()
-        file_id = kwargs.get('file_id', None)
-        if file_id is not None:
-            file_id = urlutils.unquote_to_bytes(osutils.safe_utf8(file_id))
-        if (file_id is None) and (path is None):
-            raise HTTPBadRequest('No file_id or filename '
-                                 'provided to view')
+        if path is None:
+            raise HTTPBadRequest('No filename provided to view')
 
-        try:
-            if file_id is None:
-                file_id = history.get_file_id(revid, path)
-            if path is None:
-                path = history.get_path(revid, file_id)
-        except (NoSuchId, NoSuchRevision):
+        if not history.file_exists(revid, path):
             raise HTTPNotFound()
 
         filename = os.path.basename(path)
@@ -151,7 +142,6 @@
             # checking whether we're in "annotated" mode.
             'annotated': {},
             'revno_url': revno_url,
-            'file_id': file_id,
             'file_path': path,
             'filename': filename,
             'navigation': navigation,

=== modified file 'loggerhead/history.py'
--- loggerhead/history.py	2021-11-15 14:40:11 +0000
+++ loggerhead/history.py	2022-07-06 12:59:30 +0000
@@ -34,7 +34,6 @@
 import textwrap
 import threading
 
-from breezy import version_info as breezy_version
 from breezy import tag
 import breezy.branch
 import breezy.delta
@@ -127,18 +126,11 @@
         except breezy.errors.NoSuchFile:
             return breezy.revision.NULL_REVISION
 
-    if breezy_version >= (3, 1):
-        def report(self, paths, versioned, renamed, copied, modified,
-                   exe_change, kind):
-            return self._report(
-                    paths, versioned, renamed, copied,
-                    modified, exe_change, kind)
-    else:
-        def report(self, file_id, paths, versioned, renamed, modified,
-                   exe_change, kind):
-            return self._report(
-                    paths, versioned, renamed, None,
-                    modified, exe_change, kind)
+    def report(self, paths, versioned, renamed, copied, modified,
+               exe_change, kind):
+        return self._report(
+                paths, versioned, renamed, copied,
+                modified, exe_change, kind)
 
     def _report(self, paths, versioned, renamed, copied, modified,
                 exe_change, kind):
@@ -376,6 +368,7 @@
     def get_short_revision_history_by_fileid(self, file_id):
         # FIXME: would be awesome if we could get, for a folder, the list of
         # revisions where items within that folder changed.i
+        # TODO(jelmer): Avoid versionedfile-specific texts
         possible_keys = [(file_id, revid) for revid in self._rev_indices]
         get_parent_map = self._branch.repository.texts.get_parent_map
         # We chunk the requests as this works better with GraphIndex.
@@ -478,24 +471,6 @@
             revid = revid.encode('utf-8')
         return revid
 
-    def get_file_view(self, revid, file_id):
-        """
-        Given a revid and optional path, return a (revlist, revid) for
-        navigation through the current scope: from the revid (or the latest
-        revision) back to the original revision.
-
-        If file_id is None, the entire revision history is the list scope.
-        """
-        if revid is None:
-            revid = self.last_revid
-        if file_id is not None:
-            revlist = list(
-                self.get_short_revision_history_by_fileid(file_id))
-            revlist = self.get_revids_from(revlist, revid)
-        else:
-            revlist = self.get_revids_from(None, revid)
-        return revlist
-
     @staticmethod
     def _iterate_sufficiently(iterable, stop_at, extra_rev_count):
         """Return a list of iterable.
@@ -522,15 +497,33 @@
                 result.append(n)
         return result
 
-    def get_view(self, revid, start_revid, file_id, query=None,
+    def _get_file_view(self, revid, file_id):
+        """
+        Given a revid and optional path, return a (revlist, revid) for
+        navigation through the current scope: from the revid (or the latest
+        revision) back to the original revision.
+
+        If file_id is None, the entire revision history is the list scope.
+        """
+        if revid is None:
+            revid = self.last_revid
+        if file_id is not None:
+            revlist = list(
+                self.get_short_revision_history_by_fileid(file_id))
+            revlist = self.get_revids_from(revlist, revid)
+        else:
+            revlist = self.get_revids_from(None, revid)
+        return revlist
+
+    def get_view(self, revid, start_revid, path, query=None,
                  extra_rev_count=None):
         """
-        use the URL parameters (revid, start_revid, file_id, and query) to
-        determine the revision list we're viewing (start_revid, file_id, query)
+        use the URL parameters (revid, start_revid, path, and query) to
+        determine the revision list we're viewing (start_revid, path, query)
         and where we are in it (revid).
 
             - if a query is given, we're viewing query results.
-            - if a file_id is given, we're viewing revisions for a specific
+            - if a path is given, we're viewing revisions for a specific
               file.
             - if a start_revid is given, we're viewing the branch from a
               specific revision up the tree.
@@ -548,14 +541,19 @@
             - start_revid: starting revision of this view
             - revid_list: list of revision ids for this view
 
-        file_id and query are never changed so aren't returned, but they may
+        path and query are never changed so aren't returned, but they may
         contain vital context for future url navigation.
         """
         if start_revid is None:
             start_revid = self.last_revid
 
         if query is None:
-            revid_list = self.get_file_view(start_revid, file_id)
+            repo = self._branch.repository
+            if path is not None:
+                file_id = repo.revision_tree(start_revid).path2id(path)
+            else:
+                file_id = None
+            revid_list = self._get_file_view(start_revid, file_id)
             revid_list = self._iterate_sufficiently(revid_list, revid,
                                                     extra_rev_count)
             if revid is None:
@@ -563,15 +561,17 @@
             if revid not in revid_list:
                 # if the given revid is not in the revlist, use a revlist that
                 # starts at the given revid.
-                revid_list = self.get_file_view(revid, file_id)
+                revid_list = self._get_file_view(revid, file_id)
                 revid_list = self._iterate_sufficiently(revid_list, revid,
                                                         extra_rev_count)
                 start_revid = revid
             return revid, start_revid, revid_list
+        else:
+            file_id = None
 
         # potentially limit the search
         if file_id is not None:
-            revid_list = self.get_file_view(start_revid, file_id)
+            revid_list = self._get_file_view(start_revid, file_id)
         else:
             revid_list = None
         revid_list = search.search_revisions(self._branch, query)
@@ -588,18 +588,13 @@
     def revision_tree(self, revid):
         return self._branch.repository.revision_tree(revid)
 
-    def get_path(self, revid, file_id):
-        if (file_id is None) or (file_id == ''):
-            return ''
-        path = self.revision_tree(revid).id2path(file_id)
-        if (len(path) > 0) and not path.startswith('/'):
-            path = '/' + path
-        return path
-
-    def get_file_id(self, revid, path):
-        if (len(path) > 0) and not path.startswith('/'):
-            path = '/' + path
-        return self.revision_tree(revid).path2id(path)
+    def file_exists(self, revid, path):
+        if (len(path) > 0) and not path.startswith('/'):
+            path = '/' + path
+        try:
+            return self.revision_tree(revid).has_filename(path)
+        except breezy.errors.NoSuchRevision:
+            return False
 
     def get_merge_point_list(self, revid):
         """
@@ -786,32 +781,15 @@
         return (display_path, breezy.osutils.basename(path),
                 rev_tree.get_file_text(path))
 
-    def get_file_by_fileid(self, fileid, revid):
-        """Returns (path, filename, file contents)"""
-        if not isinstance(fileid, bytes):
-            raise TypeError(fileid)
-        if not isinstance(revid, bytes):
-            raise TypeError(revid)
-        rev_tree = self._branch.repository.revision_tree(revid)
-        path = rev_tree.id2path(fileid)
-        display_path = path
-        if not display_path.startswith('/'):
-            path = '/' + path
-        return (display_path, breezy.osutils.basename(path),
-                rev_tree.get_file_text(path))
-
     def file_changes_for_revision_ids(self, old_revid, new_revid):
         """
         Return a nested data structure containing the changes in a delta::
 
-            added: list((filename, file_id)),
-            renamed: list((old_filename, new_filename, file_id)),
-            deleted: list((filename, file_id)),
-            modified: list(
-                filename: str,
-                file_id: str,
-            ),
-            text_changes: list((filename, file_id)),
+            added: list((filename)),
+            renamed: list((old_filename, new_filename)),
+            deleted: list((filename)),
+            modified: list((filename)),
+            text_changes: list((filename)),
         """
         repo = self._branch.repository
         if (breezy.revision.is_null(old_revid) or

=== modified file 'loggerhead/templates/changelog.pt'
--- loggerhead/templates/changelog.pt	2012-02-02 07:42:24 +0000
+++ loggerhead/templates/changelog.pt	2022-07-06 12:59:30 +0000
@@ -39,7 +39,7 @@
             </tal:no-link>
             <tal:block condition="changes">
               &#187; Changes
-              <tal:block condition="filter_file_id">to <span tal:content="python:history.get_path(revid, filter_file_id)" /></tal:block>
+              <tal:block condition="filter_path">to <span tal:content="filter_path" /></tal:block>
               <tal:block condition="start_revid">from revision
                 <span tal:content="python:history.get_revno(start_revid)"/>
               </tal:block>

=== modified file 'loggerhead/templates/inventory.pt'
--- loggerhead/templates/inventory.pt	2018-10-20 16:06:44 +0000
+++ loggerhead/templates/inventory.pt	2022-07-06 12:59:30 +0000
@@ -94,7 +94,7 @@
                  <td class="date" tal:content="python:util.hide_email(file.change.committer)"></td>
                  <td class="autcell" tal:content="python:file.change.comment[:50]"></td>
                  <td class="timedate2"></td><!-- not showing sizes of folders -->
-                 <td class="expcell"><a tal:attributes="href python:url(['/changes'], start_revid=start_revid, filter_file_id=file.file_id);
+                 <td class="expcell"><a tal:attributes="href python:url(['/changes'], start_revid=start_revid, filter_path=file.absolutepath);
                                                      title string:Show revision ${file/change/revno}">
                                       <img tal:attributes="src python:branch.static_url('/static/images/ico_planilla.gif')" alt="Diff" />
                                      </a>
@@ -119,7 +119,7 @@
                  <td class="date" tal:content="python:util.hide_email(file.change.committer)"></td>
                  <td class="autcell" tal:content="python:file.change.comment[:50]"></td>
                  <td class="timedate2">.</td>
-                 <td class="expcell"><a tal:attributes="href python:url(['/changes'], start_revid=start_revid, filter_file_id=file.file_id);
+                 <td class="expcell"><a tal:attributes="href python:url(['/changes'], start_revid=start_revid, filter_path=file.absolutepath);
                                                         title string:Show revision ${file/change/revno}">
                                           <img tal:attributes="src python:branch.static_url('/static/images/ico_planilla.gif');
                                                                title string:Show revision ${file/change/revno}" />
@@ -157,7 +157,7 @@
                                      </a>
               </td>
               <td class="expcell">
-                 <a tal:attributes="href python:url(['/download', file.revid.decode('utf-8'), file.file_id.decode('utf-8'), file.filename]);
+                 <a tal:attributes="href python:url(['/download', file.revid.decode('utf-8'), file.filename]);
                                     title string:Download ${file/filename} at revision ${file/change/revno}">
                    <img tal:attributes="src python:branch.static_url('/static/images/ico_file_download.gif')" alt="Download File" />
                  </a>

=== modified file 'loggerhead/templates/search-box.pt'
--- loggerhead/templates/search-box.pt	2008-08-13 17:24:10 +0000
+++ loggerhead/templates/search-box.pt	2022-07-06 12:59:30 +0000
@@ -1,8 +1,7 @@
 <tal:search-box>
   <form tal:attributes="action python:branch.url('/changes',
                             start_revid=getattr(navigation,
-                            'start_revid', None),
-                            file_id=getattr(navigation, 'file_id', None))">
+                            'start_revid', None))">
     <label>search:</label>
     <input type="search" name="q" id="q" autocomplete="off" onblur="hide_search();" />
   </form>

=== modified file 'loggerhead/templates/view.pt'
--- loggerhead/templates/view.pt	2020-06-04 19:21:17 +0000
+++ loggerhead/templates/view.pt	2022-07-06 12:59:30 +0000
@@ -59,7 +59,7 @@
                 <a tal:attributes="href python:url(['/revision', change.revno], clear=1)">view revision</a>
             </li>
             <li>
-                <a tal:attributes="href python:url(['/changes'], clear=1, filter_file_id=file_id)"
+                <a tal:attributes="href python:url(['/changes'], clear=1, filter_path=file_path)"
                 >view changes to this file</a>
             </li>
             <li id="last">

=== modified file 'loggerhead/tests/fixtures.py'
--- loggerhead/tests/fixtures.py	2018-10-20 13:45:31 +0000
+++ loggerhead/tests/fixtures.py	2022-07-06 12:59:30 +0000
@@ -36,8 +36,7 @@
         filenames = ['myfilename', 'anotherfile<']
         self.testcase.build_tree_contents(
             (filename, self.filecontents) for filename in filenames)
-        for filename in filenames:
-            self.tree.add(filename, ('%s-id' % filename).encode('utf-8'))
-        self.fileid = self.tree.path2id('myfilename')
+        self.tree.add(filenames)
+        self.path = 'myfilename'
         self.msg = 'a very exciting commit message <'
         self.revid = self.tree.commit(message=self.msg)

=== modified file 'loggerhead/tests/test_controllers.py'
--- loggerhead/tests/test_controllers.py	2021-03-29 11:18:58 +0000
+++ loggerhead/tests/test_controllers.py	2022-07-06 12:59:30 +0000
@@ -221,12 +221,12 @@
 
 class TestAnnotateUI(BasicTests):
 
-    def make_annotate_ui_for_file_history(self, file_id, rev_ids_texts):
+    def make_annotate_ui_for_file_history(self, filename, rev_ids_texts):
         tree = self.make_branch_and_tree('.')
-        self.build_tree_contents([('filename', '')])
-        tree.add(['filename'], [file_id])
+        self.build_tree_contents([(filename, '')])
+        tree.add([filename])
         for rev_id, text, message in rev_ids_texts:
-            self.build_tree_contents([('filename', text)])
+            self.build_tree_contents([(filename, text)])
             tree.commit(rev_id=rev_id, message=message)
         tree.branch.lock_read()
         self.addCleanup(tree.branch.unlock)
@@ -235,12 +235,11 @@
 
     def test_annotate_file(self):
         history = [(b'rev1', b'old\nold\n', '.'), (b'rev2', b'new\nold\n', '.')]
-        ann_ui = self.make_annotate_ui_for_file_history(b'file_id', history)
+        ann_ui = self.make_annotate_ui_for_file_history('filename', history)
         # A lot of this state is set up by __call__, but we'll do it directly
         # here.
         ann_ui.args = ['rev2']
-        annotate_info = ann_ui.get_values(u'filename',
-            kwargs={'file_id': 'file_id'}, headers={})
+        annotate_info = ann_ui.get_values(u'filename', kwargs={}, headers={})
         annotated = annotate_info['annotated']
         self.assertEqual(2, len(annotated))
         self.assertEqual('2', annotated[1].change.revno)
@@ -249,32 +248,30 @@
     def test_annotate_empty_comment(self):
         # Testing empty comment handling without breaking
         history = [(b'rev1', b'old\nold\n', '.'), (b'rev2', b'new\nold\n', '')]
-        ann_ui = self.make_annotate_ui_for_file_history(b'file_id', history)
+        ann_ui = self.make_annotate_ui_for_file_history('filename', history)
         ann_ui.args = ['rev2']
-        ann_ui.get_values(
-            u'filename', kwargs={'file_id': 'file_id'}, headers={})
+        ann_ui.get_values(u'filename', kwargs={}, headers={})
 
     def test_annotate_file_zero_sized(self):
         # Test against a zero-sized file without breaking. No annotation
         # must be present.
         history = [(b'rev1', b'', '.')]
-        ann_ui = self.make_annotate_ui_for_file_history(b'file_id', history)
+        ann_ui = self.make_annotate_ui_for_file_history('filename', history)
         ann_ui.args = ['rev1']
-        annotate_info = ann_ui.get_values(u'filename',
-            kwargs={'file_id': 'file_id'}, headers={})
+        annotate_info = ann_ui.get_values(u'filename', kwargs={}, headers={})
         annotated = annotate_info['annotated']
         self.assertEqual(0, len(annotated))
 
     def test_annotate_nonexistent_file(self):
         history = [(b'rev1', b'', '.')]
-        ann_ui = self.make_annotate_ui_for_file_history(b'file_id', history)
+        ann_ui = self.make_annotate_ui_for_file_history('filename', history)
         ann_ui.args = ['rev1']
         self.assertRaises(
             HTTPNotFound, ann_ui.get_values, u'not-filename', {}, {})
 
     def test_annotate_nonexistent_rev(self):
         history = [(b'rev1', b'', '.')]
-        ann_ui = self.make_annotate_ui_for_file_history(b'file_id', history)
+        ann_ui = self.make_annotate_ui_for_file_history('filename', history)
         ann_ui.args = ['norev']
         self.assertRaises(
             HTTPNotFound, ann_ui.get_values, u'not-filename', {}, {})
@@ -433,15 +430,6 @@
             response,
             MatchesDownloadHeaders('myfilename', 'application/octet-stream'))
 
-    def test_download_with_revid(self):
-        app = self.setUpLoggerhead()
-        response = app.get('/download/1/myfilename-id/myfilename')
-        self.assertEqual(
-            b'some\nmultiline\ndata\nwith<htmlspecialchars\n', response.body)
-        self.assertThat(
-            response,
-            MatchesDownloadHeaders('myfilename', 'application/octet-stream'))
-
     def test_download_bad_revision(self):
         app = self.setUpLoggerhead()
         e = self.assertRaises(
@@ -449,7 +437,7 @@
             app.get, '/download/norev/myfilename')
         self.assertContainsRe(str(e), '404 Not Found')
 
-    def test_download_bad_fileid(self):
+    def test_download_bad_filename(self):
         app = self.setUpLoggerhead()
         e = self.assertRaises(
             AppError,

=== modified file 'loggerhead/tests/test_simple.py'
--- loggerhead/tests/test_simple.py	2021-11-15 14:40:11 +0000
+++ loggerhead/tests/test_simple.py	2022-07-06 12:59:30 +0000
@@ -78,7 +78,7 @@
         # XXX: This could be cleaned up more... -- mbp 2011-11-25
         self.useFixture(self.sample_branch_fixture)
         self.tree = self.sample_branch_fixture.tree
-        self.fileid = self.sample_branch_fixture.fileid
+        self.path = self.sample_branch_fixture.path
         self.filecontents = self.sample_branch_fixture.filecontents
         self.msg = self.sample_branch_fixture.msg
 
@@ -95,7 +95,7 @@
 
     def test_changes_for_file(self):
         app = self.setUpLoggerhead()
-        res = app.get('/changes?filter_file_id=myfilename-id')
+        res = app.get('/changes?filter_path=%s' % self.path)
         res.mustcontain(escape(self.msg))
 
     def test_changes_branch_from(self):
@@ -111,7 +111,7 @@
 
     def test_annotate(self):
         app = self.setUpLoggerhead()
-        res = app.get('/annotate', params={'file_id': self.fileid})
+        res = app.get('/annotate/1/%s' % self.path, params={})
         # If pygments is installed, it inserts <span class="pyg" content into
         # the output, to trigger highlighting. And it specifically highlights
         # the &lt; that we are interested in seeing in the output.
@@ -137,8 +137,6 @@
         res.mustcontain('myfilename')
         res = app.get('/files/1/')
         res.mustcontain('myfilename')
-        res = app.get('/files/1/?file_id=' + self.tree.path2id('').decode('utf-8'))
-        res.mustcontain('myfilename')
 
     def test_inventory_bad_rev_404(self):
         app = self.setUpLoggerhead()
@@ -148,7 +146,6 @@
     def test_inventory_bad_path_404(self):
         app = self.setUpLoggerhead()
         res = app.get('/files/1/hooha', status=404)
-        res = app.get('/files/1?file_id=dssadsada', status=404)
 
     def test_revision(self):
         app = self.setUpLoggerhead()

=== modified file 'loggerhead/util.py'
--- loggerhead/util.py	2021-11-15 14:40:11 +0000
+++ loggerhead/util.py	2022-07-06 12:59:30 +0000
@@ -409,7 +409,7 @@
             navigation.next_page_revid)
     start_revno = navigation.history.get_revno(navigation.start_revid)
 
-    params = {'filter_file_id': navigation.filter_file_id}
+    params = {'filter_path': navigation.filter_path}
     if getattr(navigation, 'query', None) is not None:
         params['q'] = navigation.query
 
@@ -533,9 +533,7 @@
 #         the current beginning of navigation (navigation continues back to
 #         the original revision) -- this defines an 'alternate mainline'
 #         when the user navigates into a branch.
-#     - file_id
-#         the file being looked at
-#     - filter_file_id
+#     - filter_path
 #         if navigating the revisions that touched a file
 #     - q (query)
 #         if navigating the revisions that matched a search query
@@ -553,7 +551,7 @@
 
 t_context = threading.local()
 _valid = (
-    'start_revid', 'filter_file_id', 'q', 'remember', 'compare_revid', 'sort')
+    'start_revid', 'filter_path', 'q', 'remember', 'compare_revid', 'sort')
 
 
 def set_context(map):