Mercurial > hg
annotate hgext/zeroconf/__init__.py @ 12161:dfb11f9922c1
tests: remove unneeded -u flags
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Thu, 02 Sep 2010 23:45:47 +0200 |
parents | 49463314c24f |
children | 23fc62e0a960 |
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 # |
8225
46293a0c7e9f
updated license to be explicit about GPL version 2
Martin Geisler <mg@lazybytes.net>
parents:
8191
diff
changeset
|
5 # This software may be used and distributed according to the terms of the |
10263 | 6 # GNU General Public License version 2 or any later version. |
7071
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
7 |
8894
868670dbc237
extensions: improve the consistency of synopses
Cédric Duval <cedricduval@free.fr>
parents:
8866
diff
changeset
|
8 '''discover and advertise repositories on the local network |
7606
e86ca711544d
zeroconf: add extension documentation
David Soria Parra <dsp@php.net>
parents:
7295
diff
changeset
|
9 |
11504
6bfb76cb8873
zeroconf: small fixes in docstring
Martin Geisler <mg@lazybytes.net>
parents:
11340
diff
changeset
|
10 Zeroconf-enabled repositories will be announced in a network without |
8003
14f27921932a
zeroconf: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk>
parents:
7874
diff
changeset
|
11 the need to configure a server or a service. They can be discovered |
14f27921932a
zeroconf: word-wrap help texts at 70 characters
Martin Geisler <mg@daimi.au.dk>
parents:
7874
diff
changeset
|
12 without knowing their actual IP address. |
7606
e86ca711544d
zeroconf: add extension documentation
David Soria Parra <dsp@php.net>
parents:
7295
diff
changeset
|
13 |
11504
6bfb76cb8873
zeroconf: small fixes in docstring
Martin Geisler <mg@lazybytes.net>
parents:
11340
diff
changeset
|
14 To allow other people to discover your repository using run |
6bfb76cb8873
zeroconf: small fixes in docstring
Martin Geisler <mg@lazybytes.net>
parents:
11340
diff
changeset
|
15 :hg:`serve` in your repository:: |
7606
e86ca711544d
zeroconf: add extension documentation
David Soria Parra <dsp@php.net>
parents:
7295
diff
changeset
|
16 |
9218
d3db87d68337
zeroconf: use reST syntax for literal blocks
Martin Geisler <mg@lazybytes.net>
parents:
9078
diff
changeset
|
17 $ cd test |
d3db87d68337
zeroconf: use reST syntax for literal blocks
Martin Geisler <mg@lazybytes.net>
parents:
9078
diff
changeset
|
18 $ hg serve |
7606
e86ca711544d
zeroconf: add extension documentation
David Soria Parra <dsp@php.net>
parents:
7295
diff
changeset
|
19 |
11504
6bfb76cb8873
zeroconf: small fixes in docstring
Martin Geisler <mg@lazybytes.net>
parents:
11340
diff
changeset
|
20 You can discover Zeroconf-enabled repositories by running |
6bfb76cb8873
zeroconf: small fixes in docstring
Martin Geisler <mg@lazybytes.net>
parents:
11340
diff
changeset
|
21 :hg:`paths`:: |
7606
e86ca711544d
zeroconf: add extension documentation
David Soria Parra <dsp@php.net>
parents:
7295
diff
changeset
|
22 |
9218
d3db87d68337
zeroconf: use reST syntax for literal blocks
Martin Geisler <mg@lazybytes.net>
parents:
9078
diff
changeset
|
23 $ hg paths |
d3db87d68337
zeroconf: use reST syntax for literal blocks
Martin Geisler <mg@lazybytes.net>
parents:
9078
diff
changeset
|
24 zc-test = http://example.com:8000/test |
7606
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 |
11340
938fefb57db5
hgext/zeroconf/__init__.py: Separate relative and absolute imports.
Renato Cunha <renatoc@gmail.com>
parents:
11005
diff
changeset
|
27 import socket, time, os |
938fefb57db5
hgext/zeroconf/__init__.py: Separate relative and absolute imports.
Renato Cunha <renatoc@gmail.com>
parents:
11005
diff
changeset
|
28 |
938fefb57db5
hgext/zeroconf/__init__.py: Separate relative and absolute imports.
Renato Cunha <renatoc@gmail.com>
parents:
11005
diff
changeset
|
29 import Zeroconf |
12076
49463314c24f
mail/hgweb: support service names for ports (issue2350)
Brodie Rao <brodie@bitheap.org>
parents:
11504
diff
changeset
|
30 from mercurial import ui, hg, encoding, util |
7216
292fb2ad2846
extensions: use new wrapper functions
Matt Mackall <mpm@selenic.com>
parents:
7088
diff
changeset
|
31 from mercurial import extensions |
7071
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
32 from mercurial.hgweb import hgweb_mod |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
33 from mercurial.hgweb import hgwebdir_mod |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
34 |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
35 # publish |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
36 |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
37 server = None |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
38 localip = None |
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 def getip(): |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
41 # finds external-facing interface without sending any packets (Linux) |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
42 try: |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
43 s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
44 s.connect(('1.0.0.1', 0)) |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
45 ip = s.getsockname()[0] |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
46 return ip |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
47 except: |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
48 pass |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
49 |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
50 # Generic method, sometimes gives useless results |
8264
63ea850b3312
zeroconf: guess ip for Zeroconf
Alexander Solovyov <piranha@piranha.org.ua>
parents:
8225
diff
changeset
|
51 try: |
63ea850b3312
zeroconf: guess ip for Zeroconf
Alexander Solovyov <piranha@piranha.org.ua>
parents:
8225
diff
changeset
|
52 dumbip = socket.gethostbyaddr(socket.gethostname())[2][0] |
63ea850b3312
zeroconf: guess ip for Zeroconf
Alexander Solovyov <piranha@piranha.org.ua>
parents:
8225
diff
changeset
|
53 if not dumbip.startswith('127.') and ':' not in dumbip: |
63ea850b3312
zeroconf: guess ip for Zeroconf
Alexander Solovyov <piranha@piranha.org.ua>
parents:
8225
diff
changeset
|
54 return dumbip |
10317
192083a3e6fe
zeroconf: gethostbyaddr may also fail with socket.herror
Augie Fackler <durin42@gmail.com>
parents:
10263
diff
changeset
|
55 except (socket.gaierror, socket.herror): |
8264
63ea850b3312
zeroconf: guess ip for Zeroconf
Alexander Solovyov <piranha@piranha.org.ua>
parents:
8225
diff
changeset
|
56 dumbip = '127.0.0.1' |
7071
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: |
8264
63ea850b3312
zeroconf: guess ip for Zeroconf
Alexander Solovyov <piranha@piranha.org.ua>
parents:
8225
diff
changeset
|
72 ip = getip() |
63ea850b3312
zeroconf: guess ip for Zeroconf
Alexander Solovyov <piranha@piranha.org.ua>
parents:
8225
diff
changeset
|
73 if ip.startswith('127.'): |
7295
66d0fc108044
zeroconf: Don't break serve if no internet connection is present.
Augie Fackler <durin42@gmail.com>
parents:
7282
diff
changeset
|
74 # 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
|
75 return |
7071
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
76 localip = socket.inet_aton(ip) |
8264
63ea850b3312
zeroconf: guess ip for Zeroconf
Alexander Solovyov <piranha@piranha.org.ua>
parents:
8225
diff
changeset
|
77 server = Zeroconf.Zeroconf(ip) |
7071
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
78 |
7845
c2cd8d772805
zeroconf: advertise repositories with hostname
Alexander Solovyov <piranha@piranha.org.ua>
parents:
7777
diff
changeset
|
79 hostname = socket.gethostname().split('.')[0] |
c2cd8d772805
zeroconf: advertise repositories with hostname
Alexander Solovyov <piranha@piranha.org.ua>
parents:
7777
diff
changeset
|
80 host = hostname + ".local" |
c2cd8d772805
zeroconf: advertise repositories with hostname
Alexander Solovyov <piranha@piranha.org.ua>
parents:
7777
diff
changeset
|
81 name = "%s-%s" % (hostname, name) |
7071
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
82 |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
83 # advertise to browsers |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
84 svc = Zeroconf.ServiceInfo('_http._tcp.local.', |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
85 name + '._http._tcp.local.', |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
86 server = host, |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
87 port = port, |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
88 properties = {'description': desc, |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
89 'path': "/" + path}, |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
90 address = localip, weight = 0, priority = 0) |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
91 server.registerService(svc) |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
92 |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
93 # advertise to Mercurial clients |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
94 svc = Zeroconf.ServiceInfo('_hg._tcp.local.', |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
95 name + '._hg._tcp.local.', |
7088
58b7b5ef6cd0
zeroconf: advertise a proper hostname for _hg services
Matt Mackall <mpm@selenic.com>
parents:
7087
diff
changeset
|
96 server = host, |
7071
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
97 port = port, |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
98 properties = {'description': desc, |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
99 'path': "/" + path}, |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
100 address = localip, weight = 0, priority = 0) |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
101 server.registerService(svc) |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
102 |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
103 class hgwebzc(hgweb_mod.hgweb): |
11005
c9b4e9431af7
zeroconf: handle string hgweb config args
Matt Mackall <mpm@selenic.com>
parents:
10993
diff
changeset
|
104 def __init__(self, repo, name=None, baseui=None): |
c9b4e9431af7
zeroconf: handle string hgweb config args
Matt Mackall <mpm@selenic.com>
parents:
10993
diff
changeset
|
105 super(hgwebzc, self).__init__(repo, name=name, baseui=baseui) |
c9b4e9431af7
zeroconf: handle string hgweb config args
Matt Mackall <mpm@selenic.com>
parents:
10993
diff
changeset
|
106 name = self.reponame or os.path.basename(self.repo.root) |
9442
080227f584a1
zeroconf: fix hgweb published URLs (issue1819)
Patrick Mezard <pmezard@gmail.com>
parents:
8894
diff
changeset
|
107 path = self.repo.ui.config("web", "prefix", "").strip('/') |
7071
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
108 desc = self.repo.ui.config("web", "description", name) |
11005
c9b4e9431af7
zeroconf: handle string hgweb config args
Matt Mackall <mpm@selenic.com>
parents:
10993
diff
changeset
|
109 publish(name, desc, path, |
12076
49463314c24f
mail/hgweb: support service names for ports (issue2350)
Brodie Rao <brodie@bitheap.org>
parents:
11504
diff
changeset
|
110 util.getport(self.repo.ui.config("web", "port", 8000))) |
7071
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
111 |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
112 class hgwebdirzc(hgwebdir_mod.hgwebdir): |
9442
080227f584a1
zeroconf: fix hgweb published URLs (issue1819)
Patrick Mezard <pmezard@gmail.com>
parents:
8894
diff
changeset
|
113 def __init__(self, conf, baseui=None): |
10993
c1b43d786889
hgweb: make baseui parameter non-positional
Matt Mackall <mpm@selenic.com>
parents:
10342
diff
changeset
|
114 super(hgwebdirzc, self).__init__(conf, baseui=baseui) |
9442
080227f584a1
zeroconf: fix hgweb published URLs (issue1819)
Patrick Mezard <pmezard@gmail.com>
parents:
8894
diff
changeset
|
115 prefix = self.ui.config("web", "prefix", "").strip('/') + '/' |
9488
33a6213a974e
zeroconf: code cleanup, fixing variable names to be meaningful
Alexander Solovyov <piranha@piranha.org.ua>
parents:
9443
diff
changeset
|
116 for repo, path in self.repos: |
8191
35604226d712
hgweb: kill parentui references
Matt Mackall <mpm@selenic.com>
parents:
8190
diff
changeset
|
117 u = self.ui.copy() |
9488
33a6213a974e
zeroconf: code cleanup, fixing variable names to be meaningful
Alexander Solovyov <piranha@piranha.org.ua>
parents:
9443
diff
changeset
|
118 u.readconfig(os.path.join(path, '.hg', 'hgrc')) |
33a6213a974e
zeroconf: code cleanup, fixing variable names to be meaningful
Alexander Solovyov <piranha@piranha.org.ua>
parents:
9443
diff
changeset
|
119 name = os.path.basename(repo) |
33a6213a974e
zeroconf: code cleanup, fixing variable names to be meaningful
Alexander Solovyov <piranha@piranha.org.ua>
parents:
9443
diff
changeset
|
120 path = (prefix + repo).strip('/') |
9489
cec4b0d3fb02
zeroconf: read actual description for repos in hgwebdir
Alexander Solovyov <piranha@piranha.org.ua>
parents:
9488
diff
changeset
|
121 desc = u.config('web', 'description', name) |
12076
49463314c24f
mail/hgweb: support service names for ports (issue2350)
Brodie Rao <brodie@bitheap.org>
parents:
11504
diff
changeset
|
122 publish(name, desc, path, util.getport(u.config("web", "port", 8000))) |
7071
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
123 |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
124 # listen |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
125 |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
126 class listener(object): |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
127 def __init__(self): |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
128 self.found = {} |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
129 def removeService(self, server, type, name): |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
130 if repr(name) in self.found: |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
131 del self.found[repr(name)] |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
132 def addService(self, server, type, name): |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
133 self.found[repr(name)] = server.getServiceInfo(type, name) |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
134 |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
135 def getzcpaths(): |
8264
63ea850b3312
zeroconf: guess ip for Zeroconf
Alexander Solovyov <piranha@piranha.org.ua>
parents:
8225
diff
changeset
|
136 ip = getip() |
63ea850b3312
zeroconf: guess ip for Zeroconf
Alexander Solovyov <piranha@piranha.org.ua>
parents:
8225
diff
changeset
|
137 if ip.startswith('127.'): |
63ea850b3312
zeroconf: guess ip for Zeroconf
Alexander Solovyov <piranha@piranha.org.ua>
parents:
8225
diff
changeset
|
138 return |
63ea850b3312
zeroconf: guess ip for Zeroconf
Alexander Solovyov <piranha@piranha.org.ua>
parents:
8225
diff
changeset
|
139 server = Zeroconf.Zeroconf(ip) |
7071
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
140 l = listener() |
7874
d812029cda85
cleanup: drop variables for unused return values
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
7845
diff
changeset
|
141 Zeroconf.ServiceBrowser(server, "_hg._tcp.local.", l) |
7071
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
142 time.sleep(1) |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
143 server.close() |
9488
33a6213a974e
zeroconf: code cleanup, fixing variable names to be meaningful
Alexander Solovyov <piranha@piranha.org.ua>
parents:
9443
diff
changeset
|
144 for value in l.found.values(): |
33a6213a974e
zeroconf: code cleanup, fixing variable names to be meaningful
Alexander Solovyov <piranha@piranha.org.ua>
parents:
9443
diff
changeset
|
145 name = value.name[:value.name.index('.')] |
33a6213a974e
zeroconf: code cleanup, fixing variable names to be meaningful
Alexander Solovyov <piranha@piranha.org.ua>
parents:
9443
diff
changeset
|
146 url = "http://%s:%s%s" % (socket.inet_ntoa(value.address), value.port, |
33a6213a974e
zeroconf: code cleanup, fixing variable names to be meaningful
Alexander Solovyov <piranha@piranha.org.ua>
parents:
9443
diff
changeset
|
147 value.properties.get("path", "/")) |
33a6213a974e
zeroconf: code cleanup, fixing variable names to be meaningful
Alexander Solovyov <piranha@piranha.org.ua>
parents:
9443
diff
changeset
|
148 yield "zc-" + name, url |
7071
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
149 |
7216
292fb2ad2846
extensions: use new wrapper functions
Matt Mackall <mpm@selenic.com>
parents:
7088
diff
changeset
|
150 def config(orig, self, section, key, default=None, untrusted=False): |
7071
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
151 if section == "paths" and key.startswith("zc-"): |
9488
33a6213a974e
zeroconf: code cleanup, fixing variable names to be meaningful
Alexander Solovyov <piranha@piranha.org.ua>
parents:
9443
diff
changeset
|
152 for name, path in getzcpaths(): |
33a6213a974e
zeroconf: code cleanup, fixing variable names to be meaningful
Alexander Solovyov <piranha@piranha.org.ua>
parents:
9443
diff
changeset
|
153 if name == key: |
33a6213a974e
zeroconf: code cleanup, fixing variable names to be meaningful
Alexander Solovyov <piranha@piranha.org.ua>
parents:
9443
diff
changeset
|
154 return path |
7216
292fb2ad2846
extensions: use new wrapper functions
Matt Mackall <mpm@selenic.com>
parents:
7088
diff
changeset
|
155 return orig(self, section, key, default, untrusted) |
7071
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
156 |
7238
b1a9ad7b464e
zeroconf: don't break on hg showconfig
Matt Mackall <mpm@selenic.com>
parents:
7216
diff
changeset
|
157 def configitems(orig, self, section, untrusted=False): |
9488
33a6213a974e
zeroconf: code cleanup, fixing variable names to be meaningful
Alexander Solovyov <piranha@piranha.org.ua>
parents:
9443
diff
changeset
|
158 repos = orig(self, section, untrusted) |
7071
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
159 if section == "paths": |
9488
33a6213a974e
zeroconf: code cleanup, fixing variable names to be meaningful
Alexander Solovyov <piranha@piranha.org.ua>
parents:
9443
diff
changeset
|
160 repos += getzcpaths() |
33a6213a974e
zeroconf: code cleanup, fixing variable names to be meaningful
Alexander Solovyov <piranha@piranha.org.ua>
parents:
9443
diff
changeset
|
161 return repos |
7071
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
162 |
10342
579aae5aa549
zeroconf: override default destination folder on clone
Henrik Stuart <hg@hstuart.dk>
parents:
10317
diff
changeset
|
163 def defaultdest(orig, source): |
579aae5aa549
zeroconf: override default destination folder on clone
Henrik Stuart <hg@hstuart.dk>
parents:
10317
diff
changeset
|
164 for name, path in getzcpaths(): |
579aae5aa549
zeroconf: override default destination folder on clone
Henrik Stuart <hg@hstuart.dk>
parents:
10317
diff
changeset
|
165 if path == source: |
579aae5aa549
zeroconf: override default destination folder on clone
Henrik Stuart <hg@hstuart.dk>
parents:
10317
diff
changeset
|
166 return name.encode(encoding.encoding) |
579aae5aa549
zeroconf: override default destination folder on clone
Henrik Stuart <hg@hstuart.dk>
parents:
10317
diff
changeset
|
167 return orig(source) |
579aae5aa549
zeroconf: override default destination folder on clone
Henrik Stuart <hg@hstuart.dk>
parents:
10317
diff
changeset
|
168 |
7216
292fb2ad2846
extensions: use new wrapper functions
Matt Mackall <mpm@selenic.com>
parents:
7088
diff
changeset
|
169 extensions.wrapfunction(ui.ui, 'config', config) |
292fb2ad2846
extensions: use new wrapper functions
Matt Mackall <mpm@selenic.com>
parents:
7088
diff
changeset
|
170 extensions.wrapfunction(ui.ui, 'configitems', configitems) |
10342
579aae5aa549
zeroconf: override default destination folder on clone
Henrik Stuart <hg@hstuart.dk>
parents:
10317
diff
changeset
|
171 extensions.wrapfunction(hg, 'defaultdest', defaultdest) |
7071
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
172 hgweb_mod.hgweb = hgwebzc |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
173 hgwebdir_mod.hgwebdir = hgwebdirzc |