Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/hgweb/protocol.py @ 12704:ca6e2adc3e4d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
wireproto/http: drain the incoming bundle in case of errors
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Mon, 11 Oct 2010 12:47:11 -0500
parents 40bb5853fc4b
children 3458c15ab2f0
comparison
equal deleted inserted replaced
12703:40bb5853fc4b 12704:ca6e2adc3e4d
65 val = sys.stdout.getvalue() 65 val = sys.stdout.getvalue()
66 sys.stdout, sys.stderr = p.oldio 66 sys.stdout, sys.stderr = p.oldio
67 req.respond(HTTP_OK, HGTYPE) 67 req.respond(HTTP_OK, HGTYPE)
68 return ['%d\n%s' % (rsp.res, val)] 68 return ['%d\n%s' % (rsp.res, val)]
69 elif isinstance(rsp, wireproto.pusherr): 69 elif isinstance(rsp, wireproto.pusherr):
70 # drain the incoming bundle
71 req.drain()
70 sys.stdout, sys.stderr = p.oldio 72 sys.stdout, sys.stderr = p.oldio
71 rsp = '0\n%s\n' % rsp.res 73 rsp = '0\n%s\n' % rsp.res
72 req.respond(HTTP_OK, HGTYPE, length=len(rsp)) 74 req.respond(HTTP_OK, HGTYPE, length=len(rsp))
73 return [rsp] 75 return [rsp]