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

annotate mercurial/httprepo.py @ 3570:c141d07198b9

Inform the user about the new URL when being redirected via http. Additionally the changed code ensures that the new URL is used, even if it doesn't end with the query string.

author	Thomas Arendsen Hein <thomas@intevation.de>
date	Sat, 28 Oct 2006 23:05:57 +0200
parents	a27d90c9336e
children	802da51cab5b

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")
2467 4e78dc71d946 http client: better work with authorization errors, broken sockets. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2465 diff changeset	14 demandload(globals(), "errno keepalive tempfile socket")
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
2465 c91118f425d0 push over http: client support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2447 diff changeset	79 class httpconnection(keepalive.HTTPConnection):
c91118f425d0 push over http: client support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2447 diff changeset	80 # must be able to send big bundle as stream.
c91118f425d0 push over http: client support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2447 diff changeset	81
c91118f425d0 push over http: client support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2447 diff changeset	82 def send(self, data):
c91118f425d0 push over http: client support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2447 diff changeset	83 if isinstance(data, str):
c91118f425d0 push over http: client support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2447 diff changeset	84 keepalive.HTTPConnection.send(self, data)
c91118f425d0 push over http: client support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2447 diff changeset	85 else:
c91118f425d0 push over http: client support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2447 diff changeset	86 # 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	87 data.seek(0)
c91118f425d0 push over http: client support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2447 diff changeset	88 for chunk in util.filechunkiter(data):
c91118f425d0 push over http: client support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2447 diff changeset	89 keepalive.HTTPConnection.send(self, chunk)
c91118f425d0 push over http: client support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2447 diff changeset	90
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	91 class basehttphandler(keepalive.HTTPHandler):
2465 c91118f425d0 push over http: client support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2447 diff changeset	92 def http_open(self, req):
c91118f425d0 push over http: client support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2447 diff changeset	93 return self.do_open(httpconnection, req)
c91118f425d0 push over http: client support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2447 diff changeset	94
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	95 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	96 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	97 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	98 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	99 # must be able to send big bundle as stream.
2557 1727ff712a4e Fix push over https. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2556 diff changeset	100
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	101 def send(self, data):
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	102 if isinstance(data, str):
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	103 httplib.HTTPSConnection.send(self, data)
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	104 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	105 # if auth required, some data sent twice, so rewind here
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	106 data.seek(0)
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 for chunk in util.filechunkiter(data):
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	108 httplib.HTTPSConnection.send(self, chunk)
2557 1727ff712a4e Fix push over https. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2556 diff changeset	109
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	110 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	111 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	112 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	113 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	114 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	115 pass
2557 1727ff712a4e Fix push over https. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2556 diff changeset	116
926 b765e970c9ff Add a local() method to repository classes mpm@selenic.com parents: 923 diff changeset	117 class httprepository(remoterepository):
60 e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	118 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	119 self.path = path
2442 c660691fb45d http: query server for capabilities Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2439 diff changeset	120 self.caps = 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	121 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	122 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	123 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	124 (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	125 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	126 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	127
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	128 # 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	129 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	130 urlpath, '', ''))
60 e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	131 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	132
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	133 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	134 # XXX proxyauthinfo = None
2465 c91118f425d0 push over http: client support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2447 diff changeset	135 handler = httphandler()
2337 3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	136
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	137 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	138 # 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	139 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	140 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	141 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	142 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	143 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	144 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	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 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	147 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	148 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	149 proxypasswd = ui.config("http_proxy", "passwd")
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 514 diff changeset	150
2337 3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	151 # 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	152 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	153 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	154 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	155 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	156 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	157 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	158 # "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	159 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	160 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	161 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	162 else:
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	163 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	164 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	165 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	166 proxypath, proxyquery, proxyfrag))
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	167 handler = urllib2.ProxyHandler({scheme: proxyurl})
3223 53e843840349 Whitespace/Tab cleanup Thomas Arendsen Hein <thomas@intevation.de> parents: 3170 diff changeset	168 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	169 (proxyhost, proxyport))
321 73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	170
2337 3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	171 # 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	172 # 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	173 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	174 try:
6390c377a9e6 Trap OSError when deleting env vars Edouard Gomez <ed.gomez@free.fr> parents: 856 diff changeset	175 if os.environ.has_key(env):
6390c377a9e6 Trap OSError when deleting env vars Edouard Gomez <ed.gomez@free.fr> parents: 856 diff changeset	176 del os.environ[env]
6390c377a9e6 Trap OSError when deleting env vars Edouard Gomez <ed.gomez@free.fr> parents: 856 diff changeset	177 except OSError:
6390c377a9e6 Trap OSError when deleting env vars Edouard Gomez <ed.gomez@free.fr> parents: 856 diff changeset	178 pass
321 73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	179
2337 3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	180 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	181 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	182 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	183 (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	184 passmgr.add_password(None, host, user, passwd or '')
321 73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	185
2337 3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	186 opener = urllib2.build_opener(
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	187 handler,
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	188 urllib2.HTTPBasicAuthHandler(passmgr),
3f24bc5dee81 http: fix many problems with url parsing and auth. added proxy test. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2336 diff changeset	189 urllib2.HTTPDigestAuthHandler(passmgr))
2281 7761597b5da3 prompt user for http authentication info Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2015 diff changeset	190
1359 51ac9a79f3e5 Set the user agent for httprepo communication Matt Mackall <mpm@selenic.com> parents: 1251 diff changeset	191 # 1.0 here is the _protocol_ version
51ac9a79f3e5 Set the user agent for httprepo communication Matt Mackall <mpm@selenic.com> parents: 1251 diff changeset	192 opener.addheaders = [('User-agent', 'mercurial/proto-1.0')]
321 73b8a8a059ec Transparent proxy support mpm@selenic.com parents: 317 diff changeset	193 urllib2.install_opener(opener)
60 e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	194
2673 109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2612 diff changeset	195 def url(self):
109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2612 diff changeset	196 return self.path
109a22f5434a hooks: add url to changegroup, incoming, prechangegroup, pretxnchangegroup hooks Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2612 diff changeset	197
2442 c660691fb45d http: query server for capabilities Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2439 diff changeset	198 # look up capabilities only when needed
c660691fb45d http: query server for capabilities Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2439 diff changeset	199
c660691fb45d http: query server for capabilities Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2439 diff changeset	200 def get_caps(self):
c660691fb45d http: query server for capabilities Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2439 diff changeset	201 if self.caps is None:
c660691fb45d http: query server for capabilities Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2439 diff changeset	202 try:
c660691fb45d http: query server for capabilities Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2439 diff changeset	203 self.caps = self.do_read('capabilities').split()
c660691fb45d http: query server for capabilities Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2439 diff changeset	204 except hg.RepoError:
c660691fb45d http: query server for capabilities Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2439 diff changeset	205 self.caps = ()
2465 c91118f425d0 push over http: client support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2447 diff changeset	206 self.ui.debug(_('capabilities: %s\n') %
c91118f425d0 push over http: client support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2447 diff changeset	207 (' '.join(self.caps or ['none'])))
2442 c660691fb45d http: query server for capabilities Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2439 diff changeset	208 return self.caps
c660691fb45d http: query server for capabilities Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2439 diff changeset	209
c660691fb45d http: query server for capabilities Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2439 diff changeset	210 capabilities = property(get_caps)
c660691fb45d http: query server for capabilities Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2439 diff changeset	211
1870 8a8ab47cccde make push over http print good error message. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1736 diff changeset	212 def lock(self):
8a8ab47cccde make push over http print good error message. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1736 diff changeset	213 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	214
60 e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	215 def do_cmd(self, cmd, **args):
2465 c91118f425d0 push over http: client support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2447 diff changeset	216 data = args.pop('data', None)
c91118f425d0 push over http: client support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2447 diff changeset	217 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	218 self.ui.debug(_("sending %s command\n") % cmd)
60 e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	219 q = {"cmd": cmd}
e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	220 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	221 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	222 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	223 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	224 if data:
3bab1fc0ab75 Turn bundle file into a string for http push, for urllib2 over proxies. Thomas Arendsen Hein <thomas@intevation.de> parents: 3566 diff changeset	225 if isinstance(data, file):
3bab1fc0ab75 Turn bundle file into a string for http push, for urllib2 over proxies. Thomas Arendsen Hein <thomas@intevation.de> parents: 3566 diff changeset	226 # urllib2 needs string or buffer when using a proxy
3bab1fc0ab75 Turn bundle file into a string for http push, for urllib2 over proxies. Thomas Arendsen Hein <thomas@intevation.de> parents: 3566 diff changeset	227 data.seek(0)
3bab1fc0ab75 Turn bundle file into a string for http push, for urllib2 over proxies. Thomas Arendsen Hein <thomas@intevation.de> parents: 3566 diff changeset	228 data = data.read()
3bab1fc0ab75 Turn bundle file into a string for http push, for urllib2 over proxies. Thomas Arendsen Hein <thomas@intevation.de> parents: 3566 diff changeset	229 self.ui.debug(_("sending %d bytes\n") % len(data))
2465 c91118f425d0 push over http: client support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2447 diff changeset	230 resp = urllib2.urlopen(urllib2.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	231 except urllib2.HTTPError, inst:
4e78dc71d946 http client: better work with authorization errors, broken sockets. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2465 diff changeset	232 if inst.code == 401:
4e78dc71d946 http client: better work with authorization errors, broken sockets. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2465 diff changeset	233 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	234 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	235 except httplib.HTTPException, inst:
2336 f77edcffb837 http: print better error if exception happens. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2294 diff changeset	236 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	237 self.ui.print_exc()
f77edcffb837 http: print better error if exception happens. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2294 diff changeset	238 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	239 except IndexError:
5dbb3a991bbf Catch python2.3's IndexError with bogus http proxy settings. (issue203) Thomas Arendsen Hein <thomas@intevation.de> parents: 3223 diff changeset	240 # 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	241 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	242 # 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	243 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	244 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	245 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	246 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	247 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	248 self._url = resp_url
2435 ff2bac730b99 http client: support persistent connections. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2337 diff changeset	249 try:
ff2bac730b99 http client: support persistent connections. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2337 diff changeset	250 proto = resp.getheader('content-type')
ff2bac730b99 http client: support persistent connections. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2337 diff changeset	251 except AttributeError:
ff2bac730b99 http client: support persistent connections. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2337 diff changeset	252 proto = resp.headers['content-type']
752 c693eafd5967 Simplify content type checking mpm@selenic.com parents: 751 diff changeset	253
753 8760d0c83b9b Check protocol versions mpm@selenic.com parents: 752 diff changeset	254 # accept old "text/plain" and "application/hg-changegroup" for now
8760d0c83b9b Check protocol versions mpm@selenic.com parents: 752 diff changeset	255 if not proto.startswith('application/mercurial') and \
8760d0c83b9b Check protocol versions mpm@selenic.com parents: 752 diff changeset	256 not proto.startswith('text/plain') and \
8760d0c83b9b Check protocol versions mpm@selenic.com parents: 752 diff changeset	257 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	258 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	259 self._url)
752 c693eafd5967 Simplify content type checking mpm@selenic.com parents: 751 diff changeset	260
753 8760d0c83b9b Check protocol versions mpm@selenic.com parents: 752 diff changeset	261 if proto.startswith('application/mercurial'):
8760d0c83b9b Check protocol versions mpm@selenic.com parents: 752 diff changeset	262 version = proto[22:]
8760d0c83b9b Check protocol versions mpm@selenic.com parents: 752 diff changeset	263 if float(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	264 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	265 (self._url, version))
753 8760d0c83b9b Check protocol versions mpm@selenic.com parents: 752 diff changeset	266
752 c693eafd5967 Simplify content type checking mpm@selenic.com parents: 751 diff changeset	267 return resp
60 e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	268
2435 ff2bac730b99 http client: support persistent connections. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2337 diff changeset	269 def do_read(self, cmd, **args):
ff2bac730b99 http client: support persistent connections. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2337 diff changeset	270 fp = self.do_cmd(cmd, **args)
ff2bac730b99 http client: support persistent connections. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2337 diff changeset	271 try:
ff2bac730b99 http client: support persistent connections. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2337 diff changeset	272 return fp.read()
ff2bac730b99 http client: support persistent connections. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2337 diff changeset	273 finally:
ff2bac730b99 http client: support persistent connections. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2337 diff changeset	274 # if using keepalive, allow connection to be reused
ff2bac730b99 http client: support persistent connections. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2337 diff changeset	275 fp.close()
ff2bac730b99 http client: support persistent connections. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2337 diff changeset	276
3444 3505fcd5a231 Adding changegroupsubset and lookup to web protocol so pull -r and Eric Hopper <hopper@omnifarious.org> parents: 3399 diff changeset	277 def lookup(self, key):
3445 233c733e4af5 httprepo: add support for passing lookup exception data Matt Mackall <mpm@selenic.com> parents: 3444 diff changeset	278 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	279 success, data = d[:-1].split(' ', 1)
233c733e4af5 httprepo: add support for passing lookup exception data Matt Mackall <mpm@selenic.com> parents: 3444 diff changeset	280 if int(success):
233c733e4af5 httprepo: add support for passing lookup exception data Matt Mackall <mpm@selenic.com> parents: 3444 diff changeset	281 return bin(data)
233c733e4af5 httprepo: add support for passing lookup exception data Matt Mackall <mpm@selenic.com> parents: 3444 diff changeset	282 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	283
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	284 def heads(self):
2435 ff2bac730b99 http client: support persistent connections. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2337 diff changeset	285 d = self.do_read("heads")
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	286 try:
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	287 return map(bin, d[:-1].split(" "))
87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	288 except:
3565 9073d7366776 Use the new UnexpectedOutput exception in httprepo, too. Thomas Arendsen Hein <thomas@intevation.de> parents: 3562 diff changeset	289 raise util.UnexpectedOutput(_("unexpected response:"), d)
222 87484f627422 make pull work for multiple heads mpm@selenic.com parents: 220 diff changeset	290
60 e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	291 def branches(self, nodes):
e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	292 n = " ".join(map(hex, nodes))
2435 ff2bac730b99 http client: support persistent connections. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2337 diff changeset	293 d = self.do_read("branches", nodes=n)
217 e6d6497a6331 merge: catch unexpected responses mpm@selenic.com parents: 216 diff changeset	294 try:
e6d6497a6331 merge: catch unexpected responses mpm@selenic.com parents: 216 diff changeset	295 br = [ tuple(map(bin, b.split(" "))) for b in d.splitlines() ]
e6d6497a6331 merge: catch unexpected responses mpm@selenic.com parents: 216 diff changeset	296 return br
e6d6497a6331 merge: catch unexpected responses mpm@selenic.com parents: 216 diff changeset	297 except:
3565 9073d7366776 Use the new UnexpectedOutput exception in httprepo, too. Thomas Arendsen Hein <thomas@intevation.de> parents: 3562 diff changeset	298 raise util.UnexpectedOutput(_("unexpected response:"), d)
60 e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	299
e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	300 def between(self, pairs):
e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	301 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	302 d = self.do_read("between", pairs=n)
217 e6d6497a6331 merge: catch unexpected responses mpm@selenic.com parents: 216 diff changeset	303 try:
e6d6497a6331 merge: catch unexpected responses mpm@selenic.com parents: 216 diff changeset	304 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	305 return p
e6d6497a6331 merge: catch unexpected responses mpm@selenic.com parents: 216 diff changeset	306 except:
3565 9073d7366776 Use the new UnexpectedOutput exception in httprepo, too. Thomas Arendsen Hein <thomas@intevation.de> parents: 3562 diff changeset	307 raise util.UnexpectedOutput(_("unexpected response:"), d)
60 e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	308
1736 50de0887bbcd add preoutgoing and outgoing hooks. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1402 diff changeset	309 def changegroup(self, nodes, kind):
60 e32fdbd97839 Add hg:// protocol mpm@selenic.com parents: 56 diff changeset	310 n = " ".join(map(hex, nodes))
752 c693eafd5967 Simplify content type checking mpm@selenic.com parents: 751 diff changeset	311 f = self.do_cmd("changegroup", roots=n)
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	312
1376 524ca4a06f70 Fix same performance bug as c3654cfaa77 but for httprepo.py instead. Eric Hopper <hopper@omnifarious.org> parents: 1359 diff changeset	313 def zgenerator(f):
524ca4a06f70 Fix same performance bug as c3654cfaa77 but for httprepo.py instead. Eric Hopper <hopper@omnifarious.org> parents: 1359 diff changeset	314 zd = zlib.decompressobj()
2015 1a09814a5b1f Catch HTTPException when reading from remote http repository. Thomas Arendsen Hein <thomas@intevation.de> parents: 1870 diff changeset	315 try:
1a09814a5b1f Catch HTTPException when reading from remote http repository. Thomas Arendsen Hein <thomas@intevation.de> parents: 1870 diff changeset	316 for chnk in f:
1a09814a5b1f Catch HTTPException when reading from remote http repository. Thomas Arendsen Hein <thomas@intevation.de> parents: 1870 diff changeset	317 yield zd.decompress(chnk)
3444 3505fcd5a231 Adding changegroupsubset and lookup to web protocol so pull -r and Eric Hopper <hopper@omnifarious.org> parents: 3399 diff changeset	318 except httplib.HTTPException, inst:
3505fcd5a231 Adding changegroupsubset and lookup to web protocol so pull -r and Eric Hopper <hopper@omnifarious.org> parents: 3399 diff changeset	319 raise IOError(None, _('connection ended unexpectedly'))
3505fcd5a231 Adding changegroupsubset and lookup to web protocol so pull -r and Eric Hopper <hopper@omnifarious.org> parents: 3399 diff changeset	320 yield zd.flush()
3505fcd5a231 Adding changegroupsubset and lookup to web protocol so pull -r and Eric Hopper <hopper@omnifarious.org> parents: 3399 diff changeset	321
3505fcd5a231 Adding changegroupsubset and lookup to web protocol so pull -r and Eric Hopper <hopper@omnifarious.org> parents: 3399 diff changeset	322 return util.chunkbuffer(zgenerator(util.filechunkiter(f)))
3505fcd5a231 Adding changegroupsubset and lookup to web protocol so pull -r and Eric Hopper <hopper@omnifarious.org> parents: 3399 diff changeset	323
3505fcd5a231 Adding changegroupsubset and lookup to web protocol so pull -r and Eric Hopper <hopper@omnifarious.org> parents: 3399 diff changeset	324 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	325 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	326 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	327 f = self.do_cmd("changegroupsubset", bases=baselst, heads=headlst)
3505fcd5a231 Adding changegroupsubset and lookup to web protocol so pull -r and Eric Hopper <hopper@omnifarious.org> parents: 3399 diff changeset	328
3505fcd5a231 Adding changegroupsubset and lookup to web protocol so pull -r and Eric Hopper <hopper@omnifarious.org> parents: 3399 diff changeset	329 def zgenerator(f):
3505fcd5a231 Adding changegroupsubset and lookup to web protocol so pull -r and Eric Hopper <hopper@omnifarious.org> parents: 3399 diff changeset	330 zd = zlib.decompressobj()
3505fcd5a231 Adding changegroupsubset and lookup to web protocol so pull -r and Eric Hopper <hopper@omnifarious.org> parents: 3399 diff changeset	331 try:
3505fcd5a231 Adding changegroupsubset and lookup to web protocol so pull -r and Eric Hopper <hopper@omnifarious.org> parents: 3399 diff changeset	332 for chnk in f:
3505fcd5a231 Adding changegroupsubset and lookup to web protocol so pull -r and Eric Hopper <hopper@omnifarious.org> parents: 3399 diff changeset	333 yield zd.decompress(chnk)
3131 cff3c58a5766 fix warnings spotted by pychecker Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3072 diff changeset	334 except httplib.HTTPException:
2015 1a09814a5b1f Catch HTTPException when reading from remote http repository. Thomas Arendsen Hein <thomas@intevation.de> parents: 1870 diff changeset	335 raise IOError(None, _('connection ended unexpectedly'))
1376 524ca4a06f70 Fix same performance bug as c3654cfaa77 but for httprepo.py instead. Eric Hopper <hopper@omnifarious.org> parents: 1359 diff changeset	336 yield zd.flush()
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	337
1376 524ca4a06f70 Fix same performance bug as c3654cfaa77 but for httprepo.py instead. Eric Hopper <hopper@omnifarious.org> parents: 1359 diff changeset	338 return util.chunkbuffer(zgenerator(util.filechunkiter(f)))
635 85e2209d401c Protocol switch from using generators to stream-like objects. Matt Mackall <mpm@selenic.com> parents: 634 diff changeset	339
2439 e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2435 diff changeset	340 def unbundle(self, cg, heads, source):
2465 c91118f425d0 push over http: client support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2447 diff changeset	341 # 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	342 # http 1.1 chunked transfer.
c91118f425d0 push over http: client support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2447 diff changeset	343
c91118f425d0 push over http: client support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2447 diff changeset	344 fd, tempname = tempfile.mkstemp(prefix='hg-unbundle-')
c91118f425d0 push over http: client support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2447 diff changeset	345 fp = os.fdopen(fd, 'wb+')
c91118f425d0 push over http: client support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2447 diff changeset	346 try:
c91118f425d0 push over http: client support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2447 diff changeset	347 for chunk in util.filechunkiter(cg):
c91118f425d0 push over http: client support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2447 diff changeset	348 fp.write(chunk)
c91118f425d0 push over http: client support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2447 diff changeset	349 length = fp.tell()
c91118f425d0 push over http: client support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2447 diff changeset	350 try:
2467 4e78dc71d946 http client: better work with authorization errors, broken sockets. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2465 diff changeset	351 rfp = self.do_cmd(
4e78dc71d946 http client: better work with authorization errors, broken sockets. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2465 diff changeset	352 'unbundle', data=fp,
3566 ca24144ed850 Force the content-length header to be a string in httprepo.unbundle. Thomas Arendsen Hein <thomas@intevation.de> parents: 3565 diff changeset	353 headers={'content-length': str(length),
2467 4e78dc71d946 http client: better work with authorization errors, broken sockets. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2465 diff changeset	354 'content-type': 'application/octet-stream'},
4e78dc71d946 http client: better work with authorization errors, broken sockets. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2465 diff changeset	355 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	356 try:
4e78dc71d946 http client: better work with authorization errors, broken sockets. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2465 diff changeset	357 ret = int(rfp.readline())
4e78dc71d946 http client: better work with authorization errors, broken sockets. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2465 diff changeset	358 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	359 return ret
4e78dc71d946 http client: better work with authorization errors, broken sockets. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2465 diff changeset	360 finally:
4e78dc71d946 http client: better work with authorization errors, broken sockets. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2465 diff changeset	361 rfp.close()
4e78dc71d946 http client: better work with authorization errors, broken sockets. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2465 diff changeset	362 except socket.error, err:
4e78dc71d946 http client: better work with authorization errors, broken sockets. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2465 diff changeset	363 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	364 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	365 raise util.Abort(err[1])
2465 c91118f425d0 push over http: client support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2447 diff changeset	366 finally:
c91118f425d0 push over http: client support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2447 diff changeset	367 fp.close()
c91118f425d0 push over http: client support. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2447 diff changeset	368 os.unlink(tempname)
2439 e8c4f3d3df8c extend network protocol to stop clients from locking servers Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2435 diff changeset	369
2612 ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	370 def stream_out(self):
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	371 return self.do_cmd('stream_out')
ffb895f16925 add support for streaming clone. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2569 diff changeset	372
923 c7a3b88505cd Add basic https support for pull mpm@selenic.com parents: 919 diff changeset	373 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	374 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	375 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	376 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	377 '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	378 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	379
386f04d6ecb3 clean up hg.py: move repo constructor code into each repo module Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2673 diff changeset	380 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	381 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	382 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	383 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	384 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	385 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	386 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	387 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	388 return httprepository(ui, path)

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/httprepo.py @ 3570:c141d07198b9