# HG changeset patch # User mpm@selenic.com # Date 1118894328 28800 # Node ID 4b0f562c61f4b2b23396088c8ee68247cb9b3e62 # Parent 6e3436082697f5d82a3af479d76074beb556911b Move httprangereader into its own file -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Move httprangereader into its own file manifest hash: 7a856e4024ce5d3d305e23e418a77d3058c74ddf -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsPj4ywK+sNU5EO8RAizKAJ9kbYVAC+iL4cKml14BcwX9okdnJQCgjLAP cWM5/y9FdC3THOC6DkUNic0= =PkL6 -----END PGP SIGNATURE----- diff -r 6e3436082697 -r 4b0f562c61f4 mercurial/hg.py --- a/mercurial/hg.py Wed Jun 15 19:52:41 2005 -0800 +++ b/mercurial/hg.py Wed Jun 15 19:58:48 2005 -0800 @@ -9,7 +9,7 @@ from revlog import * from demandload import * demandload(globals(), "re lock urllib urllib2 transaction time socket") -demandload(globals(), "tempfile byterange difflib") +demandload(globals(), "tempfile httprangereader difflib") def is_exec(f): return (os.stat(f).st_mode & 0100 != 0) @@ -321,7 +321,7 @@ def o(path, mode="r"): if p[:7] == "http://": f = os.path.join(p, urllib.quote(path)) - return httprangereader(f) + return httprangereader.httprangereader(f) f = os.path.join(p, path) @@ -1416,18 +1416,3 @@ else: return localrepository(ui, path, create) -class httprangereader: - def __init__(self, url): - self.url = url - self.pos = 0 - def seek(self, pos): - self.pos = pos - def read(self, bytes=None): - opener = urllib2.build_opener(byterange.HTTPRangeHandler()) - urllib2.install_opener(opener) - req = urllib2.Request(self.url) - end = '' - if bytes: end = self.pos + bytes - req.add_header('Range', 'bytes=%d-%s' % (self.pos, end)) - f = urllib2.urlopen(req) - return f.read() diff -r 6e3436082697 -r 4b0f562c61f4 mercurial/httprangereader.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mercurial/httprangereader.py Wed Jun 15 19:58:48 2005 -0800 @@ -0,0 +1,24 @@ +# httprangereader.py - just what it says +# +# Copyright 2005 Matt Mackall +# +# This software may be used and distributed according to the terms +# of the GNU General Public License, incorporated herein by reference. + +import byterange, urllib2 + +class httprangereader: + def __init__(self, url): + self.url = url + self.pos = 0 + def seek(self, pos): + self.pos = pos + def read(self, bytes=None): + opener = urllib2.build_opener(byterange.HTTPRangeHandler()) + urllib2.install_opener(opener) + req = urllib2.Request(self.url) + end = '' + if bytes: end = self.pos + bytes + req.add_header('Range', 'bytes=%d-%s' % (self.pos, end)) + f = urllib2.urlopen(req) + return f.read()