/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 bzrlib/shelf.py

  • Committer: Aaron Bentley
  • Date: 2008-10-28 10:43:48 UTC
  • mfrom: (0.15.43 unshelve)
  • mto: (0.16.95 shelf-ui)
  • mto: This revision was merged to the branch mainline in revision 3820.
  • Revision ID: aaron@aaronbentley.com-20081028104348-buezeiob2p7xj6i1
merge unshelve into shelf-manager

Show diffs side-by-side

added added

removed removed

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