/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/shelf_ui.py

  • Committer: Jelmer Vernooij
  • Date: 2018-03-04 15:59:37 UTC
  • mto: This revision was merged to the branch mainline in revision 6913.
  • Revision ID: jelmer@jelmer.uk-20180304155937-pssy5js0av6hvmba
Make Tree.iter_files_bytes() take paths rather than file_ids.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/shelf_ui.py
324
324
        if self.reporter.invert_diff:
325
325
            target_lines = work_tree_lines
326
326
        else:
327
 
            path = self.target_tree.path2id(file_id)
 
327
            path = self.target_tree.id2path(file_id)
328
328
            target_lines = self.target_tree.get_file_lines(path, file_id)
329
329
        textfile.check_text_lines(work_tree_lines)
330
330
        textfile.check_text_lines(target_lines)