/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/transport/remote.py

merge cleanups fixing conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/remote.py
323
323
        sorted_offsets = sorted(offsets)
324
324
        coalesced = list(self._coalesce_offsets(sorted_offsets,
325
325
                               limit=self._max_readv_combine,
326
 
                               fudge_factor=self._bytes_to_read_before_seek))
 
326
                               fudge_factor=self._bytes_to_read_before_seek,
 
327
                               max_size=self._max_readv_bytes))
327
328
 
328
329
        # now that we've coallesced things, avoid making enormous requests
329
330
        requests = []