/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-10-29 11:27:33 UTC
  • mto: This revision was merged to the branch mainline in revision 7170.
  • Revision ID: jelmer@jelmer.uk-20181029112733-bjvm24z12svwl53m
Get rid of file_ids in most of Tree.

Show diffs side-by-side

added added

removed removed

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