mercurial-scm/hg-stable: mercurial/httprepo.py annotate

annotate mercurial/httprepo.py @ 14076:924c82157d46

url: move URL parsing functions into util to improve startup time The introduction of the new URL parsing code has created a startup time regression. This is mainly due to the use of url.hasscheme() in the ui class. It ends up importing many libraries that the url module requires. This fix helps marginally, but if we can get rid of the urllib import in the URL parser all together, startup time will go back to normal. perfstartup time before the URL refactoring (8796fb6af67e): ! wall 0.050692 comb 0.000000 user 0.000000 sys 0.000000 (best of 100) current startup time (139fb11210bb): ! wall 0.070685 comb 0.000000 user 0.000000 sys 0.000000 (best of 100) after this change: ! wall 0.064667 comb 0.000000 user 0.000000 sys 0.000000 (best of 100)

author	Brodie Rao <brodie@bitheap.org>
date	Sat, 30 Apr 2011 09:43:20 -0700
parents	aaa9a5989405
children	ce99d887585f

rev	line source
1089 142b5d5ec9cc Break apart hg.py mpm@selenic.com parents: 1072 diff changeset	1 # httprepo.py - HTTP repository proxy classes for mercurial
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	2 #
2859 345bac2bc4ec update copyrights. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2740 diff changeset	3 # Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
345bac2bc4ec update copyrights. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2740 diff changeset	4 # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com>
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	5 #
8225 46293a0c7e9f updated license to be explicit about GPL version 2 Martin Geisler <mg@lazybytes.net> parents: 8206 diff changeset	6 # This software may be used and distributed according to the terms of the
10263 25e572394f5c Update license to GPLv2+ Matt Mackall <mpm@selenic.com> parents: 9878 diff changeset	7 # GNU General Public License version 2 or any later version.
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	8
12062 c327bfa5e831 cleanup: remove unused imports Brodie Rao <brodie@bitheap.org> parents: 11759 diff changeset	9 from node import nullid
3891 6b4127c7d52a Simplify i18n imports Matt Mackall <mpm@selenic.com> parents: 3877 diff changeset	10 from i18n import _
12062 c327bfa5e831 cleanup: remove unused imports Brodie Rao <brodie@bitheap.org> parents: 11759 diff changeset	11 import changegroup, statichttprepo, error, url, util, wireproto
13819 d16894e29f91 httprepo/sshrepo: use url.url Brodie Rao <brodie@bitheap.org> parents: 13603 diff changeset	12 import os, urllib, urllib2, zlib, httplib
8312 b87a50b7125c separate import lines from mercurial and general python modules Simon Heimberg <simohe@besonet.ch> parents: 8225 diff changeset	13 import errno, socket
4678 a814a5b11fff Work around urllib2 digest auth bug with Python < 2.5 Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4633 diff changeset	14
3661 e99ba8726bda remove duplicate zgenerator in httprepo Matt Mackall <mpm@selenic.com> parents: 3614 diff changeset	15 def zgenerator(f):
e99ba8726bda remove duplicate zgenerator in httprepo Matt Mackall <mpm@selenic.com> parents: 3614 diff changeset	16 zd = zlib.decompressobj()
e99ba8726bda remove duplicate zgenerator in httprepo Matt Mackall <mpm@selenic.com> parents: 3614 diff changeset	17 try:
e99ba8726bda remove duplicate zgenerator in httprepo Matt Mackall <mpm@selenic.com> parents: 3614 diff changeset	18 for chunk in util.filechunkiter(f):
11757 65bd4b8e48bd httprepo: decompress stream incrementally to reduce memory usage Matt Mackall <mpm@selenic.com> parents: 11370 diff changeset	19 while chunk:
65bd4b8e48bd httprepo: decompress stream incrementally to reduce memory usage Matt Mackall <mpm@selenic.com> parents: 11370 diff changeset	20 yield zd.decompress(chunk, 2**18)
65bd4b8e48bd httprepo: decompress stream incrementally to reduce memory usage Matt Mackall <mpm@selenic.com> parents: 11370 diff changeset	21 chunk = zd.unconsumed_tail
7280 810ca383da9c remove unused variables Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7279 diff changeset	22 except httplib.HTTPException:
3661 e99ba8726bda remove duplicate zgenerator in httprepo Matt Mackall <mpm@selenic.com> parents: 3614 diff changeset	23 raise IOError(None, _('connection ended unexpectedly'))
e99ba8726bda remove duplicate zgenerator in httprepo Matt Mackall <mpm@selenic.com> parents: 3614 diff changeset	24 yield zd.flush()
e99ba8726bda remove duplicate zgenerator in httprepo Matt Mackall <mpm@selenic.com> parents: 3614 diff changeset	25
11587 a036f6bd1da3 protocol: unify basic http client requests Matt Mackall <mpm@selenic.com> parents: 11567 diff changeset	26 class httprepository(wireproto.wirerepository):
60 e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	27 def __init__(self, ui, path):
2673 109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2612 diff changeset	28 self.path = path
2442 c660691fb45d http: query server for capabilities Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2439 diff changeset	29 self.caps = None
4132 0d94e4a3ddb4 Close keepalive connections to fix server traceback Andrei Vermel <avermel@mail.ru> parents: 4025 diff changeset	30 self.handler = None
14076 924c82157d46 url: move URL parsing functions into util to improve startup time Brodie Rao <brodie@bitheap.org> parents: 14060 diff changeset	31 u = util.url(path)
13819 d16894e29f91 httprepo/sshrepo: use url.url Brodie Rao <brodie@bitheap.org> parents: 13603 diff changeset	32 if u.query or u.fragment:
2337 3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	33 raise util.Abort(_('unsupported URL component: "%s"') %
13819 d16894e29f91 httprepo/sshrepo: use url.url Brodie Rao <brodie@bitheap.org> parents: 13603 diff changeset	34 (u.query or u.fragment))
2337 3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	35
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	36 # urllib cannot handle URLs with embedded user or passwd
13819 d16894e29f91 httprepo/sshrepo: use url.url Brodie Rao <brodie@bitheap.org> parents: 13603 diff changeset	37 self._url, authinfo = u.authinfo()
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7269 diff changeset	38
60 e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	39 self.ui = ui
9467 4c041f1ee1b4 do not attempt to translate ui.debug output Martin Geisler <mg@lazybytes.net> parents: 8563 diff changeset	40 self.ui.debug('using %s\n' % self._url)
2337 3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	41
7270 2db33c1a5654 factor out the url handling from httprepo Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7269 diff changeset	42 self.urlopener = url.opener(ui, authinfo)
4516 96d8a56d4ef9 Removed trailing whitespace and tabs from python files Thomas Arendsen Hein <thomas@intevation.de> parents: 4369 diff changeset	43
7752 998fc8f62539 close sockets on httprepository deletion (issue1487) Steve Borho <steve@borho.org> parents: 7641 diff changeset	44 def __del__(self):
998fc8f62539 close sockets on httprepository deletion (issue1487) Steve Borho <steve@borho.org> parents: 7641 diff changeset	45 for h in self.urlopener.handlers:
998fc8f62539 close sockets on httprepository deletion (issue1487) Steve Borho <steve@borho.org> parents: 7641 diff changeset	46 h.close()
998fc8f62539 close sockets on httprepository deletion (issue1487) Steve Borho <steve@borho.org> parents: 7641 diff changeset	47 if hasattr(h, "close_all"):
998fc8f62539 close sockets on httprepository deletion (issue1487) Steve Borho <steve@borho.org> parents: 7641 diff changeset	48 h.close_all()
998fc8f62539 close sockets on httprepository deletion (issue1487) Steve Borho <steve@borho.org> parents: 7641 diff changeset	49
2673 109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2612 diff changeset	50 def url(self):
109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2612 diff changeset	51 return self.path
109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2612 diff changeset	52
2442 c660691fb45d http: query server for capabilities Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2439 diff changeset	53 # look up capabilities only when needed
c660691fb45d http: query server for capabilities Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2439 diff changeset	54
13603 395a84f78736 httprepo: use caps instead of between for compat check Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13555 diff changeset	55 def _fetchcaps(self):
395a84f78736 httprepo: use caps instead of between for compat check Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13555 diff changeset	56 self.caps = set(self._call('capabilities').split())
395a84f78736 httprepo: use caps instead of between for compat check Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13555 diff changeset	57
2442 c660691fb45d http: query server for capabilities Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2439 diff changeset	58 def get_caps(self):
c660691fb45d http: query server for capabilities Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2439 diff changeset	59 if self.caps is None:
c660691fb45d http: query server for capabilities Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2439 diff changeset	60 try:
13603 395a84f78736 httprepo: use caps instead of between for compat check Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13555 diff changeset	61 self._fetchcaps()
7637 1d54e2f6c0b7 error: move repo errors Matt Mackall <mpm@selenic.com> parents: 7342 diff changeset	62 except error.RepoError:
8150 bbc24c0753a0 util: use built-in set and frozenset Martin Geisler <mg@lazybytes.net> parents: 8055 diff changeset	63 self.caps = set()
9467 4c041f1ee1b4 do not attempt to translate ui.debug output Martin Geisler <mg@lazybytes.net> parents: 8563 diff changeset	64 self.ui.debug('capabilities: %s\n' %
2465 c91118f425d0 push over http: client support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2447 diff changeset	65 (' '.join(self.caps or ['none'])))
2442 c660691fb45d http: query server for capabilities Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2439 diff changeset	66 return self.caps
c660691fb45d http: query server for capabilities Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2439 diff changeset	67
c660691fb45d http: query server for capabilities Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2439 diff changeset	68 capabilities = property(get_caps)
c660691fb45d http: query server for capabilities Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2439 diff changeset	69
1870 8a8ab47cccde make push over http print good error message. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1736 diff changeset	70 def lock(self):
8a8ab47cccde make push over http print good error message. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1736 diff changeset	71 raise util.Abort(_('operation not supported over http'))
8a8ab47cccde make push over http print good error message. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1736 diff changeset	72
11589 e8d22fe2ddab protocol: clean up call-like functions in http and ssh clients Matt Mackall <mpm@selenic.com> parents: 11588 diff changeset	73 def _callstream(self, cmd, **args):
13006 ea68947ad0ce httprepo: remove is-comparison with string literal Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 12969 diff changeset	74 if cmd == 'pushkey':
12969 6bd9778ae749 pushkey: force HTTP POST on push and add tests (issue2489) Matt Mackall <mpm@selenic.com> parents: 12062 diff changeset	75 args['data'] = ''
2465 c91118f425d0 push over http: client support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2447 diff changeset	76 data = args.pop('data', None)
c91118f425d0 push over http: client support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2447 diff changeset	77 headers = args.pop('headers', {})
9467 4c041f1ee1b4 do not attempt to translate ui.debug output Martin Geisler <mg@lazybytes.net> parents: 8563 diff changeset	78 self.ui.debug("sending %s command\n" % cmd)
13555 970150ddaaf8 httprepo: order URL query string fields for readability Steven Brown <StevenGBrown@gmail.com> parents: 13115 diff changeset	79 q = [('cmd', cmd)] + sorted(args.items())
3562 88b4755fa48f httprepo: record the url after a request, makes pull + redirect works Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3445 diff changeset	80 qs = '?%s' % urllib.urlencode(q)
88b4755fa48f httprepo: record the url after a request, makes pull + redirect works Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3445 diff changeset	81 cu = "%s%s" % (self._url, qs)
10491 d7e582cab6b6 http: len(x) fails if it doesn't fit into an int, use __len__() instead Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10282 diff changeset	82 req = urllib2.Request(cu, data, headers)
d7e582cab6b6 http: len(x) fails if it doesn't fit into an int, use __len__() instead Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10282 diff changeset	83 if data is not None:
d7e582cab6b6 http: len(x) fails if it doesn't fit into an int, use __len__() instead Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10282 diff changeset	84 # len(data) is broken if data doesn't fit into Py_ssize_t
d7e582cab6b6 http: len(x) fails if it doesn't fit into an int, use __len__() instead Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10282 diff changeset	85 # add the header ourself to avoid OverflowError
d7e582cab6b6 http: len(x) fails if it doesn't fit into an int, use __len__() instead Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10282 diff changeset	86 size = data.__len__()
d7e582cab6b6 http: len(x) fails if it doesn't fit into an int, use __len__() instead Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10282 diff changeset	87 self.ui.debug("sending %s bytes\n" % size)
d7e582cab6b6 http: len(x) fails if it doesn't fit into an int, use __len__() instead Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10282 diff changeset	88 req.add_unredirected_header('Content-Length', '%d' % size)
2294 ce67fa312f61 Catch urllib's HTTPException and give a meaningful error message to the user. Thomas Arendsen Hein <thomas@intevation.de> parents: 2281 diff changeset	89 try:
10491 d7e582cab6b6 http: len(x) fails if it doesn't fit into an int, use __len__() instead Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 10282 diff changeset	90 resp = self.urlopener.open(req)
2467 4e78dc71d946 http client: better work with authorization errors, broken sockets. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2465 diff changeset	91 except urllib2.HTTPError, inst:
4e78dc71d946 http client: better work with authorization errors, broken sockets. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2465 diff changeset	92 if inst.code == 401:
4e78dc71d946 http client: better work with authorization errors, broken sockets. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2465 diff changeset	93 raise util.Abort(_('authorization failed'))
4e78dc71d946 http client: better work with authorization errors, broken sockets. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2465 diff changeset	94 raise
2294 ce67fa312f61 Catch urllib's HTTPException and give a meaningful error message to the user. Thomas Arendsen Hein <thomas@intevation.de> parents: 2281 diff changeset	95 except httplib.HTTPException, inst:
9467 4c041f1ee1b4 do not attempt to translate ui.debug output Martin Geisler <mg@lazybytes.net> parents: 8563 diff changeset	96 self.ui.debug('http error while sending %s command\n' % cmd)
8206 cce63ef1045b ui: print_exc() -> traceback() Matt Mackall <mpm@selenic.com> parents: 8150 diff changeset	97 self.ui.traceback()
2336 f77edcffb837 http: print better error if exception happens. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2294 diff changeset	98 raise IOError(None, inst)
3399 5dbb3a991bbf Catch python2.3's IndexError with bogus http proxy settings. (issue203) Thomas Arendsen Hein <thomas@intevation.de> parents: 3223 diff changeset	99 except IndexError:
5dbb3a991bbf Catch python2.3's IndexError with bogus http proxy settings. (issue203) Thomas Arendsen Hein <thomas@intevation.de> parents: 3223 diff changeset	100 # this only happens with Python 2.3, later versions raise URLError
5dbb3a991bbf Catch python2.3's IndexError with bogus http proxy settings. (issue203) Thomas Arendsen Hein <thomas@intevation.de> parents: 3223 diff changeset	101 raise util.Abort(_('http error, possibly caused by proxy setting'))
3562 88b4755fa48f httprepo: record the url after a request, makes pull + redirect works Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3445 diff changeset	102 # record the url we got redirected to
3570 c141d07198b9 Inform the user about the new URL when being redirected via http. Thomas Arendsen Hein <thomas@intevation.de> parents: 3569 diff changeset	103 resp_url = resp.geturl()
c141d07198b9 Inform the user about the new URL when being redirected via http. Thomas Arendsen Hein <thomas@intevation.de> parents: 3569 diff changeset	104 if resp_url.endswith(qs):
c141d07198b9 Inform the user about the new URL when being redirected via http. Thomas Arendsen Hein <thomas@intevation.de> parents: 3569 diff changeset	105 resp_url = resp_url[:-len(qs)]
9881 54b518fc6671 httprepo: suppress the `real URL is...' message in safe, common cases. Dan Villiom Podlaski Christiansen <danchr@gmail.com> parents: 9878 diff changeset	106 if self._url.rstrip('/') != resp_url.rstrip('/'):
3570 c141d07198b9 Inform the user about the new URL when being redirected via http. Thomas Arendsen Hein <thomas@intevation.de> parents: 3569 diff changeset	107 self.ui.status(_('real URL is %s\n') % resp_url)
10208 37c4ce51a12d httprepo: always store the response url (issue1968) Steve Borho <steve@borho.org> parents: 9881 diff changeset	108 self._url = resp_url
2435 ff2bac730b99 http client: support persistent connections. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2337 diff changeset	109 try:
ff2bac730b99 http client: support persistent connections. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2337 diff changeset	110 proto = resp.getheader('content-type')
ff2bac730b99 http client: support persistent connections. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2337 diff changeset	111 except AttributeError:
ff2bac730b99 http client: support persistent connections. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2337 diff changeset	112 proto = resp.headers['content-type']
752 c693eafd5967 Simplify content type checking mpm@selenic.com parents: 751 diff changeset	113
14076 924c82157d46 url: move URL parsing functions into util to improve startup time Brodie Rao <brodie@bitheap.org> parents: 14060 diff changeset	114 safeurl = util.hidepassword(self._url)
753 8760d0c83b9b Check protocol versions mpm@selenic.com parents: 752 diff changeset	115 # accept old "text/plain" and "application/hg-changegroup" for now
4633 ff7253a0d1da Cleanup of whitespace, indentation and line continuation. Thomas Arendsen Hein <thomas@intevation.de> parents: 4516 diff changeset	116 if not (proto.startswith('application/mercurial-') or
ff7253a0d1da Cleanup of whitespace, indentation and line continuation. Thomas Arendsen Hein <thomas@intevation.de> parents: 4516 diff changeset	117 proto.startswith('text/plain') or
ff7253a0d1da Cleanup of whitespace, indentation and line continuation. Thomas Arendsen Hein <thomas@intevation.de> parents: 4516 diff changeset	118 proto.startswith('application/hg-changegroup')):
14076 924c82157d46 url: move URL parsing functions into util to improve startup time Brodie Rao <brodie@bitheap.org> parents: 14060 diff changeset	119 self.ui.debug("requested URL: '%s'\n" % util.hidepassword(cu))
10282 08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	120 raise error.RepoError(
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	121 _("'%s' does not appear to be an hg repository:\n"
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	122 "---%%<--- (%s)\n%s\n---%%<---\n")
08a0f04b56bd many, many trivial check-code fixups Matt Mackall <mpm@selenic.com> parents: 10264 diff changeset	123 % (safeurl, proto, resp.read()))
752 c693eafd5967 Simplify content type checking mpm@selenic.com parents: 751 diff changeset	124
4012 d1e31d7f7d44 fix handling of multiple Content-type headers Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3703 diff changeset	125 if proto.startswith('application/mercurial-'):
d1e31d7f7d44 fix handling of multiple Content-type headers Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3703 diff changeset	126 try:
4356 aed9e6dceb85 Avoid float rounding errors when checking http protocol version. Thomas Arendsen Hein <thomas@intevation.de> parents: 4226 diff changeset	127 version = proto.split('-', 1)[1]
aed9e6dceb85 Avoid float rounding errors when checking http protocol version. Thomas Arendsen Hein <thomas@intevation.de> parents: 4226 diff changeset	128 version_info = tuple([int(n) for n in version.split('.')])
4012 d1e31d7f7d44 fix handling of multiple Content-type headers Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3703 diff changeset	129 except ValueError:
7637 1d54e2f6c0b7 error: move repo errors Matt Mackall <mpm@selenic.com> parents: 7342 diff changeset	130 raise error.RepoError(_("'%s' sent a broken Content-Type "
8053 976170068286 hide passwords in httprepo error messages Steve Borho <steve@borho.org> parents: 7752 diff changeset	131 "header (%s)") % (safeurl, proto))
4356 aed9e6dceb85 Avoid float rounding errors when checking http protocol version. Thomas Arendsen Hein <thomas@intevation.de> parents: 4226 diff changeset	132 if version_info > (0, 1):
7637 1d54e2f6c0b7 error: move repo errors Matt Mackall <mpm@selenic.com> parents: 7342 diff changeset	133 raise error.RepoError(_("'%s' uses newer protocol %s") %
8053 976170068286 hide passwords in httprepo error messages Steve Borho <steve@borho.org> parents: 7752 diff changeset	134 (safeurl, version))
753 8760d0c83b9b Check protocol versions mpm@selenic.com parents: 752 diff changeset	135
752 c693eafd5967 Simplify content type checking mpm@selenic.com parents: 751 diff changeset	136 return resp
60 e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	137
11589 e8d22fe2ddab protocol: clean up call-like functions in http and ssh clients Matt Mackall <mpm@selenic.com> parents: 11588 diff changeset	138 def _call(self, cmd, **args):
e8d22fe2ddab protocol: clean up call-like functions in http and ssh clients Matt Mackall <mpm@selenic.com> parents: 11588 diff changeset	139 fp = self._callstream(cmd, **args)
2435 ff2bac730b99 http client: support persistent connections. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2337 diff changeset	140 try:
ff2bac730b99 http client: support persistent connections. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2337 diff changeset	141 return fp.read()
ff2bac730b99 http client: support persistent connections. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2337 diff changeset	142 finally:
ff2bac730b99 http client: support persistent connections. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2337 diff changeset	143 # if using keepalive, allow connection to be reused
ff2bac730b99 http client: support persistent connections. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2337 diff changeset	144 fp.close()
ff2bac730b99 http client: support persistent connections. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2337 diff changeset	145
11592 26e0782b8380 protocol: unify client unbundle support Matt Mackall <mpm@selenic.com> parents: 11591 diff changeset	146 def _callpush(self, cmd, cg, **args):
2465 c91118f425d0 push over http: client support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2447 diff changeset	147 # have to stream bundle to a temp file because we do not have
c91118f425d0 push over http: client support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2447 diff changeset	148 # http 1.1 chunked transfer.
c91118f425d0 push over http: client support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2447 diff changeset	149
3662 f4dc02d7fb71 unduplicate bundle writing code from httprepo Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	150 types = self.capable('unbundle')
3703 e674cae8efee fix push over HTTP to older servers Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3662 diff changeset	151 try:
e674cae8efee fix push over HTTP to older servers Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3662 diff changeset	152 types = types.split(',')
e674cae8efee fix push over HTTP to older servers Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3662 diff changeset	153 except AttributeError:
14060 aaa9a5989405 bundle: more comments about the different header types, remove useless if Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 13819 diff changeset	154 # servers older than d1b16a746db6 will send 'unbundle' as a
aaa9a5989405 bundle: more comments about the different header types, remove useless if Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 13819 diff changeset	155 # boolean capability. They only support headerless/uncompressed
aaa9a5989405 bundle: more comments about the different header types, remove useless if Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 13819 diff changeset	156 # bundles.
3703 e674cae8efee fix push over HTTP to older servers Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3662 diff changeset	157 types = [""]
14060 aaa9a5989405 bundle: more comments about the different header types, remove useless if Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 13819 diff changeset	158 for x in types:
aaa9a5989405 bundle: more comments about the different header types, remove useless if Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 13819 diff changeset	159 if x in changegroup.bundletypes:
aaa9a5989405 bundle: more comments about the different header types, remove useless if Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 13819 diff changeset	160 type = x
aaa9a5989405 bundle: more comments about the different header types, remove useless if Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 13819 diff changeset	161 break
3613 cbf352b9a3cd Client support for hgweb unbundle with versions. Thomas Arendsen Hein <thomas@intevation.de> parents: 3609 diff changeset	162
3662 f4dc02d7fb71 unduplicate bundle writing code from httprepo Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	163 tempname = changegroup.writebundle(cg, None, type)
13115 bda5f35fbf67 httpsendfile: record progress information during read() Augie Fackler <durin42@gmail.com> parents: 13006 diff changeset	164 fp = url.httpsendfile(self.ui, tempname, "rb")
11592 26e0782b8380 protocol: unify client unbundle support Matt Mackall <mpm@selenic.com> parents: 11591 diff changeset	165 headers = {'Content-Type': 'application/mercurial-0.1'}
26e0782b8380 protocol: unify client unbundle support Matt Mackall <mpm@selenic.com> parents: 11591 diff changeset	166
2465 c91118f425d0 push over http: client support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2447 diff changeset	167 try:
c91118f425d0 push over http: client support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2447 diff changeset	168 try:
11592 26e0782b8380 protocol: unify client unbundle support Matt Mackall <mpm@selenic.com> parents: 11591 diff changeset	169 r = self._call(cmd, data=fp, headers=headers, **args)
26e0782b8380 protocol: unify client unbundle support Matt Mackall <mpm@selenic.com> parents: 11591 diff changeset	170 return r.split('\n', 1)
2467 4e78dc71d946 http client: better work with authorization errors, broken sockets. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2465 diff changeset	171 except socket.error, err:
11567 34cc8b84407f removed exception args indexing (not supported by py3k) Renato Cunha <renatoc@gmail.com> parents: 11370 diff changeset	172 if err.args[0] in (errno.ECONNRESET, errno.EPIPE):
34cc8b84407f removed exception args indexing (not supported by py3k) Renato Cunha <renatoc@gmail.com> parents: 11370 diff changeset	173 raise util.Abort(_('push failed: %s') % err.args[1])
34cc8b84407f removed exception args indexing (not supported by py3k) Renato Cunha <renatoc@gmail.com> parents: 11370 diff changeset	174 raise util.Abort(err.args[1])
2465 c91118f425d0 push over http: client support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2447 diff changeset	175 finally:
c91118f425d0 push over http: client support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2447 diff changeset	176 fp.close()
c91118f425d0 push over http: client support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2447 diff changeset	177 os.unlink(tempname)
2439 e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2435 diff changeset	178
11592 26e0782b8380 protocol: unify client unbundle support Matt Mackall <mpm@selenic.com> parents: 11591 diff changeset	179 def _abort(self, exception):
26e0782b8380 protocol: unify client unbundle support Matt Mackall <mpm@selenic.com> parents: 11591 diff changeset	180 raise exception
2612 ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	181
11592 26e0782b8380 protocol: unify client unbundle support Matt Mackall <mpm@selenic.com> parents: 11591 diff changeset	182 def _decompress(self, stream):
26e0782b8380 protocol: unify client unbundle support Matt Mackall <mpm@selenic.com> parents: 11591 diff changeset	183 return util.chunkbuffer(zgenerator(stream))
11370 db3f6f0e4e7d pushkey: add http support Matt Mackall <mpm@selenic.com> parents: 11153 diff changeset	184
923 c7a3b88505cd Add basic https support for pull mpm@selenic.com parents: 919 diff changeset	185 class httpsrepository(httprepository):
2569 52ce0d6bc375 HTTPS: fix python2.3, persistent connections, don't explode if SSL is not available Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2557 diff changeset	186 def __init__(self, ui, path):
7279 1f0f84660dea Fix https availability checking Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7270 diff changeset	187 if not url.has_https:
2569 52ce0d6bc375 HTTPS: fix python2.3, persistent connections, don't explode if SSL is not available Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2557 diff changeset	188 raise util.Abort(_('Python support for SSL and HTTPS '
52ce0d6bc375 HTTPS: fix python2.3, persistent connections, don't explode if SSL is not available Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2557 diff changeset	189 'is not installed'))
52ce0d6bc375 HTTPS: fix python2.3, persistent connections, don't explode if SSL is not available Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2557 diff changeset	190 httprepository.__init__(self, ui, path)
2740 386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2673 diff changeset	191
386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2673 diff changeset	192 def instance(ui, path, create):
386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2673 diff changeset	193 if create:
386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2673 diff changeset	194 raise util.Abort(_('cannot create new http repository'))
7211 25c0dee16ee0 Autodetect static-http Matt Mackall <mpm@selenic.com> parents: 7207 diff changeset	195 try:
25c0dee16ee0 Autodetect static-http Matt Mackall <mpm@selenic.com> parents: 7207 diff changeset	196 if path.startswith('https:'):
25c0dee16ee0 Autodetect static-http Matt Mackall <mpm@selenic.com> parents: 7207 diff changeset	197 inst = httpsrepository(ui, path)
25c0dee16ee0 Autodetect static-http Matt Mackall <mpm@selenic.com> parents: 7207 diff changeset	198 else:
25c0dee16ee0 Autodetect static-http Matt Mackall <mpm@selenic.com> parents: 7207 diff changeset	199 inst = httprepository(ui, path)
13603 395a84f78736 httprepo: use caps instead of between for compat check Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13555 diff changeset	200 try:
395a84f78736 httprepo: use caps instead of between for compat check Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13555 diff changeset	201 # Try to do useful work when checking compatibility.
395a84f78736 httprepo: use caps instead of between for compat check Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13555 diff changeset	202 # Usually saves a roundtrip since we want the caps anyway.
395a84f78736 httprepo: use caps instead of between for compat check Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13555 diff changeset	203 inst._fetchcaps()
395a84f78736 httprepo: use caps instead of between for compat check Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13555 diff changeset	204 except error.RepoError:
395a84f78736 httprepo: use caps instead of between for compat check Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13555 diff changeset	205 # No luck, try older compatibility check.
395a84f78736 httprepo: use caps instead of between for compat check Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13555 diff changeset	206 inst.between([(nullid, nullid)])
7211 25c0dee16ee0 Autodetect static-http Matt Mackall <mpm@selenic.com> parents: 7207 diff changeset	207 return inst
7637 1d54e2f6c0b7 error: move repo errors Matt Mackall <mpm@selenic.com> parents: 7342 diff changeset	208 except error.RepoError:
7211 25c0dee16ee0 Autodetect static-http Matt Mackall <mpm@selenic.com> parents: 7207 diff changeset	209 ui.note('(falling back to static-http)\n')
25c0dee16ee0 Autodetect static-http Matt Mackall <mpm@selenic.com> parents: 7207 diff changeset	210 return statichttprepo.instance(ui, "static-" + path, create)

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/httprepo.py @ 14076:924c82157d46