Mercurial > hg
annotate hgext/zeroconf/__init__.py @ 7874:d812029cda85
cleanup: drop variables for unused return values
They are unnecessary. I did leave them in localrepo.py where there is
something like:
_junk = foo()
_junk = None
to free memory early. I don't know if just `foo()` will free the return
value as early.
author | Peter Arrenbrecht <peter.arrenbrecht@gmail.com> |
---|---|
date | Mon, 23 Mar 2009 13:13:02 +0100 |
parents | c2cd8d772805 |
children | 14f27921932a |
rev | line source |
---|---|
7071
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
1 # zeroconf.py - zeroconf support for Mercurial |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
2 # |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
3 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
4 # |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
5 # This software may be used and distributed according to the terms of |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
6 # the GNU General Public License (version 2), incorporated herein by |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
7 # reference. |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
8 |
7606
e86ca711544d
zeroconf: add extension documentation
David Soria Parra <dsp@php.net>
parents:
7295
diff
changeset
|
9 '''zeroconf support for mercurial repositories |
e86ca711544d
zeroconf: add extension documentation
David Soria Parra <dsp@php.net>
parents:
7295
diff
changeset
|
10 |
e86ca711544d
zeroconf: add extension documentation
David Soria Parra <dsp@php.net>
parents:
7295
diff
changeset
|
11 Zeroconf enabled repositories will be announced in a network without the need |
e86ca711544d
zeroconf: add extension documentation
David Soria Parra <dsp@php.net>
parents:
7295
diff
changeset
|
12 to configure a server or a service. They can be discovered without knowing |
e86ca711544d
zeroconf: add extension documentation
David Soria Parra <dsp@php.net>
parents:
7295
diff
changeset
|
13 their actual IP address. |
e86ca711544d
zeroconf: add extension documentation
David Soria Parra <dsp@php.net>
parents:
7295
diff
changeset
|
14 |
e86ca711544d
zeroconf: add extension documentation
David Soria Parra <dsp@php.net>
parents:
7295
diff
changeset
|
15 To use the zeroconf extension add the following entry to your hgrc file: |
e86ca711544d
zeroconf: add extension documentation
David Soria Parra <dsp@php.net>
parents:
7295
diff
changeset
|
16 |
e86ca711544d
zeroconf: add extension documentation
David Soria Parra <dsp@php.net>
parents:
7295
diff
changeset
|
17 [extensions] |
e86ca711544d
zeroconf: add extension documentation
David Soria Parra <dsp@php.net>
parents:
7295
diff
changeset
|
18 hgext.zeroconf = |
e86ca711544d
zeroconf: add extension documentation
David Soria Parra <dsp@php.net>
parents:
7295
diff
changeset
|
19 |
e86ca711544d
zeroconf: add extension documentation
David Soria Parra <dsp@php.net>
parents:
7295
diff
changeset
|
20 To allow other people to discover your repository using run "hg serve" in your |
e86ca711544d
zeroconf: add extension documentation
David Soria Parra <dsp@php.net>
parents:
7295
diff
changeset
|
21 repository. |
e86ca711544d
zeroconf: add extension documentation
David Soria Parra <dsp@php.net>
parents:
7295
diff
changeset
|
22 |
e86ca711544d
zeroconf: add extension documentation
David Soria Parra <dsp@php.net>
parents:
7295
diff
changeset
|
23 $ cd test |
e86ca711544d
zeroconf: add extension documentation
David Soria Parra <dsp@php.net>
parents:
7295
diff
changeset
|
24 $ hg serve |
e86ca711544d
zeroconf: add extension documentation
David Soria Parra <dsp@php.net>
parents:
7295
diff
changeset
|
25 |
e86ca711544d
zeroconf: add extension documentation
David Soria Parra <dsp@php.net>
parents:
7295
diff
changeset
|
26 You can discover zeroconf enabled repositories by running "hg paths". |
e86ca711544d
zeroconf: add extension documentation
David Soria Parra <dsp@php.net>
parents:
7295
diff
changeset
|
27 |
e86ca711544d
zeroconf: add extension documentation
David Soria Parra <dsp@php.net>
parents:
7295
diff
changeset
|
28 $ hg paths |
e86ca711544d
zeroconf: add extension documentation
David Soria Parra <dsp@php.net>
parents:
7295
diff
changeset
|
29 zc-test = http://example.com:8000/test |
e86ca711544d
zeroconf: add extension documentation
David Soria Parra <dsp@php.net>
parents:
7295
diff
changeset
|
30 ''' |
e86ca711544d
zeroconf: add extension documentation
David Soria Parra <dsp@php.net>
parents:
7295
diff
changeset
|
31 |
7071
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
32 import Zeroconf, socket, time, os |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
33 from mercurial import ui |
7216
292fb2ad2846
extensions: use new wrapper functions
Matt Mackall <mpm@selenic.com>
parents:
7088
diff
changeset
|
34 from mercurial import extensions |
7071
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
35 from mercurial.hgweb import hgweb_mod |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
36 from mercurial.hgweb import hgwebdir_mod |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
37 |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
38 # publish |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
39 |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
40 server = None |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
41 localip = None |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
42 |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
43 def getip(): |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
44 # finds external-facing interface without sending any packets (Linux) |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
45 try: |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
46 s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
47 s.connect(('1.0.0.1', 0)) |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
48 ip = s.getsockname()[0] |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
49 return ip |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
50 except: |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
51 pass |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
52 |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
53 # Generic method, sometimes gives useless results |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
54 dumbip = socket.gethostbyaddr(socket.gethostname())[2][0] |
7777
e3425726b80d
zeroconf: don't allow ipv6 addresses
Alexander Solovyov <piranha@piranha.org.ua>
parents:
7606
diff
changeset
|
55 if not dumbip.startswith('127.') and ':' not in dumbip: |
7071
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
56 return dumbip |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
57 |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
58 # works elsewhere, but actually sends a packet |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
59 try: |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
60 s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
61 s.connect(('1.0.0.1', 1)) |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
62 ip = s.getsockname()[0] |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
63 return ip |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
64 except: |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
65 pass |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
66 |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
67 return dumbip |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
68 |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
69 def publish(name, desc, path, port): |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
70 global server, localip |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
71 if not server: |
7295
66d0fc108044
zeroconf: Don't break serve if no internet connection is present.
Augie Fackler <durin42@gmail.com>
parents:
7282
diff
changeset
|
72 try: |
66d0fc108044
zeroconf: Don't break serve if no internet connection is present.
Augie Fackler <durin42@gmail.com>
parents:
7282
diff
changeset
|
73 server = Zeroconf.Zeroconf() |
66d0fc108044
zeroconf: Don't break serve if no internet connection is present.
Augie Fackler <durin42@gmail.com>
parents:
7282
diff
changeset
|
74 except socket.gaierror: |
66d0fc108044
zeroconf: Don't break serve if no internet connection is present.
Augie Fackler <durin42@gmail.com>
parents:
7282
diff
changeset
|
75 # if we have no internet connection, this can happen. |
66d0fc108044
zeroconf: Don't break serve if no internet connection is present.
Augie Fackler <durin42@gmail.com>
parents:
7282
diff
changeset
|
76 return |
7071
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
77 ip = getip() |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
78 localip = socket.inet_aton(ip) |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
79 |
7845
c2cd8d772805
zeroconf: advertise repositories with hostname
Alexander Solovyov <piranha@piranha.org.ua>
parents:
7777
diff
changeset
|
80 hostname = socket.gethostname().split('.')[0] |
c2cd8d772805
zeroconf: advertise repositories with hostname
Alexander Solovyov <piranha@piranha.org.ua>
parents:
7777
diff
changeset
|
81 host = hostname + ".local" |
c2cd8d772805
zeroconf: advertise repositories with hostname
Alexander Solovyov <piranha@piranha.org.ua>
parents:
7777
diff
changeset
|
82 name = "%s-%s" % (hostname, name) |
7071
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
83 |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
84 # advertise to browsers |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
85 svc = Zeroconf.ServiceInfo('_http._tcp.local.', |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
86 name + '._http._tcp.local.', |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
87 server = host, |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
88 port = port, |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
89 properties = {'description': desc, |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
90 'path': "/" + path}, |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
91 address = localip, weight = 0, priority = 0) |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
92 server.registerService(svc) |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
93 |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
94 # advertise to Mercurial clients |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
95 svc = Zeroconf.ServiceInfo('_hg._tcp.local.', |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
96 name + '._hg._tcp.local.', |
7088
58b7b5ef6cd0
zeroconf: advertise a proper hostname for _hg services
Matt Mackall <mpm@selenic.com>
parents:
7087
diff
changeset
|
97 server = host, |
7071
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
98 port = port, |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
99 properties = {'description': desc, |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
100 'path': "/" + path}, |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
101 address = localip, weight = 0, priority = 0) |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
102 server.registerService(svc) |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
103 |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
104 class hgwebzc(hgweb_mod.hgweb): |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
105 def __init__(self, repo, name=None): |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
106 super(hgwebzc, self).__init__(repo, name) |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
107 name = self.reponame or os.path.basename(repo.root) |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
108 desc = self.repo.ui.config("web", "description", name) |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
109 publish(name, desc, name, int(repo.ui.config("web", "port", 8000))) |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
110 |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
111 class hgwebdirzc(hgwebdir_mod.hgwebdir): |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
112 def run(self): |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
113 for r, p in self.repos: |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
114 u = ui.ui(parentui=self.parentui) |
7282
6541696b5f66
fix zeroconf handling for hgwebdir (error found by pychecker)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7280
diff
changeset
|
115 u.readconfig(os.path.join(p, '.hg', 'hgrc')) |
7071
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
116 n = os.path.basename(r) |
7282
6541696b5f66
fix zeroconf handling for hgwebdir (error found by pychecker)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7280
diff
changeset
|
117 publish(n, "hgweb", p, int(u.config("web", "port", 8000))) |
7071
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
118 return super(hgwebdirzc, self).run() |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
119 |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
120 # listen |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
121 |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
122 class listener(object): |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
123 def __init__(self): |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
124 self.found = {} |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
125 def removeService(self, server, type, name): |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
126 if repr(name) in self.found: |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
127 del self.found[repr(name)] |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
128 def addService(self, server, type, name): |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
129 self.found[repr(name)] = server.getServiceInfo(type, name) |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
130 |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
131 def getzcpaths(): |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
132 server = Zeroconf.Zeroconf() |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
133 l = listener() |
7874
d812029cda85
cleanup: drop variables for unused return values
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7845
diff
changeset
|
134 Zeroconf.ServiceBrowser(server, "_hg._tcp.local.", l) |
7071
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
135 time.sleep(1) |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
136 server.close() |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
137 for v in l.found.values(): |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
138 n = v.name[:v.name.index('.')] |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
139 n.replace(" ", "-") |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
140 u = "http://%s:%s%s" % (socket.inet_ntoa(v.address), v.port, |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
141 v.properties.get("path", "/")) |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
142 yield "zc-" + n, u |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
143 |
7216
292fb2ad2846
extensions: use new wrapper functions
Matt Mackall <mpm@selenic.com>
parents:
7088
diff
changeset
|
144 def config(orig, self, section, key, default=None, untrusted=False): |
7071
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
145 if section == "paths" and key.startswith("zc-"): |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
146 for n, p in getzcpaths(): |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
147 if n == key: |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
148 return p |
7216
292fb2ad2846
extensions: use new wrapper functions
Matt Mackall <mpm@selenic.com>
parents:
7088
diff
changeset
|
149 return orig(self, section, key, default, untrusted) |
7071
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
150 |
7238
b1a9ad7b464e
zeroconf: don't break on hg showconfig
Matt Mackall <mpm@selenic.com>
parents:
7216
diff
changeset
|
151 def configitems(orig, self, section, untrusted=False): |
b1a9ad7b464e
zeroconf: don't break on hg showconfig
Matt Mackall <mpm@selenic.com>
parents:
7216
diff
changeset
|
152 r = orig(self, section, untrusted) |
7071
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
153 if section == "paths": |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
154 r += getzcpaths() |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
155 return r |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
156 |
7216
292fb2ad2846
extensions: use new wrapper functions
Matt Mackall <mpm@selenic.com>
parents:
7088
diff
changeset
|
157 extensions.wrapfunction(ui.ui, 'config', config) |
292fb2ad2846
extensions: use new wrapper functions
Matt Mackall <mpm@selenic.com>
parents:
7088
diff
changeset
|
158 extensions.wrapfunction(ui.ui, 'configitems', configitems) |
7071
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
159 hgweb_mod.hgweb = hgwebzc |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
160 hgwebdir_mod.hgwebdir = hgwebdirzc |