← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/__init__.py

  • Committer: Benoît Pierre
  • Date: 2008-12-02 21:21:45 UTC
  • mfrom: (3878 +trunk)
  • mto: (4056.1.1 trunk2)
  • mto: This revision was merged to the branch mainline in revision 4058.
  • Revision ID: benoit.pierre@gmail.com-20081202212145-e2lr5ec5vyu0xp13
Merge with upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/__init__.py
797
797
        cur = _CoalescedOffset(None, None, [])
798
798
        coalesced_offsets = []
799
799
 
 
800
        if max_size <= 0:
 
801
            # 'unlimited', but we actually take this to mean 100MB buffer limit
 
802
            max_size = 100*1024*1024
 
803
 
800
804
        for start, size in offsets:
801
805
            end = start + size
802
806
            if (last_end is not None