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

Proposed by Colin Watson
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: 548
Merged at revision: 548
Proposed branch: lp:~cjwatson/loggerhead/more-no-file-ids
Merge into: lp:~brz/loggerhead/breezy
Diff against target: 34 lines (+3/-3)
2 files modified
loggerhead/controllers/view_ui.py (+2/-2)
loggerhead/history.py (+1/-1)
To merge this branch: bzr merge lp:~cjwatson/loggerhead/more-no-file-ids
Reviewer Review Type Date Requested Status
Jelmer Vernooij Approve
Review via email: mp+372951@code.launchpad.net

Commit message

Avoid use of file_ids some more.

Description of the change

This fixes tests with brz >= r7170.

To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'loggerhead/controllers/view_ui.py'
2--- loggerhead/controllers/view_ui.py 2018-11-01 21:48:40 +0000
3+++ loggerhead/controllers/view_ui.py 2019-09-18 14:21:09 +0000
4@@ -55,7 +55,7 @@
5 if not isinstance(revid, bytes):
6 raise TypeError(revid)
7 rev_tree = self._history.revision_tree(revid)
8- file_revid = rev_tree.get_file_revision(rev_tree.id2path(file_id), file_id)
9+ file_revid = rev_tree.get_file_revision(rev_tree.id2path(file_id))
10 return self._history._branch.repository.revision_tree(file_revid)
11
12 def text_lines(self, file_id, revid):
13@@ -63,7 +63,7 @@
14 file_name = os.path.basename(path)
15
16 tree = self.tree_for(file_id, revid)
17- file_text = tree.get_file_text(path, file_id)
18+ file_text = tree.get_file_text(path)
19
20 encoding = 'utf-8'
21 try:
22
23=== modified file 'loggerhead/history.py'
24--- loggerhead/history.py 2018-11-01 21:48:40 +0000
25+++ loggerhead/history.py 2019-09-18 14:21:09 +0000
26@@ -772,7 +772,7 @@
27 display_path = path
28 if not display_path.startswith('/'):
29 path = '/' + path
30- return display_path, breezy.osutils.basename(path), rev_tree.get_file_text(path, file_id)
31+ return display_path, breezy.osutils.basename(path), rev_tree.get_file_text(path)
32
33 def file_changes_for_revision_ids(self, old_revid, new_revid):
34 """

Subscribers

People subscribed via source and target branches

to all changes: