~bzr-pqm/bzr/bzr.dev

Viewing all changes in revision 3059.2.7.

  • Committer: Vincent Ladeuil
  • Date: 2007-12-03 17:53:35 UTC
  • mto: (2929.3.16 https) (3097.2.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 3099.
  • Revision ID: v.ladeuil+lp@free.fr-20071203175335-1u285fvj1ejbjlqb
Allow pycurl users to watch the blinkenlights and fix a bug when ranges are contiguous.

* bzrlib/transport/http/response.py:
(RangeFile.read): Fix indentation.
(RangeFile.seek): Off-by-one error if the pos is after the
range (i.e. at start + size), the range has been fully read, the
next range should be started.

* bzrlib/transport/http/_pycurl.py:
(PyCurlTransport): Limit coalescing to issur more requests to
compensate for the pycurl lack of feedback.

* bzrlib/transport/http/__init__.py:
(HttpTransportBase._get_ranges_hinted): Catch InvalidHttpRange,
not InvalidRange which cannot occur here.

* bzrlib/tests/test_http_response.py:
(TestRangeFileAccess._file_multi_ranges): Add a third range
contiguous to the second one.
(TestRangeFileAccess.test_valid_accesses): Test the case where the
last read ends at the end of the range leaving pos at a value
equals to the start of a next contiguous range.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: