Mercurial > hg > pyhgsh

annotate mercurial/httprangereader.py @ 2138:f5046cab9e2e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix revlog-ng interaction with old-http. revlog.py wasn't trying to detect the version of a revlog file that doesn't exist on the filesystem (as is the case with old-http). Additionally, there was an off-by-one error in httprangereader.read (ranges in HTTP Range headers are inclusive), making it get more data than what was asked for. This made a struct.unpack complain that "unpack str size does not match format". Finally, with the two fixes above, test-static-http fails, since BaseHTTPServer doesn't understand ranges and returns too much data. Work around that by reading only the specified amount.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Wed, 26 Apr 2006 22:42:07 -0700
parents 59b3639df0a9
children 12e11413ca19
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
372
4b0f562c61f4 Move httprangereader into its own file
mpm@selenic.com
parents:
diff changeset
1 # httprangereader.py - just what it says
4b0f562c61f4 Move httprangereader into its own file
mpm@selenic.com
parents:
diff changeset
2 #
4b0f562c61f4 Move httprangereader into its own file
mpm@selenic.com
parents:
diff changeset
3 # Copyright 2005 Matt Mackall <mpm@selenic.com>
4b0f562c61f4 Move httprangereader into its own file
mpm@selenic.com
parents:
diff changeset
4 #
4b0f562c61f4 Move httprangereader into its own file
mpm@selenic.com
parents:
diff changeset
5 # This software may be used and distributed according to the terms
4b0f562c61f4 Move httprangereader into its own file
mpm@selenic.com
parents:
diff changeset
6 # of the GNU General Public License, incorporated herein by reference.
4b0f562c61f4 Move httprangereader into its own file
mpm@selenic.com
parents:
diff changeset
7
4b0f562c61f4 Move httprangereader into its own file
mpm@selenic.com
parents:
diff changeset
8 import byterange, urllib2
4b0f562c61f4 Move httprangereader into its own file
mpm@selenic.com
parents:
diff changeset
9
1559
59b3639df0a9 Convert all classes to new-style classes by deriving them from object.
Eric Hopper <hopper@omnifarious.org>
parents: 372
diff changeset
10 class httprangereader(object):
372
4b0f562c61f4 Move httprangereader into its own file
mpm@selenic.com
parents:
diff changeset
11 def __init__(self, url):
4b0f562c61f4 Move httprangereader into its own file
mpm@selenic.com
parents:
diff changeset
12 self.url = url
4b0f562c61f4 Move httprangereader into its own file
mpm@selenic.com
parents:
diff changeset
13 self.pos = 0
4b0f562c61f4 Move httprangereader into its own file
mpm@selenic.com
parents:
diff changeset
14 def seek(self, pos):
4b0f562c61f4 Move httprangereader into its own file
mpm@selenic.com
parents:
diff changeset
15 self.pos = pos
4b0f562c61f4 Move httprangereader into its own file
mpm@selenic.com
parents:
diff changeset
16 def read(self, bytes=None):
4b0f562c61f4 Move httprangereader into its own file
mpm@selenic.com
parents:
diff changeset
17 opener = urllib2.build_opener(byterange.HTTPRangeHandler())
4b0f562c61f4 Move httprangereader into its own file
mpm@selenic.com
parents:
diff changeset
18 urllib2.install_opener(opener)
4b0f562c61f4 Move httprangereader into its own file
mpm@selenic.com
parents:
diff changeset
19 req = urllib2.Request(self.url)
4b0f562c61f4 Move httprangereader into its own file
mpm@selenic.com
parents:
diff changeset
20 end = ''
2138
f5046cab9e2e Fix revlog-ng interaction with old-http.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 1559
diff changeset
21 if bytes:
f5046cab9e2e Fix revlog-ng interaction with old-http.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 1559
diff changeset
22 end = self.pos + bytes - 1
372
4b0f562c61f4 Move httprangereader into its own file
mpm@selenic.com
parents:
diff changeset
23 req.add_header('Range', 'bytes=%d-%s' % (self.pos, end))
4b0f562c61f4 Move httprangereader into its own file
mpm@selenic.com
parents:
diff changeset
24 f = urllib2.urlopen(req)
2138
f5046cab9e2e Fix revlog-ng interaction with old-http.
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 1559
diff changeset
25 return f.read(bytes)