Show More
@@ -1,352 +1,355 b'' | |||||
1 | # httprepo.py - HTTP repository proxy classes for mercurial |
|
1 | # httprepo.py - HTTP repository proxy classes for mercurial | |
2 | # |
|
2 | # | |
3 | # Copyright 2005, 2006 Matt Mackall <mpm@selenic.com> |
|
3 | # Copyright 2005, 2006 Matt Mackall <mpm@selenic.com> | |
4 | # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com> |
|
4 | # Copyright 2006 Vadim Gelfer <vadim.gelfer@gmail.com> | |
5 | # |
|
5 | # | |
6 | # This software may be used and distributed according to the terms |
|
6 | # This software may be used and distributed according to the terms | |
7 | # of the GNU General Public License, incorporated herein by reference. |
|
7 | # of the GNU General Public License, incorporated herein by reference. | |
8 |
|
8 | |||
9 | from node import * |
|
9 | from node import * | |
10 | from remoterepo import * |
|
10 | from remoterepo import * | |
11 | from i18n import gettext as _ |
|
11 | from i18n import gettext as _ | |
12 | from demandload import * |
|
12 | from demandload import * | |
13 | demandload(globals(), "hg os urllib urllib2 urlparse zlib util httplib") |
|
13 | demandload(globals(), "hg os urllib urllib2 urlparse zlib util httplib") | |
14 | demandload(globals(), "errno keepalive tempfile socket") |
|
14 | demandload(globals(), "errno keepalive tempfile socket") | |
15 |
|
15 | |||
16 | class passwordmgr(urllib2.HTTPPasswordMgrWithDefaultRealm): |
|
16 | class passwordmgr(urllib2.HTTPPasswordMgrWithDefaultRealm): | |
17 | def __init__(self, ui): |
|
17 | def __init__(self, ui): | |
18 | urllib2.HTTPPasswordMgrWithDefaultRealm.__init__(self) |
|
18 | urllib2.HTTPPasswordMgrWithDefaultRealm.__init__(self) | |
19 | self.ui = ui |
|
19 | self.ui = ui | |
20 |
|
20 | |||
21 | def find_user_password(self, realm, authuri): |
|
21 | def find_user_password(self, realm, authuri): | |
22 | authinfo = urllib2.HTTPPasswordMgrWithDefaultRealm.find_user_password( |
|
22 | authinfo = urllib2.HTTPPasswordMgrWithDefaultRealm.find_user_password( | |
23 | self, realm, authuri) |
|
23 | self, realm, authuri) | |
24 | user, passwd = authinfo |
|
24 | user, passwd = authinfo | |
25 | if user and passwd: |
|
25 | if user and passwd: | |
26 | return (user, passwd) |
|
26 | return (user, passwd) | |
27 |
|
27 | |||
28 | if not self.ui.interactive: |
|
28 | if not self.ui.interactive: | |
29 | raise util.Abort(_('http authorization required')) |
|
29 | raise util.Abort(_('http authorization required')) | |
30 |
|
30 | |||
31 | self.ui.write(_("http authorization required\n")) |
|
31 | self.ui.write(_("http authorization required\n")) | |
32 | self.ui.status(_("realm: %s\n") % realm) |
|
32 | self.ui.status(_("realm: %s\n") % realm) | |
33 | if user: |
|
33 | if user: | |
34 | self.ui.status(_("user: %s\n") % user) |
|
34 | self.ui.status(_("user: %s\n") % user) | |
35 | else: |
|
35 | else: | |
36 | user = self.ui.prompt(_("user:"), default=None) |
|
36 | user = self.ui.prompt(_("user:"), default=None) | |
37 |
|
37 | |||
38 | if not passwd: |
|
38 | if not passwd: | |
39 | passwd = self.ui.getpass() |
|
39 | passwd = self.ui.getpass() | |
40 |
|
40 | |||
41 | self.add_password(realm, authuri, user, passwd) |
|
41 | self.add_password(realm, authuri, user, passwd) | |
42 | return (user, passwd) |
|
42 | return (user, passwd) | |
43 |
|
43 | |||
44 | def netlocsplit(netloc): |
|
44 | def netlocsplit(netloc): | |
45 | '''split [user[:passwd]@]host[:port] into 4-tuple.''' |
|
45 | '''split [user[:passwd]@]host[:port] into 4-tuple.''' | |
46 |
|
46 | |||
47 | a = netloc.find('@') |
|
47 | a = netloc.find('@') | |
48 | if a == -1: |
|
48 | if a == -1: | |
49 | user, passwd = None, None |
|
49 | user, passwd = None, None | |
50 | else: |
|
50 | else: | |
51 | userpass, netloc = netloc[:a], netloc[a+1:] |
|
51 | userpass, netloc = netloc[:a], netloc[a+1:] | |
52 | c = userpass.find(':') |
|
52 | c = userpass.find(':') | |
53 | if c == -1: |
|
53 | if c == -1: | |
54 | user, passwd = urllib.unquote(userpass), None |
|
54 | user, passwd = urllib.unquote(userpass), None | |
55 | else: |
|
55 | else: | |
56 | user = urllib.unquote(userpass[:c]) |
|
56 | user = urllib.unquote(userpass[:c]) | |
57 | passwd = urllib.unquote(userpass[c+1:]) |
|
57 | passwd = urllib.unquote(userpass[c+1:]) | |
58 | c = netloc.find(':') |
|
58 | c = netloc.find(':') | |
59 | if c == -1: |
|
59 | if c == -1: | |
60 | host, port = netloc, None |
|
60 | host, port = netloc, None | |
61 | else: |
|
61 | else: | |
62 | host, port = netloc[:c], netloc[c+1:] |
|
62 | host, port = netloc[:c], netloc[c+1:] | |
63 | return host, port, user, passwd |
|
63 | return host, port, user, passwd | |
64 |
|
64 | |||
65 | def netlocunsplit(host, port, user=None, passwd=None): |
|
65 | def netlocunsplit(host, port, user=None, passwd=None): | |
66 | '''turn host, port, user, passwd into [user[:passwd]@]host[:port].''' |
|
66 | '''turn host, port, user, passwd into [user[:passwd]@]host[:port].''' | |
67 | if port: |
|
67 | if port: | |
68 | hostport = host + ':' + port |
|
68 | hostport = host + ':' + port | |
69 | else: |
|
69 | else: | |
70 | hostport = host |
|
70 | hostport = host | |
71 | if user: |
|
71 | if user: | |
72 | if passwd: |
|
72 | if passwd: | |
73 | userpass = urllib.quote(user) + ':' + urllib.quote(passwd) |
|
73 | userpass = urllib.quote(user) + ':' + urllib.quote(passwd) | |
74 | else: |
|
74 | else: | |
75 | userpass = urllib.quote(user) |
|
75 | userpass = urllib.quote(user) | |
76 | return userpass + '@' + hostport |
|
76 | return userpass + '@' + hostport | |
77 | return hostport |
|
77 | return hostport | |
78 |
|
78 | |||
79 | class httpconnection(keepalive.HTTPConnection): |
|
79 | class httpconnection(keepalive.HTTPConnection): | |
80 | # must be able to send big bundle as stream. |
|
80 | # must be able to send big bundle as stream. | |
81 |
|
81 | |||
82 | def send(self, data): |
|
82 | def send(self, data): | |
83 | if isinstance(data, str): |
|
83 | if isinstance(data, str): | |
84 | keepalive.HTTPConnection.send(self, data) |
|
84 | keepalive.HTTPConnection.send(self, data) | |
85 | else: |
|
85 | else: | |
86 | # if auth required, some data sent twice, so rewind here |
|
86 | # if auth required, some data sent twice, so rewind here | |
87 | data.seek(0) |
|
87 | data.seek(0) | |
88 | for chunk in util.filechunkiter(data): |
|
88 | for chunk in util.filechunkiter(data): | |
89 | keepalive.HTTPConnection.send(self, chunk) |
|
89 | keepalive.HTTPConnection.send(self, chunk) | |
90 |
|
90 | |||
91 | class basehttphandler(keepalive.HTTPHandler): |
|
91 | class basehttphandler(keepalive.HTTPHandler): | |
92 | def http_open(self, req): |
|
92 | def http_open(self, req): | |
93 | return self.do_open(httpconnection, req) |
|
93 | return self.do_open(httpconnection, req) | |
94 |
|
94 | |||
95 | has_https = hasattr(urllib2, 'HTTPSHandler') |
|
95 | has_https = hasattr(urllib2, 'HTTPSHandler') | |
96 | if has_https: |
|
96 | if has_https: | |
97 | class httpsconnection(httplib.HTTPSConnection): |
|
97 | class httpsconnection(httplib.HTTPSConnection): | |
98 | response_class = keepalive.HTTPResponse |
|
98 | response_class = keepalive.HTTPResponse | |
99 | # must be able to send big bundle as stream. |
|
99 | # must be able to send big bundle as stream. | |
100 |
|
100 | |||
101 | def send(self, data): |
|
101 | def send(self, data): | |
102 | if isinstance(data, str): |
|
102 | if isinstance(data, str): | |
103 | httplib.HTTPSConnection.send(self, data) |
|
103 | httplib.HTTPSConnection.send(self, data) | |
104 | else: |
|
104 | else: | |
105 | # if auth required, some data sent twice, so rewind here |
|
105 | # if auth required, some data sent twice, so rewind here | |
106 | data.seek(0) |
|
106 | data.seek(0) | |
107 | for chunk in util.filechunkiter(data): |
|
107 | for chunk in util.filechunkiter(data): | |
108 | httplib.HTTPSConnection.send(self, chunk) |
|
108 | httplib.HTTPSConnection.send(self, chunk) | |
109 |
|
109 | |||
110 | class httphandler(basehttphandler, urllib2.HTTPSHandler): |
|
110 | class httphandler(basehttphandler, urllib2.HTTPSHandler): | |
111 | def https_open(self, req): |
|
111 | def https_open(self, req): | |
112 | return self.do_open(httpsconnection, req) |
|
112 | return self.do_open(httpsconnection, req) | |
113 | else: |
|
113 | else: | |
114 | class httphandler(basehttphandler): |
|
114 | class httphandler(basehttphandler): | |
115 | pass |
|
115 | pass | |
116 |
|
116 | |||
117 | class httprepository(remoterepository): |
|
117 | class httprepository(remoterepository): | |
118 | def __init__(self, ui, path): |
|
118 | def __init__(self, ui, path): | |
119 | self.path = path |
|
119 | self.path = path | |
120 | self.caps = None |
|
120 | self.caps = None | |
121 | scheme, netloc, urlpath, query, frag = urlparse.urlsplit(path) |
|
121 | scheme, netloc, urlpath, query, frag = urlparse.urlsplit(path) | |
122 | if query or frag: |
|
122 | if query or frag: | |
123 | raise util.Abort(_('unsupported URL component: "%s"') % |
|
123 | raise util.Abort(_('unsupported URL component: "%s"') % | |
124 | (query or frag)) |
|
124 | (query or frag)) | |
125 | if not urlpath: urlpath = '/' |
|
125 | if not urlpath: urlpath = '/' | |
126 | host, port, user, passwd = netlocsplit(netloc) |
|
126 | host, port, user, passwd = netlocsplit(netloc) | |
127 |
|
127 | |||
128 | # urllib cannot handle URLs with embedded user or passwd |
|
128 | # urllib cannot handle URLs with embedded user or passwd | |
129 | self._url = urlparse.urlunsplit((scheme, netlocunsplit(host, port), |
|
129 | self._url = urlparse.urlunsplit((scheme, netlocunsplit(host, port), | |
130 | urlpath, '', '')) |
|
130 | urlpath, '', '')) | |
131 | self.ui = ui |
|
131 | self.ui = ui | |
132 |
|
132 | |||
133 | proxyurl = ui.config("http_proxy", "host") or os.getenv('http_proxy') |
|
133 | proxyurl = ui.config("http_proxy", "host") or os.getenv('http_proxy') | |
134 | # XXX proxyauthinfo = None |
|
134 | # XXX proxyauthinfo = None | |
135 | handler = httphandler() |
|
135 | handler = httphandler() | |
136 |
|
136 | |||
137 | if proxyurl: |
|
137 | if proxyurl: | |
138 | # proxy can be proper url or host[:port] |
|
138 | # proxy can be proper url or host[:port] | |
139 | if not (proxyurl.startswith('http:') or |
|
139 | if not (proxyurl.startswith('http:') or | |
140 | proxyurl.startswith('https:')): |
|
140 | proxyurl.startswith('https:')): | |
141 | proxyurl = 'http://' + proxyurl + '/' |
|
141 | proxyurl = 'http://' + proxyurl + '/' | |
142 | snpqf = urlparse.urlsplit(proxyurl) |
|
142 | snpqf = urlparse.urlsplit(proxyurl) | |
143 | proxyscheme, proxynetloc, proxypath, proxyquery, proxyfrag = snpqf |
|
143 | proxyscheme, proxynetloc, proxypath, proxyquery, proxyfrag = snpqf | |
144 | hpup = netlocsplit(proxynetloc) |
|
144 | hpup = netlocsplit(proxynetloc) | |
145 |
|
145 | |||
146 | proxyhost, proxyport, proxyuser, proxypasswd = hpup |
|
146 | proxyhost, proxyport, proxyuser, proxypasswd = hpup | |
147 | if not proxyuser: |
|
147 | if not proxyuser: | |
148 | proxyuser = ui.config("http_proxy", "user") |
|
148 | proxyuser = ui.config("http_proxy", "user") | |
149 | proxypasswd = ui.config("http_proxy", "passwd") |
|
149 | proxypasswd = ui.config("http_proxy", "passwd") | |
150 |
|
150 | |||
151 | # see if we should use a proxy for this url |
|
151 | # see if we should use a proxy for this url | |
152 | no_list = [ "localhost", "127.0.0.1" ] |
|
152 | no_list = [ "localhost", "127.0.0.1" ] | |
153 | no_list.extend([p.lower() for |
|
153 | no_list.extend([p.lower() for | |
154 | p in ui.configlist("http_proxy", "no")]) |
|
154 | p in ui.configlist("http_proxy", "no")]) | |
155 | no_list.extend([p.strip().lower() for |
|
155 | no_list.extend([p.strip().lower() for | |
156 | p in os.getenv("no_proxy", '').split(',') |
|
156 | p in os.getenv("no_proxy", '').split(',') | |
157 | if p.strip()]) |
|
157 | if p.strip()]) | |
158 | # "http_proxy.always" config is for running tests on localhost |
|
158 | # "http_proxy.always" config is for running tests on localhost | |
159 | if (not ui.configbool("http_proxy", "always") and |
|
159 | if (not ui.configbool("http_proxy", "always") and | |
160 | host.lower() in no_list): |
|
160 | host.lower() in no_list): | |
161 | ui.debug(_('disabling proxy for %s\n') % host) |
|
161 | ui.debug(_('disabling proxy for %s\n') % host) | |
162 | else: |
|
162 | else: | |
163 | proxyurl = urlparse.urlunsplit(( |
|
163 | proxyurl = urlparse.urlunsplit(( | |
164 | proxyscheme, netlocunsplit(proxyhost, proxyport, |
|
164 | proxyscheme, netlocunsplit(proxyhost, proxyport, | |
165 | proxyuser, proxypasswd or ''), |
|
165 | proxyuser, proxypasswd or ''), | |
166 | proxypath, proxyquery, proxyfrag)) |
|
166 | proxypath, proxyquery, proxyfrag)) | |
167 | handler = urllib2.ProxyHandler({scheme: proxyurl}) |
|
167 | handler = urllib2.ProxyHandler({scheme: proxyurl}) | |
168 | ui.debug(_('proxying through http://%s:%s\n') % |
|
168 | ui.debug(_('proxying through http://%s:%s\n') % | |
169 | (proxyhost, proxyport)) |
|
169 | (proxyhost, proxyport)) | |
170 |
|
170 | |||
171 | # urllib2 takes proxy values from the environment and those |
|
171 | # urllib2 takes proxy values from the environment and those | |
172 | # will take precedence if found, so drop them |
|
172 | # will take precedence if found, so drop them | |
173 | for env in ["HTTP_PROXY", "http_proxy", "no_proxy"]: |
|
173 | for env in ["HTTP_PROXY", "http_proxy", "no_proxy"]: | |
174 | try: |
|
174 | try: | |
175 | if os.environ.has_key(env): |
|
175 | if os.environ.has_key(env): | |
176 | del os.environ[env] |
|
176 | del os.environ[env] | |
177 | except OSError: |
|
177 | except OSError: | |
178 | pass |
|
178 | pass | |
179 |
|
179 | |||
180 | passmgr = passwordmgr(ui) |
|
180 | passmgr = passwordmgr(ui) | |
181 | if user: |
|
181 | if user: | |
182 | ui.debug(_('http auth: user %s, password %s\n') % |
|
182 | ui.debug(_('http auth: user %s, password %s\n') % | |
183 | (user, passwd and '*' * len(passwd) or 'not set')) |
|
183 | (user, passwd and '*' * len(passwd) or 'not set')) | |
184 | passmgr.add_password(None, host, user, passwd or '') |
|
184 | passmgr.add_password(None, host, user, passwd or '') | |
185 |
|
185 | |||
186 | opener = urllib2.build_opener( |
|
186 | opener = urllib2.build_opener( | |
187 | handler, |
|
187 | handler, | |
188 | urllib2.HTTPBasicAuthHandler(passmgr), |
|
188 | urllib2.HTTPBasicAuthHandler(passmgr), | |
189 | urllib2.HTTPDigestAuthHandler(passmgr)) |
|
189 | urllib2.HTTPDigestAuthHandler(passmgr)) | |
190 |
|
190 | |||
191 | # 1.0 here is the _protocol_ version |
|
191 | # 1.0 here is the _protocol_ version | |
192 | opener.addheaders = [('User-agent', 'mercurial/proto-1.0')] |
|
192 | opener.addheaders = [('User-agent', 'mercurial/proto-1.0')] | |
193 | urllib2.install_opener(opener) |
|
193 | urllib2.install_opener(opener) | |
194 |
|
194 | |||
195 | def url(self): |
|
195 | def url(self): | |
196 | return self.path |
|
196 | return self.path | |
197 |
|
197 | |||
198 | # look up capabilities only when needed |
|
198 | # look up capabilities only when needed | |
199 |
|
199 | |||
200 | def get_caps(self): |
|
200 | def get_caps(self): | |
201 | if self.caps is None: |
|
201 | if self.caps is None: | |
202 | try: |
|
202 | try: | |
203 | self.caps = self.do_read('capabilities').split() |
|
203 | self.caps = self.do_read('capabilities').split() | |
204 | except hg.RepoError: |
|
204 | except hg.RepoError: | |
205 | self.caps = () |
|
205 | self.caps = () | |
206 | self.ui.debug(_('capabilities: %s\n') % |
|
206 | self.ui.debug(_('capabilities: %s\n') % | |
207 | (' '.join(self.caps or ['none']))) |
|
207 | (' '.join(self.caps or ['none']))) | |
208 | return self.caps |
|
208 | return self.caps | |
209 |
|
209 | |||
210 | capabilities = property(get_caps) |
|
210 | capabilities = property(get_caps) | |
211 |
|
211 | |||
212 | def lock(self): |
|
212 | def lock(self): | |
213 | raise util.Abort(_('operation not supported over http')) |
|
213 | raise util.Abort(_('operation not supported over http')) | |
214 |
|
214 | |||
215 | def do_cmd(self, cmd, **args): |
|
215 | def do_cmd(self, cmd, **args): | |
216 | data = args.pop('data', None) |
|
216 | data = args.pop('data', None) | |
217 | headers = args.pop('headers', {}) |
|
217 | headers = args.pop('headers', {}) | |
218 | self.ui.debug(_("sending %s command\n") % cmd) |
|
218 | self.ui.debug(_("sending %s command\n") % cmd) | |
219 | q = {"cmd": cmd} |
|
219 | q = {"cmd": cmd} | |
220 | q.update(args) |
|
220 | q.update(args) | |
221 | qs = urllib.urlencode(q) |
|
221 | qs = urllib.urlencode(q) | |
222 | cu = "%s?%s" % (self._url, qs) |
|
222 | cu = "%s?%s" % (self._url, qs) | |
223 | try: |
|
223 | try: | |
224 | resp = urllib2.urlopen(urllib2.Request(cu, data, headers)) |
|
224 | resp = urllib2.urlopen(urllib2.Request(cu, data, headers)) | |
225 | except urllib2.HTTPError, inst: |
|
225 | except urllib2.HTTPError, inst: | |
226 | if inst.code == 401: |
|
226 | if inst.code == 401: | |
227 | raise util.Abort(_('authorization failed')) |
|
227 | raise util.Abort(_('authorization failed')) | |
228 | raise |
|
228 | raise | |
229 | except httplib.HTTPException, inst: |
|
229 | except httplib.HTTPException, inst: | |
230 | self.ui.debug(_('http error while sending %s command\n') % cmd) |
|
230 | self.ui.debug(_('http error while sending %s command\n') % cmd) | |
231 | self.ui.print_exc() |
|
231 | self.ui.print_exc() | |
232 | raise IOError(None, inst) |
|
232 | raise IOError(None, inst) | |
|
233 | except IndexError: | |||
|
234 | # this only happens with Python 2.3, later versions raise URLError | |||
|
235 | raise util.Abort(_('http error, possibly caused by proxy setting')) | |||
233 | try: |
|
236 | try: | |
234 | proto = resp.getheader('content-type') |
|
237 | proto = resp.getheader('content-type') | |
235 | except AttributeError: |
|
238 | except AttributeError: | |
236 | proto = resp.headers['content-type'] |
|
239 | proto = resp.headers['content-type'] | |
237 |
|
240 | |||
238 | # accept old "text/plain" and "application/hg-changegroup" for now |
|
241 | # accept old "text/plain" and "application/hg-changegroup" for now | |
239 | if not proto.startswith('application/mercurial') and \ |
|
242 | if not proto.startswith('application/mercurial') and \ | |
240 | not proto.startswith('text/plain') and \ |
|
243 | not proto.startswith('text/plain') and \ | |
241 | not proto.startswith('application/hg-changegroup'): |
|
244 | not proto.startswith('application/hg-changegroup'): | |
242 | raise hg.RepoError(_("'%s' does not appear to be an hg repository") % |
|
245 | raise hg.RepoError(_("'%s' does not appear to be an hg repository") % | |
243 | self._url) |
|
246 | self._url) | |
244 |
|
247 | |||
245 | if proto.startswith('application/mercurial'): |
|
248 | if proto.startswith('application/mercurial'): | |
246 | version = proto[22:] |
|
249 | version = proto[22:] | |
247 | if float(version) > 0.1: |
|
250 | if float(version) > 0.1: | |
248 | raise hg.RepoError(_("'%s' uses newer protocol %s") % |
|
251 | raise hg.RepoError(_("'%s' uses newer protocol %s") % | |
249 | (self._url, version)) |
|
252 | (self._url, version)) | |
250 |
|
253 | |||
251 | return resp |
|
254 | return resp | |
252 |
|
255 | |||
253 | def do_read(self, cmd, **args): |
|
256 | def do_read(self, cmd, **args): | |
254 | fp = self.do_cmd(cmd, **args) |
|
257 | fp = self.do_cmd(cmd, **args) | |
255 | try: |
|
258 | try: | |
256 | return fp.read() |
|
259 | return fp.read() | |
257 | finally: |
|
260 | finally: | |
258 | # if using keepalive, allow connection to be reused |
|
261 | # if using keepalive, allow connection to be reused | |
259 | fp.close() |
|
262 | fp.close() | |
260 |
|
263 | |||
261 | def heads(self): |
|
264 | def heads(self): | |
262 | d = self.do_read("heads") |
|
265 | d = self.do_read("heads") | |
263 | try: |
|
266 | try: | |
264 | return map(bin, d[:-1].split(" ")) |
|
267 | return map(bin, d[:-1].split(" ")) | |
265 | except: |
|
268 | except: | |
266 | self.ui.warn(_("unexpected response:\n") + d[:400] + "\n...\n") |
|
269 | self.ui.warn(_("unexpected response:\n") + d[:400] + "\n...\n") | |
267 | raise |
|
270 | raise | |
268 |
|
271 | |||
269 | def branches(self, nodes): |
|
272 | def branches(self, nodes): | |
270 | n = " ".join(map(hex, nodes)) |
|
273 | n = " ".join(map(hex, nodes)) | |
271 | d = self.do_read("branches", nodes=n) |
|
274 | d = self.do_read("branches", nodes=n) | |
272 | try: |
|
275 | try: | |
273 | br = [ tuple(map(bin, b.split(" "))) for b in d.splitlines() ] |
|
276 | br = [ tuple(map(bin, b.split(" "))) for b in d.splitlines() ] | |
274 | return br |
|
277 | return br | |
275 | except: |
|
278 | except: | |
276 | self.ui.warn(_("unexpected response:\n") + d[:400] + "\n...\n") |
|
279 | self.ui.warn(_("unexpected response:\n") + d[:400] + "\n...\n") | |
277 | raise |
|
280 | raise | |
278 |
|
281 | |||
279 | def between(self, pairs): |
|
282 | def between(self, pairs): | |
280 | n = "\n".join(["-".join(map(hex, p)) for p in pairs]) |
|
283 | n = "\n".join(["-".join(map(hex, p)) for p in pairs]) | |
281 | d = self.do_read("between", pairs=n) |
|
284 | d = self.do_read("between", pairs=n) | |
282 | try: |
|
285 | try: | |
283 | p = [ l and map(bin, l.split(" ")) or [] for l in d.splitlines() ] |
|
286 | p = [ l and map(bin, l.split(" ")) or [] for l in d.splitlines() ] | |
284 | return p |
|
287 | return p | |
285 | except: |
|
288 | except: | |
286 | self.ui.warn(_("unexpected response:\n") + d[:400] + "\n...\n") |
|
289 | self.ui.warn(_("unexpected response:\n") + d[:400] + "\n...\n") | |
287 | raise |
|
290 | raise | |
288 |
|
291 | |||
289 | def changegroup(self, nodes, kind): |
|
292 | def changegroup(self, nodes, kind): | |
290 | n = " ".join(map(hex, nodes)) |
|
293 | n = " ".join(map(hex, nodes)) | |
291 | f = self.do_cmd("changegroup", roots=n) |
|
294 | f = self.do_cmd("changegroup", roots=n) | |
292 |
|
295 | |||
293 | def zgenerator(f): |
|
296 | def zgenerator(f): | |
294 | zd = zlib.decompressobj() |
|
297 | zd = zlib.decompressobj() | |
295 | try: |
|
298 | try: | |
296 | for chnk in f: |
|
299 | for chnk in f: | |
297 | yield zd.decompress(chnk) |
|
300 | yield zd.decompress(chnk) | |
298 | except httplib.HTTPException: |
|
301 | except httplib.HTTPException: | |
299 | raise IOError(None, _('connection ended unexpectedly')) |
|
302 | raise IOError(None, _('connection ended unexpectedly')) | |
300 | yield zd.flush() |
|
303 | yield zd.flush() | |
301 |
|
304 | |||
302 | return util.chunkbuffer(zgenerator(util.filechunkiter(f))) |
|
305 | return util.chunkbuffer(zgenerator(util.filechunkiter(f))) | |
303 |
|
306 | |||
304 | def unbundle(self, cg, heads, source): |
|
307 | def unbundle(self, cg, heads, source): | |
305 | # have to stream bundle to a temp file because we do not have |
|
308 | # have to stream bundle to a temp file because we do not have | |
306 | # http 1.1 chunked transfer. |
|
309 | # http 1.1 chunked transfer. | |
307 |
|
310 | |||
308 | fd, tempname = tempfile.mkstemp(prefix='hg-unbundle-') |
|
311 | fd, tempname = tempfile.mkstemp(prefix='hg-unbundle-') | |
309 | fp = os.fdopen(fd, 'wb+') |
|
312 | fp = os.fdopen(fd, 'wb+') | |
310 | try: |
|
313 | try: | |
311 | for chunk in util.filechunkiter(cg): |
|
314 | for chunk in util.filechunkiter(cg): | |
312 | fp.write(chunk) |
|
315 | fp.write(chunk) | |
313 | length = fp.tell() |
|
316 | length = fp.tell() | |
314 | try: |
|
317 | try: | |
315 | rfp = self.do_cmd( |
|
318 | rfp = self.do_cmd( | |
316 | 'unbundle', data=fp, |
|
319 | 'unbundle', data=fp, | |
317 | headers={'content-length': length, |
|
320 | headers={'content-length': length, | |
318 | 'content-type': 'application/octet-stream'}, |
|
321 | 'content-type': 'application/octet-stream'}, | |
319 | heads=' '.join(map(hex, heads))) |
|
322 | heads=' '.join(map(hex, heads))) | |
320 | try: |
|
323 | try: | |
321 | ret = int(rfp.readline()) |
|
324 | ret = int(rfp.readline()) | |
322 | self.ui.write(rfp.read()) |
|
325 | self.ui.write(rfp.read()) | |
323 | return ret |
|
326 | return ret | |
324 | finally: |
|
327 | finally: | |
325 | rfp.close() |
|
328 | rfp.close() | |
326 | except socket.error, err: |
|
329 | except socket.error, err: | |
327 | if err[0] in (errno.ECONNRESET, errno.EPIPE): |
|
330 | if err[0] in (errno.ECONNRESET, errno.EPIPE): | |
328 | raise util.Abort(_('push failed: %s') % err[1]) |
|
331 | raise util.Abort(_('push failed: %s') % err[1]) | |
329 | raise util.Abort(err[1]) |
|
332 | raise util.Abort(err[1]) | |
330 | finally: |
|
333 | finally: | |
331 | fp.close() |
|
334 | fp.close() | |
332 | os.unlink(tempname) |
|
335 | os.unlink(tempname) | |
333 |
|
336 | |||
334 | def stream_out(self): |
|
337 | def stream_out(self): | |
335 | return self.do_cmd('stream_out') |
|
338 | return self.do_cmd('stream_out') | |
336 |
|
339 | |||
337 | class httpsrepository(httprepository): |
|
340 | class httpsrepository(httprepository): | |
338 | def __init__(self, ui, path): |
|
341 | def __init__(self, ui, path): | |
339 | if not has_https: |
|
342 | if not has_https: | |
340 | raise util.Abort(_('Python support for SSL and HTTPS ' |
|
343 | raise util.Abort(_('Python support for SSL and HTTPS ' | |
341 | 'is not installed')) |
|
344 | 'is not installed')) | |
342 | httprepository.__init__(self, ui, path) |
|
345 | httprepository.__init__(self, ui, path) | |
343 |
|
346 | |||
344 | def instance(ui, path, create): |
|
347 | def instance(ui, path, create): | |
345 | if create: |
|
348 | if create: | |
346 | raise util.Abort(_('cannot create new http repository')) |
|
349 | raise util.Abort(_('cannot create new http repository')) | |
347 | if path.startswith('hg:'): |
|
350 | if path.startswith('hg:'): | |
348 | ui.warn(_("hg:// syntax is deprecated, please use http:// instead\n")) |
|
351 | ui.warn(_("hg:// syntax is deprecated, please use http:// instead\n")) | |
349 | path = 'http:' + path[3:] |
|
352 | path = 'http:' + path[3:] | |
350 | if path.startswith('https:'): |
|
353 | if path.startswith('https:'): | |
351 | return httpsrepository(ui, path) |
|
354 | return httpsrepository(ui, path) | |
352 | return httprepository(ui, path) |
|
355 | return httprepository(ui, path) |
General Comments 0
You need to be logged in to leave comments.
Login now