/loggerhead/trunk

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/loggerhead/trunk

« back to all changes in this revision

Viewing changes to loggerhead/controllers/revision_ui.py

  • Committer: Ubuntu One Auto Copilot
  • Author(s): Jelmer Vernooij
  • Date: 2022-07-11 13:23:20 UTC
  • mfrom: (522.2.1 no-file-ids)
  • Revision ID: otto-copilot@canonical.com-20220711132320-7rtwbh42245yfkba
Avoid use of file ids - use paths instead.

Merged from https://code.launchpad.net/~jelmer/loggerhead/no-file-ids/+merge/426375

Show diffs side-by-side

added added

removed removed

Lines of Context:
loggerhead/controllers/revision_ui.py
46
46
        h = self._history
47
47
        revid = self.get_revid()
48
48
 
49
 
        filter_file_id = kwargs.get('filter_file_id', None)
 
49
        filter_path = kwargs.get('filter_path', None)
50
50
        start_revid = h.fix_revid(kwargs.get('start_revid', None))
51
51
        query = kwargs.get('q', None)
52
52
        compare_revid = h.fix_revid(kwargs.get('compare_revid', None))
56
56
        try:
57
57
            revid, start_revid, revid_list = h.get_view(revid,
58
58
                                                        start_revid,
59
 
                                                        filter_file_id,
 
59
                                                        filter_path,
60
60
                                                        query)
61
61
        except BaseException:
62
62
            self.log.exception('Exception fetching changes')
102
102
        super(RevisionUI, self).add_template_values(values)
103
103
        remember = self._history.fix_revid(self.kwargs.get('remember', None))
104
104
        query = self.kwargs.get('q', None)
105
 
        filter_file_id = self.kwargs.get('filter_file_id', None)
 
105
        filter_path = self.kwargs.get('filter_path', None)
106
106
        start_revid = self.kwargs['start_revid']
107
107
        navigation = util.Container(
108
108
            revid_list=self.revid_list, revid=values['revid'],
109
109
            start_revid=start_revid,
110
 
            filter_file_id=filter_file_id, pagesize=1,
 
110
            filter_path=filter_path, pagesize=1,
111
111
            scan_url='/revision', branch=self._branch, feed=True,
112
112
            history=self._history)
113
113
        if query is not None:
161
161
            'navigation': navigation,
162
162
            'remember': remember,
163
163
            'compare_revid': self.compare_revid,
164
 
            'filter_file_id': filter_file_id,
 
164
            'filter_path': filter_path,
165
165
            'diff_chunks': diff_chunks,
166
166
            'query': query,
167
167
            'can_export': can_export,