| indygreg |
| hg-reviewers |
| Lint Skipped |
| Unit Tests Skipped |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/httppeer.py (6 lines) |
| if varyheaders: | if varyheaders: | ||||
| headers[r'Vary'] = r','.join(varyheaders) | headers[r'Vary'] = r','.join(varyheaders) | ||||
| req = self._requestbuilder(pycompat.strurl(cu), data, headers) | req = self._requestbuilder(pycompat.strurl(cu), data, headers) | ||||
| if data is not None: | if data is not None: | ||||
| self.ui.debug("sending %d bytes\n" % size) | self.ui.debug("sending %d bytes\n" % size) | ||||
| req.add_unredirected_header('Content-Length', '%d' % size) | req.add_unredirected_header(r'Content-Length', r'%d' % size) | ||||
| try: | try: | ||||
| resp = self._openurl(req) | resp = self._openurl(req) | ||||
| except urlerr.httperror as inst: | except urlerr.httperror as inst: | ||||
| if inst.code == 401: | if inst.code == 401: | ||||
| raise error.Abort(_('authorization failed')) | raise error.Abort(_('authorization failed')) | ||||
| raise | raise | ||||
| except httplib.HTTPException as inst: | except httplib.HTTPException as inst: | ||||
| self.ui.debug('http error while sending %s command\n' % cmd) | self.ui.debug('http error while sending %s command\n' % cmd) | ||||
| types = [""] | types = [""] | ||||
| for x in types: | for x in types: | ||||
| if x in bundle2.bundletypes: | if x in bundle2.bundletypes: | ||||
| type = x | type = x | ||||
| break | break | ||||
| tempname = bundle2.writebundle(self.ui, cg, None, type) | tempname = bundle2.writebundle(self.ui, cg, None, type) | ||||
| fp = httpconnection.httpsendfile(self.ui, tempname, "rb") | fp = httpconnection.httpsendfile(self.ui, tempname, "rb") | ||||
| headers = {'Content-Type': 'application/mercurial-0.1'} | headers = {r'Content-Type': r'application/mercurial-0.1'} | ||||
| try: | try: | ||||
| r = self._call(cmd, data=fp, headers=headers, **args) | r = self._call(cmd, data=fp, headers=headers, **args) | ||||
| vals = r.split('\n', 1) | vals = r.split('\n', 1) | ||||
| if len(vals) < 2: | if len(vals) < 2: | ||||
| raise error.ResponseError(_("unexpected response:"), r) | raise error.ResponseError(_("unexpected response:"), r) | ||||
| return vals | return vals | ||||
| except socket.error as err: | except socket.error as err: | ||||
| fh = os.fdopen(fd, pycompat.sysstr("wb")) | fh = os.fdopen(fd, pycompat.sysstr("wb")) | ||||
| d = fp.read(4096) | d = fp.read(4096) | ||||
| while d: | while d: | ||||
| fh.write(d) | fh.write(d) | ||||
| d = fp.read(4096) | d = fp.read(4096) | ||||
| fh.close() | fh.close() | ||||
| # start http push | # start http push | ||||
| fp_ = httpconnection.httpsendfile(self.ui, filename, "rb") | fp_ = httpconnection.httpsendfile(self.ui, filename, "rb") | ||||
| headers = {'Content-Type': 'application/mercurial-0.1'} | headers = {r'Content-Type': r'application/mercurial-0.1'} | ||||
| return self._callstream(cmd, data=fp_, headers=headers, **args) | return self._callstream(cmd, data=fp_, headers=headers, **args) | ||||
| finally: | finally: | ||||
| if fp_ is not None: | if fp_ is not None: | ||||
| fp_.close() | fp_.close() | ||||
| if fh is not None: | if fh is not None: | ||||
| fh.close() | fh.close() | ||||
| os.unlink(filename) | os.unlink(filename) | ||||