/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/merge.py

  • Committer: John Arbash Meinel
  • Date: 2008-12-11 03:18:52 UTC
  • mto: This revision was merged to the branch mainline in revision 3895.
  • Revision ID: john@arbash-meinel.com-20081211031852-cmjpdf2ufno0okui
Start using osutils.chunks_as_lines rather than osutils.split_lines.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
1579
1579
 
1580
1580
    def get_lines(self, revisions):
1581
1581
        """Get lines for revisions from the backing VersionedFiles.
1582
 
        
 
1582
 
1583
1583
        :raises RevisionNotPresent: on absent texts.
1584
1584
        """
1585
1585
        keys = [(self._key_prefix + (rev,)) for rev in revisions]
1587
1587
        for record in self.vf.get_record_stream(keys, 'unordered', True):
1588
1588
            if record.storage_kind == 'absent':
1589
1589
                raise errors.RevisionNotPresent(record.key, self.vf)
1590
 
            result[record.key[-1]] = osutils.split_lines(
1591
 
                record.get_bytes_as('fulltext'))
 
1590
            result[record.key[-1]] = osutils.chunks_to_lines(
 
1591
                record.get_bytes_as('chunked'))
1592
1592
        return result
1593
1593
 
1594
1594
    def plan_merge(self):