← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/shelf.py

  • Committer: Aaron Bentley
  • Date: 2008-10-28 10:37:18 UTC
  • mto: (0.15.43 unshelve)
  • mto: This revision was merged to the branch mainline in revision 3820.
  • Revision ID: aaron@aaronbentley.com-20081028103718-1v82hgg7dfn30y7i
Switch from read_tree_lines to tree.get_file_lines.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/shelf.py
168
168
        if version:
169
169
            to_transform.version_file(file_id, s_trans_id)
170
170
 
171
 
    def read_tree_lines(self, tree, file_id):
172
 
        """Read text lines from a tree.
173
 
 
174
 
        (Tree.get_file_lines is not an official API)
175
 
        """
176
 
        return osutils.split_lines(tree.get_file_text(file_id))
177
 
 
178
171
    def _inverse_lines(self, new_lines, file_id):
179
172
        """Produce a version with only those changes removed from new_lines."""
180
173
        target_lines = self.target_tree.get_file_lines(file_id)
181
 
        work_lines = self.read_tree_lines(self.work_tree, file_id)
 
174
        work_lines = self.work_tree.get_file_lines(file_id)
182
175
        return merge3.Merge3(new_lines, target_lines, work_lines).merge_lines()
183
176
 
184
177
    def finalize(self):