Show More
@@ -825,7 +825,6 b' class hgweb(object):' | |||||
825 | req.write(resp) |
|
825 | req.write(resp) | |
826 |
|
826 | |||
827 | def do_between(self, req): |
|
827 | def do_between(self, req): | |
828 | nodes = [] |
|
|||
829 | if req.form.has_key('pairs'): |
|
828 | if req.form.has_key('pairs'): | |
830 | pairs = [map(bin, p.split("-")) |
|
829 | pairs = [map(bin, p.split("-")) | |
831 | for p in req.form['pairs'][0].split(" ")] |
|
830 | for p in req.form['pairs'][0].split(" ")] |
@@ -131,7 +131,7 b' class httprepository(remoterepository):' | |||||
131 | self.ui = ui |
|
131 | self.ui = ui | |
132 |
|
132 | |||
133 | proxyurl = ui.config("http_proxy", "host") or os.getenv('http_proxy') |
|
133 | proxyurl = ui.config("http_proxy", "host") or os.getenv('http_proxy') | |
134 | proxyauthinfo = None |
|
134 | # XXX proxyauthinfo = None | |
135 | handler = httphandler() |
|
135 | handler = httphandler() | |
136 |
|
136 | |||
137 | if proxyurl: |
|
137 | if proxyurl: | |
@@ -288,14 +288,13 b' class httprepository(remoterepository):' | |||||
288 | def changegroup(self, nodes, kind): |
|
288 | def changegroup(self, nodes, kind): | |
289 | n = " ".join(map(hex, nodes)) |
|
289 | n = " ".join(map(hex, nodes)) | |
290 | f = self.do_cmd("changegroup", roots=n) |
|
290 | f = self.do_cmd("changegroup", roots=n) | |
291 | bytes = 0 |
|
|||
292 |
|
291 | |||
293 | def zgenerator(f): |
|
292 | def zgenerator(f): | |
294 | zd = zlib.decompressobj() |
|
293 | zd = zlib.decompressobj() | |
295 | try: |
|
294 | try: | |
296 | for chnk in f: |
|
295 | for chnk in f: | |
297 | yield zd.decompress(chnk) |
|
296 | yield zd.decompress(chnk) | |
298 |
except httplib.HTTPException |
|
297 | except httplib.HTTPException: | |
299 | raise IOError(None, _('connection ended unexpectedly')) |
|
298 | raise IOError(None, _('connection ended unexpectedly')) | |
300 | yield zd.flush() |
|
299 | yield zd.flush() | |
301 |
|
300 |
@@ -116,7 +116,6 b' class lazyparser(object):' | |||||
116 | which takes much less time. |
|
116 | which takes much less time. | |
117 | """ |
|
117 | """ | |
118 | if self.allmap: return |
|
118 | if self.allmap: return | |
119 | start = 0 |
|
|||
120 | end = self.datasize |
|
119 | end = self.datasize | |
121 | self.allmap = 1 |
|
120 | self.allmap = 1 | |
122 | cur = 0 |
|
121 | cur = 0 |
@@ -615,7 +615,8 b' else:' | |||||
615 | try: |
|
615 | try: | |
616 | rcs.extend([os.path.join(rcdir, f) for f in os.listdir(rcdir) |
|
616 | rcs.extend([os.path.join(rcdir, f) for f in os.listdir(rcdir) | |
617 | if f.endswith(".rc")]) |
|
617 | if f.endswith(".rc")]) | |
618 |
except OSError |
|
618 | except OSError: | |
|
619 | pass | |||
619 | return rcs |
|
620 | return rcs | |
620 |
|
621 | |||
621 | def os_rcpath(): |
|
622 | def os_rcpath(): |
General Comments 0
You need to be logged in to leave comments.
Login now