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

annotate mercurial/httprepo.py @ 4226:fffacca46f09

Work around a urllib2 bug in Python < 2.4.2 When urllib2 base64-encodes the password needed for the Proxy-authorization header, it forgets to remove the trailing "\n". Later, a "\r\n" sequence is appended to every header, as required by the standard. Some proxies interpret the resulting "\n\r\n" sequence in the same way as "\r\n\r\n": end of headers. This usually doesn't cause trouble for this request, but when the proxy tries to read the next one, it thinks the request starts with some garbage and returns a "400 - Bad Request" error.

author	Alexis S. L. Carvalho <alexis@cecm.usp.br>
date	Fri, 16 Mar 2007 00:22:53 -0300
parents	0d94e4a3ddb4
children	0d51eb296fb9 aed9e6dceb85

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 #
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	6 # This software may be used and distributed according to the terms
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	7 # of the GNU General Public License, incorporated herein by reference.
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	8
1089 142b5d5ec9cc Break apart hg.py mpm@selenic.com parents: 1072 diff changeset	9 from node import *
142b5d5ec9cc Break apart hg.py mpm@selenic.com parents: 1072 diff changeset	10 from remoterepo import *
1400 cf9a1233738a i18n first part: make '_' available for files who need it Benoit Boissinot <benoit.boissinot@ens-lyon.org parents: 1377 diff changeset	11 from i18n import gettext as _
1251 84cf8834efb5 Fix lots of exception-related problems. Bryan O'Sullivan <bos@serpentine.com> parents: 1089 diff changeset	12 from demandload import *
2015 1a09814a5b1f Catch HTTPException when reading from remote http repository. Thomas Arendsen Hein <thomas@intevation.de> parents: 1870 diff changeset	13 demandload(globals(), "hg os urllib urllib2 urlparse zlib util httplib")
3662 f4dc02d7fb71 unduplicate bundle writing code from httprepo Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	14 demandload(globals(), "errno keepalive tempfile socket changegroup")
926 b765e970c9ff Add a local() method to repository classes mpm@selenic.com parents: 923 diff changeset	15
2447 cd00531ecc16 httprepo: make "http://user:pass@host/" urls work Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2446 diff changeset	16 class passwordmgr(urllib2.HTTPPasswordMgrWithDefaultRealm):
2281 7761597b5da3 prompt user for http authentication info Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2015 diff changeset	17 def __init__(self, ui):
2447 cd00531ecc16 httprepo: make "http://user:pass@host/" urls work Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2446 diff changeset	18 urllib2.HTTPPasswordMgrWithDefaultRealm.__init__(self)
2281 7761597b5da3 prompt user for http authentication info Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2015 diff changeset	19 self.ui = ui
7761597b5da3 prompt user for http authentication info Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2015 diff changeset	20
7761597b5da3 prompt user for http authentication info Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2015 diff changeset	21 def find_user_password(self, realm, authuri):
2447 cd00531ecc16 httprepo: make "http://user:pass@host/" urls work Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2446 diff changeset	22 authinfo = urllib2.HTTPPasswordMgrWithDefaultRealm.find_user_password(
2281 7761597b5da3 prompt user for http authentication info Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2015 diff changeset	23 self, realm, authuri)
2556 f1ebc4311f47 Allow http://user@example.com URLs (i.e. without passwords) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2501 diff changeset	24 user, passwd = authinfo
f1ebc4311f47 Allow http://user@example.com URLs (i.e. without passwords) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2501 diff changeset	25 if user and passwd:
f1ebc4311f47 Allow http://user@example.com URLs (i.e. without passwords) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2501 diff changeset	26 return (user, passwd)
2281 7761597b5da3 prompt user for http authentication info Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2015 diff changeset	27
2446 1b2bbb2b4911 httprepo: fix small bug in authentication. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2442 diff changeset	28 if not self.ui.interactive:
2337 3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	29 raise util.Abort(_('http authorization required'))
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	30
2281 7761597b5da3 prompt user for http authentication info Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2015 diff changeset	31 self.ui.write(_("http authorization required\n"))
7761597b5da3 prompt user for http authentication info Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2015 diff changeset	32 self.ui.status(_("realm: %s\n") % realm)
2556 f1ebc4311f47 Allow http://user@example.com URLs (i.e. without passwords) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2501 diff changeset	33 if user:
f1ebc4311f47 Allow http://user@example.com URLs (i.e. without passwords) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2501 diff changeset	34 self.ui.status(_("user: %s\n") % user)
f1ebc4311f47 Allow http://user@example.com URLs (i.e. without passwords) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2501 diff changeset	35 else:
f1ebc4311f47 Allow http://user@example.com URLs (i.e. without passwords) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2501 diff changeset	36 user = self.ui.prompt(_("user:"), default=None)
f1ebc4311f47 Allow http://user@example.com URLs (i.e. without passwords) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2501 diff changeset	37
f1ebc4311f47 Allow http://user@example.com URLs (i.e. without passwords) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2501 diff changeset	38 if not passwd:
f1ebc4311f47 Allow http://user@example.com URLs (i.e. without passwords) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2501 diff changeset	39 passwd = self.ui.getpass()
2281 7761597b5da3 prompt user for http authentication info Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2015 diff changeset	40
7761597b5da3 prompt user for http authentication info Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2015 diff changeset	41 self.add_password(realm, authuri, user, passwd)
7761597b5da3 prompt user for http authentication info Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2015 diff changeset	42 return (user, passwd)
7761597b5da3 prompt user for http authentication info Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2015 diff changeset	43
2337 3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	44 def netlocsplit(netloc):
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	45 '''split [user[:passwd]@]host[:port] into 4-tuple.'''
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	46
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	47 a = netloc.find('@')
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	48 if a == -1:
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	49 user, passwd = None, None
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	50 else:
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	51 userpass, netloc = netloc[:a], netloc[a+1:]
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	52 c = userpass.find(':')
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	53 if c == -1:
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	54 user, passwd = urllib.unquote(userpass), None
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	55 else:
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	56 user = urllib.unquote(userpass[:c])
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	57 passwd = urllib.unquote(userpass[c+1:])
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	58 c = netloc.find(':')
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	59 if c == -1:
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	60 host, port = netloc, None
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	61 else:
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	62 host, port = netloc[:c], netloc[c+1:]
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	63 return host, port, user, passwd
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	64
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	65 def netlocunsplit(host, port, user=None, passwd=None):
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	66 '''turn host, port, user, passwd into [user[:passwd]@]host[:port].'''
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	67 if port:
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	68 hostport = host + ':' + port
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	69 else:
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	70 hostport = host
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	71 if user:
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	72 if passwd:
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	73 userpass = urllib.quote(user) + ':' + urllib.quote(passwd)
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	74 else:
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	75 userpass = urllib.quote(user)
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	76 return userpass + '@' + hostport
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	77 return hostport
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	78
4226 fffacca46f09 Work around a urllib2 bug in Python < 2.4.2 Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4132 diff changeset	79 # work around a bug in Python < 2.4.2
fffacca46f09 Work around a urllib2 bug in Python < 2.4.2 Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4132 diff changeset	80 # (it leaves a "\n" at the end of Proxy-authorization headers)
fffacca46f09 Work around a urllib2 bug in Python < 2.4.2 Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4132 diff changeset	81 class request(urllib2.Request):
fffacca46f09 Work around a urllib2 bug in Python < 2.4.2 Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4132 diff changeset	82 def add_header(self, key, val):
fffacca46f09 Work around a urllib2 bug in Python < 2.4.2 Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4132 diff changeset	83 if key.lower() == 'proxy-authorization':
fffacca46f09 Work around a urllib2 bug in Python < 2.4.2 Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4132 diff changeset	84 val = val.strip()
fffacca46f09 Work around a urllib2 bug in Python < 2.4.2 Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4132 diff changeset	85 return urllib2.Request.add_header(self, key, val)
fffacca46f09 Work around a urllib2 bug in Python < 2.4.2 Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4132 diff changeset	86
4025 d8b3edf88af0 Subclass file with a __len__ method instead of setting Content-length Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 4012 diff changeset	87 class httpsendfile(file):
d8b3edf88af0 Subclass file with a __len__ method instead of setting Content-length Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 4012 diff changeset	88 def __len__(self):
d8b3edf88af0 Subclass file with a __len__ method instead of setting Content-length Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 4012 diff changeset	89 return os.fstat(self.fileno()).st_size
2465 c91118f425d0 push over http: client support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2447 diff changeset	90
4025 d8b3edf88af0 Subclass file with a __len__ method instead of setting Content-length Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 4012 diff changeset	91 def _gen_sendfile(connection):
d8b3edf88af0 Subclass file with a __len__ method instead of setting Content-length Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 4012 diff changeset	92 def _sendfile(self, data):
d8b3edf88af0 Subclass file with a __len__ method instead of setting Content-length Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 4012 diff changeset	93 # send a file
d8b3edf88af0 Subclass file with a __len__ method instead of setting Content-length Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 4012 diff changeset	94 if isinstance(data, httpsendfile):
2465 c91118f425d0 push over http: client support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2447 diff changeset	95 # if auth required, some data sent twice, so rewind here
c91118f425d0 push over http: client support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2447 diff changeset	96 data.seek(0)
c91118f425d0 push over http: client support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2447 diff changeset	97 for chunk in util.filechunkiter(data):
4025 d8b3edf88af0 Subclass file with a __len__ method instead of setting Content-length Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 4012 diff changeset	98 connection.send(self, chunk)
d8b3edf88af0 Subclass file with a __len__ method instead of setting Content-length Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 4012 diff changeset	99 else:
d8b3edf88af0 Subclass file with a __len__ method instead of setting Content-length Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 4012 diff changeset	100 connection.send(self, data)
d8b3edf88af0 Subclass file with a __len__ method instead of setting Content-length Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 4012 diff changeset	101 return _sendfile
d8b3edf88af0 Subclass file with a __len__ method instead of setting Content-length Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 4012 diff changeset	102
d8b3edf88af0 Subclass file with a __len__ method instead of setting Content-length Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 4012 diff changeset	103 class httpconnection(keepalive.HTTPConnection):
d8b3edf88af0 Subclass file with a __len__ method instead of setting Content-length Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 4012 diff changeset	104 # must be able to send big bundle as stream.
d8b3edf88af0 Subclass file with a __len__ method instead of setting Content-length Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 4012 diff changeset	105 send = _gen_sendfile(keepalive.HTTPConnection)
2465 c91118f425d0 push over http: client support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2447 diff changeset	106
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	107 class basehttphandler(keepalive.HTTPHandler):
2465 c91118f425d0 push over http: client support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2447 diff changeset	108 def http_open(self, req):
c91118f425d0 push over http: client support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2447 diff changeset	109 return self.do_open(httpconnection, req)
c91118f425d0 push over http: client support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2447 diff changeset	110
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	111 has_https = hasattr(urllib2, 'HTTPSHandler')
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	112 if has_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	113 class httpsconnection(httplib.HTTPSConnection):
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	114 response_class = keepalive.HTTPResponse
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	115 # must be able to send big bundle as stream.
4025 d8b3edf88af0 Subclass file with a __len__ method instead of setting Content-length Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 4012 diff changeset	116 send = _gen_sendfile(httplib.HTTPSConnection)
2557 1727ff712a4e Fix push over https. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2556 diff changeset	117
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	118 class httphandler(basehttphandler, urllib2.HTTPSHandler):
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	119 def https_open(self, req):
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	120 return self.do_open(httpsconnection, req)
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	121 else:
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	122 class httphandler(basehttphandler):
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	123 pass
2557 1727ff712a4e Fix push over https. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2556 diff changeset	124
3661 e99ba8726bda remove duplicate zgenerator in httprepo Matt Mackall <mpm@selenic.com> parents: 3614 diff changeset	125 def zgenerator(f):
e99ba8726bda remove duplicate zgenerator in httprepo Matt Mackall <mpm@selenic.com> parents: 3614 diff changeset	126 zd = zlib.decompressobj()
e99ba8726bda remove duplicate zgenerator in httprepo Matt Mackall <mpm@selenic.com> parents: 3614 diff changeset	127 try:
e99ba8726bda remove duplicate zgenerator in httprepo Matt Mackall <mpm@selenic.com> parents: 3614 diff changeset	128 for chunk in util.filechunkiter(f):
e99ba8726bda remove duplicate zgenerator in httprepo Matt Mackall <mpm@selenic.com> parents: 3614 diff changeset	129 yield zd.decompress(chunk)
e99ba8726bda remove duplicate zgenerator in httprepo Matt Mackall <mpm@selenic.com> parents: 3614 diff changeset	130 except httplib.HTTPException, inst:
e99ba8726bda remove duplicate zgenerator in httprepo Matt Mackall <mpm@selenic.com> parents: 3614 diff changeset	131 raise IOError(None, _('connection ended unexpectedly'))
e99ba8726bda remove duplicate zgenerator in httprepo Matt Mackall <mpm@selenic.com> parents: 3614 diff changeset	132 yield zd.flush()
e99ba8726bda remove duplicate zgenerator in httprepo Matt Mackall <mpm@selenic.com> parents: 3614 diff changeset	133
926 b765e970c9ff Add a local() method to repository classes mpm@selenic.com parents: 923 diff changeset	134 class httprepository(remoterepository):
60 e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	135 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	136 self.path = path
2442 c660691fb45d http: query server for capabilities Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2439 diff changeset	137 self.caps = None
4132 0d94e4a3ddb4 Close keepalive connections to fix server traceback Andrei Vermel <avermel@mail.ru> parents: 4025 diff changeset	138 self.handler = None
2337 3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	139 scheme, netloc, urlpath, query, frag = urlparse.urlsplit(path)
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	140 if query or frag:
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	141 raise util.Abort(_('unsupported URL component: "%s"') %
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	142 (query or frag))
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	143 if not urlpath: urlpath = '/'
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	144 host, port, user, passwd = netlocsplit(netloc)
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	145
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	146 # urllib cannot handle URLs with embedded user or passwd
2673 109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2612 diff changeset	147 self._url = urlparse.urlunsplit((scheme, netlocunsplit(host, port),
109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2612 diff changeset	148 urlpath, '', ''))
60 e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	149 self.ui = ui
2337 3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	150
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	151 proxyurl = ui.config("http_proxy", "host") or os.getenv('http_proxy')
3131 cff3c58a5766 fix warnings spotted by pychecker Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3072 diff changeset	152 # XXX proxyauthinfo = None
4132 0d94e4a3ddb4 Close keepalive connections to fix server traceback Andrei Vermel <avermel@mail.ru> parents: 4025 diff changeset	153 self.handler = httphandler()
0d94e4a3ddb4 Close keepalive connections to fix server traceback Andrei Vermel <avermel@mail.ru> parents: 4025 diff changeset	154 handlers = [self.handler]
2337 3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	155
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	156 if proxyurl:
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	157 # proxy can be proper url or host[:port]
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	158 if not (proxyurl.startswith('http:') or
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	159 proxyurl.startswith('https:')):
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	160 proxyurl = 'http://' + proxyurl + '/'
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	161 snpqf = urlparse.urlsplit(proxyurl)
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	162 proxyscheme, proxynetloc, proxypath, proxyquery, proxyfrag = snpqf
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	163 hpup = netlocsplit(proxynetloc)
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	164
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	165 proxyhost, proxyport, proxyuser, proxypasswd = hpup
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	166 if not proxyuser:
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	167 proxyuser = ui.config("http_proxy", "user")
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	168 proxypasswd = ui.config("http_proxy", "passwd")
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	169
2337 3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	170 # see if we should use a proxy for this url
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	171 no_list = [ "localhost", "127.0.0.1" ]
2501 b73552a00b20 Make "[web] allow_push, deny_push" and "[http_proxy] no" use ui.configlist. Thomas Arendsen Hein <thomas@intevation.de> parents: 2484 diff changeset	172 no_list.extend([p.lower() for
b73552a00b20 Make "[web] allow_push, deny_push" and "[http_proxy] no" use ui.configlist. Thomas Arendsen Hein <thomas@intevation.de> parents: 2484 diff changeset	173 p in ui.configlist("http_proxy", "no")])
2337 3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	174 no_list.extend([p.strip().lower() for
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	175 p in os.getenv("no_proxy", '').split(',')
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	176 if p.strip()])
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	177 # "http_proxy.always" config is for running tests on localhost
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	178 if (not ui.configbool("http_proxy", "always") and
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	179 host.lower() in no_list):
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	180 ui.debug(_('disabling proxy for %s\n') % host)
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	181 else:
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	182 proxyurl = urlparse.urlunsplit((
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	183 proxyscheme, netlocunsplit(proxyhost, proxyport,
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	184 proxyuser, proxypasswd or ''),
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	185 proxypath, proxyquery, proxyfrag))
3608 802da51cab5b Use httpconnection even with proxies. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3570 diff changeset	186 handlers.append(urllib2.ProxyHandler({scheme: proxyurl}))
3223 53e843840349 Whitespace/Tab cleanup Thomas Arendsen Hein <thomas@intevation.de> parents: 3170 diff changeset	187 ui.debug(_('proxying through http://%s:%s\n') %
3170 36ab673f66a5 do not disclose proxy user and password in debug messages TK Soh <teekaysoh@yahoo.com> parents: 3131 diff changeset	188 (proxyhost, proxyport))
321 73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	189
2337 3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	190 # urllib2 takes proxy values from the environment and those
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	191 # will take precedence if found, so drop them
424 9294dce4b633 Allow override of HTTP_PROXY, http_proxy and no_proxy; make no_proxy work. Thomas Arendsen Hein <thomas@intevation.de> parents: 385 diff changeset	192 for env in ["HTTP_PROXY", "http_proxy", "no_proxy"]:
859 6390c377a9e6 Trap OSError when deleting env vars Edouard Gomez <ed.gomez@free.fr> parents: 856 diff changeset	193 try:
6390c377a9e6 Trap OSError when deleting env vars Edouard Gomez <ed.gomez@free.fr> parents: 856 diff changeset	194 if os.environ.has_key(env):
6390c377a9e6 Trap OSError when deleting env vars Edouard Gomez <ed.gomez@free.fr> parents: 856 diff changeset	195 del os.environ[env]
6390c377a9e6 Trap OSError when deleting env vars Edouard Gomez <ed.gomez@free.fr> parents: 856 diff changeset	196 except OSError:
6390c377a9e6 Trap OSError when deleting env vars Edouard Gomez <ed.gomez@free.fr> parents: 856 diff changeset	197 pass
321 73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	198
2337 3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	199 passmgr = passwordmgr(ui)
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	200 if user:
2556 f1ebc4311f47 Allow http://user@example.com URLs (i.e. without passwords) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2501 diff changeset	201 ui.debug(_('http auth: user %s, password %s\n') %
f1ebc4311f47 Allow http://user@example.com URLs (i.e. without passwords) Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2501 diff changeset	202 (user, passwd and '' len(passwd) or 'not set'))
2337 3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	203 passmgr.add_password(None, host, user, passwd or '')
321 73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	204
3608 802da51cab5b Use httpconnection even with proxies. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3570 diff changeset	205 handlers.extend((urllib2.HTTPBasicAuthHandler(passmgr),
802da51cab5b Use httpconnection even with proxies. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3570 diff changeset	206 urllib2.HTTPDigestAuthHandler(passmgr)))
802da51cab5b Use httpconnection even with proxies. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3570 diff changeset	207 opener = urllib2.build_opener(*handlers)
2281 7761597b5da3 prompt user for http authentication info Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2015 diff changeset	208
1359 51ac9a79f3e5 Set the user agent for httprepo communication Matt Mackall <mpm@selenic.com> parents: 1251 diff changeset	209 # 1.0 here is the _protocol_ version
51ac9a79f3e5 Set the user agent for httprepo communication Matt Mackall <mpm@selenic.com> parents: 1251 diff changeset	210 opener.addheaders = [('User-agent', 'mercurial/proto-1.0')]
321 73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	211 urllib2.install_opener(opener)
4132 0d94e4a3ddb4 Close keepalive connections to fix server traceback Andrei Vermel <avermel@mail.ru> parents: 4025 diff changeset	212
0d94e4a3ddb4 Close keepalive connections to fix server traceback Andrei Vermel <avermel@mail.ru> parents: 4025 diff changeset	213 def __del__(self):
0d94e4a3ddb4 Close keepalive connections to fix server traceback Andrei Vermel <avermel@mail.ru> parents: 4025 diff changeset	214 if self.handler:
0d94e4a3ddb4 Close keepalive connections to fix server traceback Andrei Vermel <avermel@mail.ru> parents: 4025 diff changeset	215 self.handler.close_all()
0d94e4a3ddb4 Close keepalive connections to fix server traceback Andrei Vermel <avermel@mail.ru> parents: 4025 diff changeset	216 self.handler = None
60 e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	217
2673 109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2612 diff changeset	218 def url(self):
109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2612 diff changeset	219 return self.path
109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2612 diff changeset	220
2442 c660691fb45d http: query server for capabilities Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2439 diff changeset	221 # look up capabilities only when needed
c660691fb45d http: query server for capabilities Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2439 diff changeset	222
c660691fb45d http: query server for capabilities Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2439 diff changeset	223 def get_caps(self):
c660691fb45d http: query server for capabilities Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2439 diff changeset	224 if self.caps is None:
c660691fb45d http: query server for capabilities Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2439 diff changeset	225 try:
c660691fb45d http: query server for capabilities Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2439 diff changeset	226 self.caps = self.do_read('capabilities').split()
c660691fb45d http: query server for capabilities Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2439 diff changeset	227 except hg.RepoError:
c660691fb45d http: query server for capabilities Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2439 diff changeset	228 self.caps = ()
2465 c91118f425d0 push over http: client support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2447 diff changeset	229 self.ui.debug(_('capabilities: %s\n') %
c91118f425d0 push over http: client support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2447 diff changeset	230 (' '.join(self.caps or ['none'])))
2442 c660691fb45d http: query server for capabilities Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2439 diff changeset	231 return self.caps
c660691fb45d http: query server for capabilities Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2439 diff changeset	232
c660691fb45d http: query server for capabilities Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2439 diff changeset	233 capabilities = property(get_caps)
c660691fb45d http: query server for capabilities Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2439 diff changeset	234
1870 8a8ab47cccde make push over http print good error message. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1736 diff changeset	235 def lock(self):
8a8ab47cccde make push over http print good error message. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1736 diff changeset	236 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	237
60 e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	238 def do_cmd(self, cmd, **args):
2465 c91118f425d0 push over http: client support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2447 diff changeset	239 data = args.pop('data', None)
c91118f425d0 push over http: client support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2447 diff changeset	240 headers = args.pop('headers', {})
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	241 self.ui.debug(_("sending %s command\n") % cmd)
60 e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	242 q = {"cmd": cmd}
e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	243 q.update(args)
3562 88b4755fa48f httprepo: record the url after a request, makes pull + redirect works Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3445 diff changeset	244 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	245 cu = "%s%s" % (self._url, qs)
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	246 try:
3567 3bab1fc0ab75 Turn bundle file into a string for http push, for urllib2 over proxies. Thomas Arendsen Hein <thomas@intevation.de> parents: 3566 diff changeset	247 if data:
3608 802da51cab5b Use httpconnection even with proxies. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3570 diff changeset	248 self.ui.debug(_("sending %s bytes\n") %
802da51cab5b Use httpconnection even with proxies. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3570 diff changeset	249 headers.get('content-length', 'X'))
4226 fffacca46f09 Work around a urllib2 bug in Python < 2.4.2 Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4132 diff changeset	250 resp = urllib2.urlopen(request(cu, data, headers))
2467 4e78dc71d946 http client: better work with authorization errors, broken sockets. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2465 diff changeset	251 except urllib2.HTTPError, inst:
4e78dc71d946 http client: better work with authorization errors, broken sockets. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2465 diff changeset	252 if inst.code == 401:
4e78dc71d946 http client: better work with authorization errors, broken sockets. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2465 diff changeset	253 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	254 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	255 except httplib.HTTPException, inst:
2336 f77edcffb837 http: print better error if exception happens. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2294 diff changeset	256 self.ui.debug(_('http error while sending %s command\n') % cmd)
f77edcffb837 http: print better error if exception happens. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2294 diff changeset	257 self.ui.print_exc()
f77edcffb837 http: print better error if exception happens. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2294 diff changeset	258 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	259 except IndexError:
5dbb3a991bbf Catch python2.3's IndexError with bogus http proxy settings. (issue203) Thomas Arendsen Hein <thomas@intevation.de> parents: 3223 diff changeset	260 # 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	261 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	262 # 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	263 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	264 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	265 resp_url = resp_url[:-len(qs)]
c141d07198b9 Inform the user about the new URL when being redirected via http. Thomas Arendsen Hein <thomas@intevation.de> parents: 3569 diff changeset	266 if self._url != resp_url:
c141d07198b9 Inform the user about the new URL when being redirected via http. Thomas Arendsen Hein <thomas@intevation.de> parents: 3569 diff changeset	267 self.ui.status(_('real URL is %s\n') % resp_url)
c141d07198b9 Inform the user about the new URL when being redirected via http. Thomas Arendsen Hein <thomas@intevation.de> parents: 3569 diff changeset	268 self._url = resp_url
2435 ff2bac730b99 http client: support persistent connections. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2337 diff changeset	269 try:
ff2bac730b99 http client: support persistent connections. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2337 diff changeset	270 proto = resp.getheader('content-type')
ff2bac730b99 http client: support persistent connections. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2337 diff changeset	271 except AttributeError:
ff2bac730b99 http client: support persistent connections. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2337 diff changeset	272 proto = resp.headers['content-type']
752 c693eafd5967 Simplify content type checking mpm@selenic.com parents: 751 diff changeset	273
753 8760d0c83b9b Check protocol versions mpm@selenic.com parents: 752 diff changeset	274 # accept old "text/plain" and "application/hg-changegroup" for now
4012 d1e31d7f7d44 fix handling of multiple Content-type headers Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3703 diff changeset	275 if not proto.startswith('application/mercurial-') and \
753 8760d0c83b9b Check protocol versions mpm@selenic.com parents: 752 diff changeset	276 not proto.startswith('text/plain') and \
8760d0c83b9b Check protocol versions mpm@selenic.com parents: 752 diff changeset	277 not proto.startswith('application/hg-changegroup'):
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	278 raise hg.RepoError(_("'%s' does not appear to be an hg repository") %
2673 109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2612 diff changeset	279 self._url)
752 c693eafd5967 Simplify content type checking mpm@selenic.com parents: 751 diff changeset	280
4012 d1e31d7f7d44 fix handling of multiple Content-type headers Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3703 diff changeset	281 if proto.startswith('application/mercurial-'):
d1e31d7f7d44 fix handling of multiple Content-type headers Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3703 diff changeset	282 try:
d1e31d7f7d44 fix handling of multiple Content-type headers Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3703 diff changeset	283 version = float(proto[22:])
d1e31d7f7d44 fix handling of multiple Content-type headers Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3703 diff changeset	284 except ValueError:
d1e31d7f7d44 fix handling of multiple Content-type headers Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3703 diff changeset	285 raise hg.RepoError(_("'%s' sent a broken Content-type "
d1e31d7f7d44 fix handling of multiple Content-type headers Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3703 diff changeset	286 "header (%s)") % (self._url, proto))
d1e31d7f7d44 fix handling of multiple Content-type headers Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3703 diff changeset	287 if version > 0.1:
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	288 raise hg.RepoError(_("'%s' uses newer protocol %s") %
2673 109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2612 diff changeset	289 (self._url, version))
753 8760d0c83b9b Check protocol versions mpm@selenic.com parents: 752 diff changeset	290
752 c693eafd5967 Simplify content type checking mpm@selenic.com parents: 751 diff changeset	291 return resp
60 e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	292
2435 ff2bac730b99 http client: support persistent connections. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2337 diff changeset	293 def do_read(self, cmd, **args):
ff2bac730b99 http client: support persistent connections. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2337 diff changeset	294 fp = self.do_cmd(cmd, **args)
ff2bac730b99 http client: support persistent connections. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2337 diff changeset	295 try:
ff2bac730b99 http client: support persistent connections. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2337 diff changeset	296 return fp.read()
ff2bac730b99 http client: support persistent connections. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2337 diff changeset	297 finally:
ff2bac730b99 http client: support persistent connections. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2337 diff changeset	298 # if using keepalive, allow connection to be reused
ff2bac730b99 http client: support persistent connections. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2337 diff changeset	299 fp.close()
ff2bac730b99 http client: support persistent connections. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2337 diff changeset	300
3444 3505fcd5a231 Adding changegroupsubset and lookup to web protocol so pull -r and Eric Hopper <hopper@omnifarious.org> parents: 3399 diff changeset	301 def lookup(self, key):
3445 233c733e4af5 httprepo: add support for passing lookup exception data Matt Mackall <mpm@selenic.com> parents: 3444 diff changeset	302 d = self.do_cmd("lookup", key = key).read()
233c733e4af5 httprepo: add support for passing lookup exception data Matt Mackall <mpm@selenic.com> parents: 3444 diff changeset	303 success, data = d[:-1].split(' ', 1)
233c733e4af5 httprepo: add support for passing lookup exception data Matt Mackall <mpm@selenic.com> parents: 3444 diff changeset	304 if int(success):
233c733e4af5 httprepo: add support for passing lookup exception data Matt Mackall <mpm@selenic.com> parents: 3444 diff changeset	305 return bin(data)
233c733e4af5 httprepo: add support for passing lookup exception data Matt Mackall <mpm@selenic.com> parents: 3444 diff changeset	306 raise hg.RepoError(data)
3444 3505fcd5a231 Adding changegroupsubset and lookup to web protocol so pull -r and Eric Hopper <hopper@omnifarious.org> parents: 3399 diff changeset	307
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	308 def heads(self):
2435 ff2bac730b99 http client: support persistent connections. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2337 diff changeset	309 d = self.do_read("heads")
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	310 try:
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	311 return map(bin, d[:-1].split(" "))
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	312 except:
3565 9073d7366776 Use the new UnexpectedOutput exception in httprepo, too. Thomas Arendsen Hein <thomas@intevation.de> parents: 3562 diff changeset	313 raise util.UnexpectedOutput(_("unexpected response:"), d)
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	314
60 e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	315 def branches(self, nodes):
e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	316 n = " ".join(map(hex, nodes))
2435 ff2bac730b99 http client: support persistent connections. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2337 diff changeset	317 d = self.do_read("branches", nodes=n)
217 e6d6497a6331 merge: catch unexpected responses mpm@selenic.com parents: 216 diff changeset	318 try:
e6d6497a6331 merge: catch unexpected responses mpm@selenic.com parents: 216 diff changeset	319 br = [ tuple(map(bin, b.split(" "))) for b in d.splitlines() ]
e6d6497a6331 merge: catch unexpected responses mpm@selenic.com parents: 216 diff changeset	320 return br
e6d6497a6331 merge: catch unexpected responses mpm@selenic.com parents: 216 diff changeset	321 except:
3565 9073d7366776 Use the new UnexpectedOutput exception in httprepo, too. Thomas Arendsen Hein <thomas@intevation.de> parents: 3562 diff changeset	322 raise util.UnexpectedOutput(_("unexpected response:"), d)
60 e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	323
e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	324 def between(self, pairs):
e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	325 n = "\n".join(["-".join(map(hex, p)) for p in pairs])
2435 ff2bac730b99 http client: support persistent connections. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2337 diff changeset	326 d = self.do_read("between", pairs=n)
217 e6d6497a6331 merge: catch unexpected responses mpm@selenic.com parents: 216 diff changeset	327 try:
e6d6497a6331 merge: catch unexpected responses mpm@selenic.com parents: 216 diff changeset	328 p = [ l and map(bin, l.split(" ")) or [] for l in d.splitlines() ]
e6d6497a6331 merge: catch unexpected responses mpm@selenic.com parents: 216 diff changeset	329 return p
e6d6497a6331 merge: catch unexpected responses mpm@selenic.com parents: 216 diff changeset	330 except:
3565 9073d7366776 Use the new UnexpectedOutput exception in httprepo, too. Thomas Arendsen Hein <thomas@intevation.de> parents: 3562 diff changeset	331 raise util.UnexpectedOutput(_("unexpected response:"), d)
60 e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	332
1736 50de0887bbcd add preoutgoing and outgoing hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1402 diff changeset	333 def changegroup(self, nodes, kind):
60 e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	334 n = " ".join(map(hex, nodes))
752 c693eafd5967 Simplify content type checking mpm@selenic.com parents: 751 diff changeset	335 f = self.do_cmd("changegroup", roots=n)
3661 e99ba8726bda remove duplicate zgenerator in httprepo Matt Mackall <mpm@selenic.com> parents: 3614 diff changeset	336 return util.chunkbuffer(zgenerator(f))
3444 3505fcd5a231 Adding changegroupsubset and lookup to web protocol so pull -r and Eric Hopper <hopper@omnifarious.org> parents: 3399 diff changeset	337
3505fcd5a231 Adding changegroupsubset and lookup to web protocol so pull -r and Eric Hopper <hopper@omnifarious.org> parents: 3399 diff changeset	338 def changegroupsubset(self, bases, heads, source):
3505fcd5a231 Adding changegroupsubset and lookup to web protocol so pull -r and Eric Hopper <hopper@omnifarious.org> parents: 3399 diff changeset	339 baselst = " ".join([hex(n) for n in bases])
3505fcd5a231 Adding changegroupsubset and lookup to web protocol so pull -r and Eric Hopper <hopper@omnifarious.org> parents: 3399 diff changeset	340 headlst = " ".join([hex(n) for n in heads])
3505fcd5a231 Adding changegroupsubset and lookup to web protocol so pull -r and Eric Hopper <hopper@omnifarious.org> parents: 3399 diff changeset	341 f = self.do_cmd("changegroupsubset", bases=baselst, heads=headlst)
3661 e99ba8726bda remove duplicate zgenerator in httprepo Matt Mackall <mpm@selenic.com> parents: 3614 diff changeset	342 return util.chunkbuffer(zgenerator(f))
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	343
2439 e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2435 diff changeset	344 def unbundle(self, cg, heads, source):
2465 c91118f425d0 push over http: client support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2447 diff changeset	345 # 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	346 # http 1.1 chunked transfer.
c91118f425d0 push over http: client support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2447 diff changeset	347
3662 f4dc02d7fb71 unduplicate bundle writing code from httprepo Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	348 type = ""
f4dc02d7fb71 unduplicate bundle writing code from httprepo Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	349 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	350 # servers older than d1b16a746db6 will send 'unbundle' as a
e674cae8efee fix push over HTTP to older servers Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3662 diff changeset	351 # boolean capability
e674cae8efee fix push over HTTP to older servers Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3662 diff changeset	352 try:
e674cae8efee fix push over HTTP to older servers Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3662 diff changeset	353 types = types.split(',')
e674cae8efee fix push over HTTP to older servers Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3662 diff changeset	354 except AttributeError:
e674cae8efee fix push over HTTP to older servers Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3662 diff changeset	355 types = [""]
3662 f4dc02d7fb71 unduplicate bundle writing code from httprepo Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	356 if types:
3703 e674cae8efee fix push over HTTP to older servers Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3662 diff changeset	357 for x in types:
3662 f4dc02d7fb71 unduplicate bundle writing code from httprepo Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	358 if x in changegroup.bundletypes:
f4dc02d7fb71 unduplicate bundle writing code from httprepo Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	359 type = x
f4dc02d7fb71 unduplicate bundle writing code from httprepo Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	360 break
3613 cbf352b9a3cd Client support for hgweb unbundle with versions. Thomas Arendsen Hein <thomas@intevation.de> parents: 3609 diff changeset	361
3662 f4dc02d7fb71 unduplicate bundle writing code from httprepo Matt Mackall <mpm@selenic.com> parents: 3661 diff changeset	362 tempname = changegroup.writebundle(cg, None, type)
4025 d8b3edf88af0 Subclass file with a __len__ method instead of setting Content-length Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 4012 diff changeset	363 fp = httpsendfile(tempname, "rb")
2465 c91118f425d0 push over http: client support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2447 diff changeset	364 try:
c91118f425d0 push over http: client support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2447 diff changeset	365 try:
2467 4e78dc71d946 http client: better work with authorization errors, broken sockets. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2465 diff changeset	366 rfp = self.do_cmd(
4e78dc71d946 http client: better work with authorization errors, broken sockets. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2465 diff changeset	367 'unbundle', data=fp,
4025 d8b3edf88af0 Subclass file with a __len__ method instead of setting Content-length Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 4012 diff changeset	368 headers={'content-type': 'application/octet-stream'},
2467 4e78dc71d946 http client: better work with authorization errors, broken sockets. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2465 diff changeset	369 heads=' '.join(map(hex, heads)))
4e78dc71d946 http client: better work with authorization errors, broken sockets. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2465 diff changeset	370 try:
4e78dc71d946 http client: better work with authorization errors, broken sockets. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2465 diff changeset	371 ret = int(rfp.readline())
4e78dc71d946 http client: better work with authorization errors, broken sockets. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2465 diff changeset	372 self.ui.write(rfp.read())
4e78dc71d946 http client: better work with authorization errors, broken sockets. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2465 diff changeset	373 return ret
4e78dc71d946 http client: better work with authorization errors, broken sockets. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2465 diff changeset	374 finally:
4e78dc71d946 http client: better work with authorization errors, broken sockets. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2465 diff changeset	375 rfp.close()
4e78dc71d946 http client: better work with authorization errors, broken sockets. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2465 diff changeset	376 except socket.error, err:
4e78dc71d946 http client: better work with authorization errors, broken sockets. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2465 diff changeset	377 if err[0] in (errno.ECONNRESET, errno.EPIPE):
3072 bc3fe3b5b785 Never apply string formatting to generated errors with util.Abort. Thomas Arendsen Hein <thomas@intevation.de> parents: 2859 diff changeset	378 raise util.Abort(_('push failed: %s') % err[1])
2467 4e78dc71d946 http client: better work with authorization errors, broken sockets. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2465 diff changeset	379 raise util.Abort(err[1])
2465 c91118f425d0 push over http: client support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2447 diff changeset	380 finally:
c91118f425d0 push over http: client support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2447 diff changeset	381 fp.close()
c91118f425d0 push over http: client support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2447 diff changeset	382 os.unlink(tempname)
2439 e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2435 diff changeset	383
2612 ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	384 def stream_out(self):
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	385 return self.do_cmd('stream_out')
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	386
923 c7a3b88505cd Add basic https support for pull mpm@selenic.com parents: 919 diff changeset	387 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	388 def __init__(self, ui, path):
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	389 if not has_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	390 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	391 '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	392 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	393
386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2673 diff changeset	394 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	395 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	396 raise util.Abort(_('cannot create new http repository'))
386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2673 diff changeset	397 if path.startswith('hg:'):
386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2673 diff changeset	398 ui.warn(_("hg:// syntax is deprecated, please use http:// instead\n"))
386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2673 diff changeset	399 path = 'http:' + path[3:]
386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2673 diff changeset	400 if path.startswith('https:'):
386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2673 diff changeset	401 return httpsrepository(ui, path)
386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2673 diff changeset	402 return httprepository(ui, path)

Mercurial > public > mercurial-scm > hg

annotate mercurial/httprepo.py @ 4226:fffacca46f09