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

  • Committer: Jelmer Vernooij
  • Date: 2020-01-25 13:08:09 UTC
  • mto: This revision was merged to the branch mainline in revision 7462.
  • Revision ID: jelmer@jelmer.uk-20200125130809-swok8icxf4kstp8c
Add a 'lines' storage type.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/merge.py
2007
2007
        for record in self.vf.get_record_stream(keys, 'unordered', True):
2008
2008
            if record.storage_kind == 'absent':
2009
2009
                raise errors.RevisionNotPresent(record.key, self.vf)
2010
 
            result[record.key[-1]] = osutils.chunks_to_lines(
2011
 
                record.get_bytes_as('chunked'))
 
2010
            result[record.key[-1]] = record.get_bytes_as('lines')
2012
2011
        return result
2013
2012
 
2014
2013
    def plan_merge(self):