Mercurial > hg > pyhgsh
annotate mercurial/httprepo.py @ 1377:854775b27d1a
Fixed a bug in my changes to httprepo.py
| author | Eric Hopper <hopper@omnifarious.org> |
|---|---|
| date | Mon, 03 Oct 2005 16:07:54 -0700 |
| parents | 524ca4a06f70 |
| children | cf9a1233738a |
| rev | line source |
|---|---|
| 1089 | 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 # |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
3 # Copyright 2005 Matt Mackall <mpm@selenic.com> |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
4 # |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
5 # 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
|
6 # 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
|
7 |
| 1089 | 8 from node import * |
| 9 from remoterepo import * | |
|
1251
84cf8834efb5
Fix lots of exception-related problems.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1089
diff
changeset
|
10 from demandload import * |
|
1377
854775b27d1a
Fixed a bug in my changes to httprepo.py
Eric Hopper <hopper@omnifarious.org>
parents:
1376
diff
changeset
|
11 demandload(globals(), "hg os urllib urllib2 urlparse zlib util") |
| 926 | 12 |
| 13 class httprepository(remoterepository): | |
| 60 | 14 def __init__(self, ui, path): |
| 765 | 15 # fix missing / after hostname |
| 16 s = urlparse.urlsplit(path) | |
| 17 partial = s[2] | |
| 18 if not partial: partial = "/" | |
| 19 self.url = urlparse.urlunsplit((s[0], s[1], partial, '', '')) | |
| 60 | 20 self.ui = ui |
| 321 | 21 no_list = [ "localhost", "127.0.0.1" ] |
| 22 host = ui.config("http_proxy", "host") | |
|
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
|
23 if host is None: |
|
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
|
24 host = os.environ.get("http_proxy") |
|
426
8c90ab5644c9
Allow hgrc's proxy host and $http_proxy env var to start with http://
Thomas Arendsen Hein <thomas@intevation.de>
parents:
424
diff
changeset
|
25 if host and host.startswith('http://'): |
|
8c90ab5644c9
Allow hgrc's proxy host and $http_proxy env var to start with http://
Thomas Arendsen Hein <thomas@intevation.de>
parents:
424
diff
changeset
|
26 host = host[7:] |
| 321 | 27 user = ui.config("http_proxy", "user") |
| 28 passwd = ui.config("http_proxy", "passwd") | |
| 29 no = ui.config("http_proxy", "no") | |
|
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
|
30 if no is None: |
|
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
|
31 no = os.environ.get("no_proxy") |
| 321 | 32 if no: |
| 33 no_list = no_list + no.split(",") | |
| 515 | 34 |
| 321 | 35 no_proxy = 0 |
| 36 for h in no_list: | |
| 37 if (path.startswith("http://" + h + "/") or | |
| 38 path.startswith("http://" + h + ":") or | |
| 39 path == "http://" + h): | |
| 40 no_proxy = 1 | |
| 41 | |
| 42 # Note: urllib2 takes proxy values from the environment and those will | |
| 43 # take precedence | |
|
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
|
44 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
|
45 try: |
|
6390c377a9e6
Trap OSError when deleting env vars
Edouard Gomez <ed.gomez@free.fr>
parents:
856
diff
changeset
|
46 if os.environ.has_key(env): |
|
6390c377a9e6
Trap OSError when deleting env vars
Edouard Gomez <ed.gomez@free.fr>
parents:
856
diff
changeset
|
47 del os.environ[env] |
|
6390c377a9e6
Trap OSError when deleting env vars
Edouard Gomez <ed.gomez@free.fr>
parents:
856
diff
changeset
|
48 except OSError: |
|
6390c377a9e6
Trap OSError when deleting env vars
Edouard Gomez <ed.gomez@free.fr>
parents:
856
diff
changeset
|
49 pass |
| 321 | 50 |
| 51 proxy_handler = urllib2.BaseHandler() | |
| 52 if host and not no_proxy: | |
| 53 proxy_handler = urllib2.ProxyHandler({"http" : "http://" + host}) | |
| 54 | |
| 55 authinfo = None | |
| 56 if user and passwd: | |
| 57 passmgr = urllib2.HTTPPasswordMgrWithDefaultRealm() | |
| 58 passmgr.add_password(None, host, user, passwd) | |
| 59 authinfo = urllib2.ProxyBasicAuthHandler(passmgr) | |
| 60 | |
| 61 opener = urllib2.build_opener(proxy_handler, authinfo) | |
|
1359
51ac9a79f3e5
Set the user agent for httprepo communication
Matt Mackall <mpm@selenic.com>
parents:
1251
diff
changeset
|
62 # 1.0 here is the _protocol_ version |
|
51ac9a79f3e5
Set the user agent for httprepo communication
Matt Mackall <mpm@selenic.com>
parents:
1251
diff
changeset
|
63 opener.addheaders = [('User-agent', 'mercurial/proto-1.0')] |
| 321 | 64 urllib2.install_opener(opener) |
| 60 | 65 |
|
634
da5378d39269
Add a repo method to report repo device
Matt Mackall <mpm@selenic.com>
parents:
627
diff
changeset
|
66 def dev(self): |
|
da5378d39269
Add a repo method to report repo device
Matt Mackall <mpm@selenic.com>
parents:
627
diff
changeset
|
67 return -1 |
|
da5378d39269
Add a repo method to report repo device
Matt Mackall <mpm@selenic.com>
parents:
627
diff
changeset
|
68 |
| 60 | 69 def do_cmd(self, cmd, **args): |
| 83 | 70 self.ui.debug("sending %s command\n" % cmd) |
| 60 | 71 q = {"cmd": cmd} |
| 72 q.update(args) | |
| 73 qs = urllib.urlencode(q) | |
| 74 cu = "%s?%s" % (self.url, qs) | |
| 752 | 75 resp = urllib2.urlopen(cu) |
| 753 | 76 proto = resp.headers['content-type'] |
| 752 | 77 |
| 753 | 78 # accept old "text/plain" and "application/hg-changegroup" for now |
| 79 if not proto.startswith('application/mercurial') and \ | |
| 80 not proto.startswith('text/plain') and \ | |
| 81 not proto.startswith('application/hg-changegroup'): | |
|
1251
84cf8834efb5
Fix lots of exception-related problems.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1089
diff
changeset
|
82 raise hg.RepoError("'%s' does not appear to be an hg repository" % |
|
84cf8834efb5
Fix lots of exception-related problems.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1089
diff
changeset
|
83 self.url) |
| 752 | 84 |
| 753 | 85 if proto.startswith('application/mercurial'): |
| 86 version = proto[22:] | |
| 87 if float(version) > 0.1: | |
|
1251
84cf8834efb5
Fix lots of exception-related problems.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1089
diff
changeset
|
88 raise hg.RepoError("'%s' uses newer protocol %s" % |
|
84cf8834efb5
Fix lots of exception-related problems.
Bryan O'Sullivan <bos@serpentine.com>
parents:
1089
diff
changeset
|
89 (self.url, version)) |
| 753 | 90 |
| 752 | 91 return resp |
| 60 | 92 |
| 222 | 93 def heads(self): |
| 94 d = self.do_cmd("heads").read() | |
| 95 try: | |
| 96 return map(bin, d[:-1].split(" ")) | |
| 97 except: | |
| 98 self.ui.warn("unexpected response:\n" + d[:400] + "\n...\n") | |
| 99 raise | |
| 100 | |
| 60 | 101 def branches(self, nodes): |
| 102 n = " ".join(map(hex, nodes)) | |
| 752 | 103 d = self.do_cmd("branches", nodes=n).read() |
| 217 | 104 try: |
| 105 br = [ tuple(map(bin, b.split(" "))) for b in d.splitlines() ] | |
| 106 return br | |
| 107 except: | |
| 108 self.ui.warn("unexpected response:\n" + d[:400] + "\n...\n") | |
| 109 raise | |
| 60 | 110 |
| 111 def between(self, pairs): | |
| 112 n = "\n".join(["-".join(map(hex, p)) for p in pairs]) | |
| 752 | 113 d = self.do_cmd("between", pairs=n).read() |
| 217 | 114 try: |
| 115 p = [ l and map(bin, l.split(" ")) or [] for l in d.splitlines() ] | |
| 116 return p | |
| 117 except: | |
| 118 self.ui.warn("unexpected response:\n" + d[:400] + "\n...\n") | |
| 119 raise | |
| 60 | 120 |
| 121 def changegroup(self, nodes): | |
| 122 n = " ".join(map(hex, nodes)) | |
| 752 | 123 f = self.do_cmd("changegroup", roots=n) |
| 192 | 124 bytes = 0 |
|
635
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
125 |
|
1376
524ca4a06f70
Fix same performance bug as c3654cfaa77 but for httprepo.py instead.
Eric Hopper <hopper@omnifarious.org>
parents:
1359
diff
changeset
|
126 def zgenerator(f): |
|
524ca4a06f70
Fix same performance bug as c3654cfaa77 but for httprepo.py instead.
Eric Hopper <hopper@omnifarious.org>
parents:
1359
diff
changeset
|
127 zd = zlib.decompressobj() |
|
524ca4a06f70
Fix same performance bug as c3654cfaa77 but for httprepo.py instead.
Eric Hopper <hopper@omnifarious.org>
parents:
1359
diff
changeset
|
128 for chnk in f: |
|
524ca4a06f70
Fix same performance bug as c3654cfaa77 but for httprepo.py instead.
Eric Hopper <hopper@omnifarious.org>
parents:
1359
diff
changeset
|
129 yield zd.decompress(chnk) |
|
524ca4a06f70
Fix same performance bug as c3654cfaa77 but for httprepo.py instead.
Eric Hopper <hopper@omnifarious.org>
parents:
1359
diff
changeset
|
130 yield zd.flush() |
|
635
85e2209d401c
Protocol switch from using generators to stream-like objects.
Matt Mackall <mpm@selenic.com>
parents:
634
diff
changeset
|
131 |
|
1376
524ca4a06f70
Fix same performance bug as c3654cfaa77 but for httprepo.py instead.
Eric Hopper <hopper@omnifarious.org>
parents:
1359
diff
changeset
|
132 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
|
133 |
| 923 | 134 class httpsrepository(httprepository): |
| 135 pass |