Mercurial > hg
annotate hgext/zeroconf/__init__.py @ 51863:f4733654f144
typing: add `from __future__ import annotations` to most files
Now that py36 is no longer supported, we can postpone annotation evaluation.
This means that the quoting is usually optional (for things imported under the
guard of `if typing.TYPE_CHECKING:` to avoid circular imports), and there's less
overhead on startup[1].
There may be some missing here. I backed out 6000f5b25c9b (which removed the
`from __future__ import ...` that was supporting py2), reverted the changes in
`contrib/`, `doc/`, and `tests/`, and then ran:
$ hg status -n --change . | \
xargs sed -i -e 's/from __future__ import .*$/from __future__ import annotations/'
There were some minor tweaks needed when reviewing (mostly making the spacing
around the import consistent, and `mercurial/testing/__init__.py` had a
multiline import that wasn't fully rewritten.
[1] https://docs.python.org/3/whatsnew/3.7.html#pep-563-postponed-evaluation-of-annotations
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Mon, 16 Sep 2024 15:36:44 +0200 |
parents | c3d7a0828b7b |
children |
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 # |
46819
d4ba4d51f85f
contributor: change mentions of mpm to olivia
Raphaël Gomès <rgomes@octobus.net>
parents:
44246
diff
changeset
|
3 # Copyright 2005-2007 Olivia Mackall <olivia@selenic.com> |
7071
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. |
8894
868670dbc237
extensions: improve the consistency of synopses
Cédric Duval <cedricduval@free.fr>
parents:
8866
diff
changeset
|
7 '''discover and advertise repositories on the local network |
7606
e86ca711544d
zeroconf: add extension documentation
David Soria Parra <dsp@php.net>
parents:
7295
diff
changeset
|
8 |
43500
6337b10c46bc
zeroconf: improve the extension's documentation
Vernon Tang <vt@foilhead.net>
parents:
43077
diff
changeset
|
9 The zeroconf extension will advertise :hg:`serve` instances over |
6337b10c46bc
zeroconf: improve the extension's documentation
Vernon Tang <vt@foilhead.net>
parents:
43077
diff
changeset
|
10 DNS-SD so that they can be discovered using the :hg:`paths` command |
6337b10c46bc
zeroconf: improve the extension's documentation
Vernon Tang <vt@foilhead.net>
parents:
43077
diff
changeset
|
11 without knowing the server's IP address. |
7606
e86ca711544d
zeroconf: add extension documentation
David Soria Parra <dsp@php.net>
parents:
7295
diff
changeset
|
12 |
11504
6bfb76cb8873
zeroconf: small fixes in docstring
Martin Geisler <mg@lazybytes.net>
parents:
11340
diff
changeset
|
13 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
|
14 :hg:`serve` in your repository:: |
7606
e86ca711544d
zeroconf: add extension documentation
David Soria Parra <dsp@php.net>
parents:
7295
diff
changeset
|
15 |
9218
d3db87d68337
zeroconf: use reST syntax for literal blocks
Martin Geisler <mg@lazybytes.net>
parents:
9078
diff
changeset
|
16 $ cd test |
d3db87d68337
zeroconf: use reST syntax for literal blocks
Martin Geisler <mg@lazybytes.net>
parents:
9078
diff
changeset
|
17 $ hg serve |
7606
e86ca711544d
zeroconf: add extension documentation
David Soria Parra <dsp@php.net>
parents:
7295
diff
changeset
|
18 |
11504
6bfb76cb8873
zeroconf: small fixes in docstring
Martin Geisler <mg@lazybytes.net>
parents:
11340
diff
changeset
|
19 You can discover Zeroconf-enabled repositories by running |
6bfb76cb8873
zeroconf: small fixes in docstring
Martin Geisler <mg@lazybytes.net>
parents:
11340
diff
changeset
|
20 :hg:`paths`:: |
7606
e86ca711544d
zeroconf: add extension documentation
David Soria Parra <dsp@php.net>
parents:
7295
diff
changeset
|
21 |
9218
d3db87d68337
zeroconf: use reST syntax for literal blocks
Martin Geisler <mg@lazybytes.net>
parents:
9078
diff
changeset
|
22 $ hg paths |
d3db87d68337
zeroconf: use reST syntax for literal blocks
Martin Geisler <mg@lazybytes.net>
parents:
9078
diff
changeset
|
23 zc-test = http://example.com:8000/test |
7606
e86ca711544d
zeroconf: add extension documentation
David Soria Parra <dsp@php.net>
parents:
7295
diff
changeset
|
24 ''' |
e86ca711544d
zeroconf: add extension documentation
David Soria Parra <dsp@php.net>
parents:
7295
diff
changeset
|
25 |
51863
f4733654f144
typing: add `from __future__ import annotations` to most files
Matt Harbison <matt_harbison@yahoo.com>
parents:
50794
diff
changeset
|
26 from __future__ import annotations |
f4733654f144
typing: add `from __future__ import annotations` to most files
Matt Harbison <matt_harbison@yahoo.com>
parents:
50794
diff
changeset
|
27 |
28296
a73394e7b47c
zeroconf: use absolute_import
timeless <timeless@mozdev.org>
parents:
28250
diff
changeset
|
28 import os |
a73394e7b47c
zeroconf: use absolute_import
timeless <timeless@mozdev.org>
parents:
28250
diff
changeset
|
29 import socket |
a73394e7b47c
zeroconf: use absolute_import
timeless <timeless@mozdev.org>
parents:
28250
diff
changeset
|
30 import time |
11340
938fefb57db5
hgext/zeroconf/__init__.py: Separate relative and absolute imports.
Renato Cunha <renatoc@gmail.com>
parents:
11005
diff
changeset
|
31 |
28296
a73394e7b47c
zeroconf: use absolute_import
timeless <timeless@mozdev.org>
parents:
28250
diff
changeset
|
32 from . import Zeroconf |
a73394e7b47c
zeroconf: use absolute_import
timeless <timeless@mozdev.org>
parents:
28250
diff
changeset
|
33 from mercurial import ( |
a73394e7b47c
zeroconf: use absolute_import
timeless <timeless@mozdev.org>
parents:
28250
diff
changeset
|
34 dispatch, |
a73394e7b47c
zeroconf: use absolute_import
timeless <timeless@mozdev.org>
parents:
28250
diff
changeset
|
35 encoding, |
a73394e7b47c
zeroconf: use absolute_import
timeless <timeless@mozdev.org>
parents:
28250
diff
changeset
|
36 extensions, |
a73394e7b47c
zeroconf: use absolute_import
timeless <timeless@mozdev.org>
parents:
28250
diff
changeset
|
37 hg, |
42549
fa2071753dc2
zeroconf: port to Python 3
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34238
diff
changeset
|
38 pycompat, |
44246
eecc005229ff
config: also respect HGRCSKIPREPO in the zeroconf extension
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43506
diff
changeset
|
39 rcutil, |
28308
4de74eda1d65
zeroconf: import ui as uimod per test-check-module-imports
Augie Fackler <augie@google.com>
parents:
28296
diff
changeset
|
40 ui as uimod, |
28296
a73394e7b47c
zeroconf: use absolute_import
timeless <timeless@mozdev.org>
parents:
28250
diff
changeset
|
41 ) |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42549
diff
changeset
|
42 from mercurial.hgweb import server as servermod |
7071
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
43 |
29841
d5883fd055c6
extensions: change magic "shipped with hg" string
Augie Fackler <augie@google.com>
parents:
28308
diff
changeset
|
44 # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for |
25186
80c5b2666a96
extensions: document that `testedwith = 'internal'` is special
Augie Fackler <augie@google.com>
parents:
18190
diff
changeset
|
45 # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should |
80c5b2666a96
extensions: document that `testedwith = 'internal'` is special
Augie Fackler <augie@google.com>
parents:
18190
diff
changeset
|
46 # be specifying the version(s) of Mercurial they are tested with, or |
80c5b2666a96
extensions: document that `testedwith = 'internal'` is special
Augie Fackler <augie@google.com>
parents:
18190
diff
changeset
|
47 # leave the attribute unspecified. |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
48 testedwith = b'ships-with-hg-core' |
16743
38caf405d010
hgext: mark all first-party extensions as such
Augie Fackler <raf@durin42.com>
parents:
16688
diff
changeset
|
49 |
7071
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
50 # publish |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
51 |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
52 server = None |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
53 localip = None |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
54 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42549
diff
changeset
|
55 |
7071
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
56 def getip(): |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
57 # finds external-facing interface without sending any packets (Linux) |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
58 try: |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
59 s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) |
43506
9f70512ae2cf
cleanup: remove pointless r-prefixes on single-quoted strings
Augie Fackler <augie@google.com>
parents:
43503
diff
changeset
|
60 s.connect(('1.0.0.1', 0)) |
7071
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
61 ip = s.getsockname()[0] |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
62 return ip |
16688
cfb6682961b8
cleanup: replace naked excepts with more specific ones
Brodie Rao <brodie@sf.io>
parents:
16683
diff
changeset
|
63 except socket.error: |
7071
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
64 pass |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
65 |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
66 # Generic method, sometimes gives useless results |
8264
63ea850b3312
zeroconf: guess ip for Zeroconf
Alexander Solovyov <piranha@piranha.org.ua>
parents:
8225
diff
changeset
|
67 try: |
63ea850b3312
zeroconf: guess ip for Zeroconf
Alexander Solovyov <piranha@piranha.org.ua>
parents:
8225
diff
changeset
|
68 dumbip = socket.gethostbyaddr(socket.gethostname())[2][0] |
43506
9f70512ae2cf
cleanup: remove pointless r-prefixes on single-quoted strings
Augie Fackler <augie@google.com>
parents:
43503
diff
changeset
|
69 if ':' in dumbip: |
9f70512ae2cf
cleanup: remove pointless r-prefixes on single-quoted strings
Augie Fackler <augie@google.com>
parents:
43503
diff
changeset
|
70 dumbip = '127.0.0.1' |
9f70512ae2cf
cleanup: remove pointless r-prefixes on single-quoted strings
Augie Fackler <augie@google.com>
parents:
43503
diff
changeset
|
71 if not dumbip.startswith('127.'): |
8264
63ea850b3312
zeroconf: guess ip for Zeroconf
Alexander Solovyov <piranha@piranha.org.ua>
parents:
8225
diff
changeset
|
72 return dumbip |
10317
192083a3e6fe
zeroconf: gethostbyaddr may also fail with socket.herror
Augie Fackler <durin42@gmail.com>
parents:
10263
diff
changeset
|
73 except (socket.gaierror, socket.herror): |
43506
9f70512ae2cf
cleanup: remove pointless r-prefixes on single-quoted strings
Augie Fackler <augie@google.com>
parents:
43503
diff
changeset
|
74 dumbip = '127.0.0.1' |
7071
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
75 |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
76 # works elsewhere, but actually sends a packet |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
77 try: |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
78 s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) |
43506
9f70512ae2cf
cleanup: remove pointless r-prefixes on single-quoted strings
Augie Fackler <augie@google.com>
parents:
43503
diff
changeset
|
79 s.connect(('1.0.0.1', 1)) |
7071
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
80 ip = s.getsockname()[0] |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
81 return ip |
16688
cfb6682961b8
cleanup: replace naked excepts with more specific ones
Brodie Rao <brodie@sf.io>
parents:
16683
diff
changeset
|
82 except socket.error: |
7071
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
83 pass |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
84 |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
85 return dumbip |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
86 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42549
diff
changeset
|
87 |
7071
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
88 def publish(name, desc, path, port): |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
89 global server, localip |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
90 if not server: |
8264
63ea850b3312
zeroconf: guess ip for Zeroconf
Alexander Solovyov <piranha@piranha.org.ua>
parents:
8225
diff
changeset
|
91 ip = getip() |
43506
9f70512ae2cf
cleanup: remove pointless r-prefixes on single-quoted strings
Augie Fackler <augie@google.com>
parents:
43503
diff
changeset
|
92 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
|
93 # 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
|
94 return |
7071
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
95 localip = socket.inet_aton(ip) |
8264
63ea850b3312
zeroconf: guess ip for Zeroconf
Alexander Solovyov <piranha@piranha.org.ua>
parents:
8225
diff
changeset
|
96 server = Zeroconf.Zeroconf(ip) |
7071
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
97 |
43506
9f70512ae2cf
cleanup: remove pointless r-prefixes on single-quoted strings
Augie Fackler <augie@google.com>
parents:
43503
diff
changeset
|
98 hostname = socket.gethostname().split('.')[0] |
9f70512ae2cf
cleanup: remove pointless r-prefixes on single-quoted strings
Augie Fackler <augie@google.com>
parents:
43503
diff
changeset
|
99 host = hostname + ".local" |
43503
313e3a279828
cleanup: remove pointless r-prefixes on double-quoted strings
Augie Fackler <augie@google.com>
parents:
43500
diff
changeset
|
100 name = "%s-%s" % (hostname, name) |
7071
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
101 |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
102 # advertise to browsers |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42549
diff
changeset
|
103 svc = Zeroconf.ServiceInfo( |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
104 b'_http._tcp.local.', |
43506
9f70512ae2cf
cleanup: remove pointless r-prefixes on single-quoted strings
Augie Fackler <augie@google.com>
parents:
43503
diff
changeset
|
105 pycompat.bytestr(name + '._http._tcp.local.'), |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42549
diff
changeset
|
106 server=host, |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42549
diff
changeset
|
107 port=port, |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
108 properties={b'description': desc, b'path': b"/" + path}, |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42549
diff
changeset
|
109 address=localip, |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42549
diff
changeset
|
110 weight=0, |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42549
diff
changeset
|
111 priority=0, |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42549
diff
changeset
|
112 ) |
7071
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
113 server.registerService(svc) |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
114 |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
115 # advertise to Mercurial clients |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42549
diff
changeset
|
116 svc = Zeroconf.ServiceInfo( |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
117 b'_hg._tcp.local.', |
43506
9f70512ae2cf
cleanup: remove pointless r-prefixes on single-quoted strings
Augie Fackler <augie@google.com>
parents:
43503
diff
changeset
|
118 pycompat.bytestr(name + '._hg._tcp.local.'), |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42549
diff
changeset
|
119 server=host, |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42549
diff
changeset
|
120 port=port, |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
121 properties={b'description': desc, b'path': b"/" + path}, |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42549
diff
changeset
|
122 address=localip, |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42549
diff
changeset
|
123 weight=0, |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42549
diff
changeset
|
124 priority=0, |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42549
diff
changeset
|
125 ) |
7071
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
126 server.registerService(svc) |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
127 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42549
diff
changeset
|
128 |
18190
d57879e72e18
zeroconf: use port from server instead of picking port from config (issue3746)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
16743
diff
changeset
|
129 def zc_create_server(create_server, ui, app): |
d57879e72e18
zeroconf: use port from server instead of picking port from config (issue3746)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
16743
diff
changeset
|
130 httpd = create_server(ui, app) |
d57879e72e18
zeroconf: use port from server instead of picking port from config (issue3746)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
16743
diff
changeset
|
131 port = httpd.port |
7071
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
132 |
18190
d57879e72e18
zeroconf: use port from server instead of picking port from config (issue3746)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
16743
diff
changeset
|
133 try: |
d57879e72e18
zeroconf: use port from server instead of picking port from config (issue3746)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
16743
diff
changeset
|
134 repos = app.repos |
d57879e72e18
zeroconf: use port from server instead of picking port from config (issue3746)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
16743
diff
changeset
|
135 except AttributeError: |
d57879e72e18
zeroconf: use port from server instead of picking port from config (issue3746)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
16743
diff
changeset
|
136 # single repo |
27910
d2c5ad3deccb
zeroconf: access repo on hgweb_mod properly (issue5036)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25186
diff
changeset
|
137 with app._obtainrepo() as repo: |
d2c5ad3deccb
zeroconf: access repo on hgweb_mod properly (issue5036)
Gregory Szorc <gregory.szorc@gmail.com>
parents:
25186
diff
changeset
|
138 name = app.reponame or os.path.basename(repo.root) |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
139 path = repo.ui.config(b"web", b"prefix", b"").strip(b'/') |
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
140 desc = repo.ui.config(b"web", b"description") |
34238
a6c18628dff1
configitems: register the 'web.description' config
Boris Feld <boris.feld@octobus.net>
parents:
33178
diff
changeset
|
141 if not desc: |
a6c18628dff1
configitems: register the 'web.description' config
Boris Feld <boris.feld@octobus.net>
parents:
33178
diff
changeset
|
142 desc = name |
18190
d57879e72e18
zeroconf: use port from server instead of picking port from config (issue3746)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
16743
diff
changeset
|
143 publish(name, desc, path, port) |
d57879e72e18
zeroconf: use port from server instead of picking port from config (issue3746)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
16743
diff
changeset
|
144 else: |
d57879e72e18
zeroconf: use port from server instead of picking port from config (issue3746)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
16743
diff
changeset
|
145 # webdir |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
146 prefix = app.ui.config(b"web", b"prefix", b"").strip(b'/') + b'/' |
18190
d57879e72e18
zeroconf: use port from server instead of picking port from config (issue3746)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
16743
diff
changeset
|
147 for repo, path in repos: |
d57879e72e18
zeroconf: use port from server instead of picking port from config (issue3746)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
16743
diff
changeset
|
148 u = app.ui.copy() |
44246
eecc005229ff
config: also respect HGRCSKIPREPO in the zeroconf extension
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43506
diff
changeset
|
149 if rcutil.use_repo_hgrc(): |
eecc005229ff
config: also respect HGRCSKIPREPO in the zeroconf extension
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
43506
diff
changeset
|
150 u.readconfig(os.path.join(path, b'.hg', b'hgrc')) |
9488
33a6213a974e
zeroconf: code cleanup, fixing variable names to be meaningful
Alexander Solovyov <piranha@piranha.org.ua>
parents:
9443
diff
changeset
|
151 name = os.path.basename(repo) |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
152 path = (prefix + repo).strip(b'/') |
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
153 desc = u.config(b'web', b'description') |
34238
a6c18628dff1
configitems: register the 'web.description' config
Boris Feld <boris.feld@octobus.net>
parents:
33178
diff
changeset
|
154 if not desc: |
a6c18628dff1
configitems: register the 'web.description' config
Boris Feld <boris.feld@octobus.net>
parents:
33178
diff
changeset
|
155 desc = name |
18190
d57879e72e18
zeroconf: use port from server instead of picking port from config (issue3746)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
16743
diff
changeset
|
156 publish(name, desc, path, port) |
d57879e72e18
zeroconf: use port from server instead of picking port from config (issue3746)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
16743
diff
changeset
|
157 return httpd |
7071
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
158 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42549
diff
changeset
|
159 |
7071
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
160 # listen |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
161 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42549
diff
changeset
|
162 |
48946
642e31cb55f0
py3: use class X: instead of class X(object):
Gregory Szorc <gregory.szorc@gmail.com>
parents:
48875
diff
changeset
|
163 class listener: |
7071
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
164 def __init__(self): |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
165 self.found = {} |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42549
diff
changeset
|
166 |
7071
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
167 def removeService(self, server, type, name): |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
168 if repr(name) in self.found: |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
169 del self.found[repr(name)] |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42549
diff
changeset
|
170 |
7071
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
171 def addService(self, server, type, name): |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
172 self.found[repr(name)] = server.getServiceInfo(type, name) |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
173 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42549
diff
changeset
|
174 |
7071
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
175 def getzcpaths(): |
8264
63ea850b3312
zeroconf: guess ip for Zeroconf
Alexander Solovyov <piranha@piranha.org.ua>
parents:
8225
diff
changeset
|
176 ip = getip() |
43506
9f70512ae2cf
cleanup: remove pointless r-prefixes on single-quoted strings
Augie Fackler <augie@google.com>
parents:
43503
diff
changeset
|
177 if ip.startswith('127.'): |
8264
63ea850b3312
zeroconf: guess ip for Zeroconf
Alexander Solovyov <piranha@piranha.org.ua>
parents:
8225
diff
changeset
|
178 return |
63ea850b3312
zeroconf: guess ip for Zeroconf
Alexander Solovyov <piranha@piranha.org.ua>
parents:
8225
diff
changeset
|
179 server = Zeroconf.Zeroconf(ip) |
7071
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
180 l = listener() |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
181 Zeroconf.ServiceBrowser(server, b"_hg._tcp.local.", l) |
7071
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
182 time.sleep(1) |
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
183 server.close() |
9488
33a6213a974e
zeroconf: code cleanup, fixing variable names to be meaningful
Alexander Solovyov <piranha@piranha.org.ua>
parents:
9443
diff
changeset
|
184 for value in l.found.values(): |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42549
diff
changeset
|
185 name = value.name[: value.name.index(b'.')] |
43503
313e3a279828
cleanup: remove pointless r-prefixes on double-quoted strings
Augie Fackler <augie@google.com>
parents:
43500
diff
changeset
|
186 url = "http://%s:%s%s" % ( |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42549
diff
changeset
|
187 socket.inet_ntoa(value.address), |
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42549
diff
changeset
|
188 value.port, |
43503
313e3a279828
cleanup: remove pointless r-prefixes on double-quoted strings
Augie Fackler <augie@google.com>
parents:
43500
diff
changeset
|
189 value.properties.get("path", "/"), |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42549
diff
changeset
|
190 ) |
42549
fa2071753dc2
zeroconf: port to Python 3
Gregory Szorc <gregory.szorc@gmail.com>
parents:
34238
diff
changeset
|
191 yield b"zc-" + name, pycompat.bytestr(url) |
7071
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
192 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42549
diff
changeset
|
193 |
33178
a0068f49b5f6
zeroconf: blindly forward extra argument to the core config method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
30885
diff
changeset
|
194 def config(orig, self, section, key, *args, **kwargs): |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
195 if section == b"paths" and key.startswith(b"zc-"): |
9488
33a6213a974e
zeroconf: code cleanup, fixing variable names to be meaningful
Alexander Solovyov <piranha@piranha.org.ua>
parents:
9443
diff
changeset
|
196 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
|
197 if name == key: |
33a6213a974e
zeroconf: code cleanup, fixing variable names to be meaningful
Alexander Solovyov <piranha@piranha.org.ua>
parents:
9443
diff
changeset
|
198 return path |
33178
a0068f49b5f6
zeroconf: blindly forward extra argument to the core config method
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
30885
diff
changeset
|
199 return orig(self, section, key, *args, **kwargs) |
7071
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
200 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42549
diff
changeset
|
201 |
28038
72f2a19c5f88
zeroconf: forward all arguments passed to ui.configitems() wrapper
Yuya Nishihara <yuya@tcha.org>
parents:
27910
diff
changeset
|
202 def configitems(orig, self, section, *args, **kwargs): |
72f2a19c5f88
zeroconf: forward all arguments passed to ui.configitems() wrapper
Yuya Nishihara <yuya@tcha.org>
parents:
27910
diff
changeset
|
203 repos = orig(self, section, *args, **kwargs) |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
204 if section == b"paths": |
9488
33a6213a974e
zeroconf: code cleanup, fixing variable names to be meaningful
Alexander Solovyov <piranha@piranha.org.ua>
parents:
9443
diff
changeset
|
205 repos += getzcpaths() |
33a6213a974e
zeroconf: code cleanup, fixing variable names to be meaningful
Alexander Solovyov <piranha@piranha.org.ua>
parents:
9443
diff
changeset
|
206 return repos |
7071
643c751e60b2
zeroconf: initial implementation
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
207 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42549
diff
changeset
|
208 |
28250
6d0d11731e1c
zeroconf: fix crash in "hg paths" when zeroconf server is up
Danek Duvall <danek.duvall@oracle.com>
parents:
28038
diff
changeset
|
209 def configsuboptions(orig, self, section, name, *args, **kwargs): |
6d0d11731e1c
zeroconf: fix crash in "hg paths" when zeroconf server is up
Danek Duvall <danek.duvall@oracle.com>
parents:
28038
diff
changeset
|
210 opt, sub = orig(self, section, name, *args, **kwargs) |
43077
687b865b95ad
formatting: byteify all mercurial/ and hgext/ string literals
Augie Fackler <augie@google.com>
parents:
43076
diff
changeset
|
211 if section == b"paths" and name.startswith(b"zc-"): |
28250
6d0d11731e1c
zeroconf: fix crash in "hg paths" when zeroconf server is up
Danek Duvall <danek.duvall@oracle.com>
parents:
28038
diff
changeset
|
212 # We have to find the URL in the zeroconf paths. We can't cons up any |
6d0d11731e1c
zeroconf: fix crash in "hg paths" when zeroconf server is up
Danek Duvall <danek.duvall@oracle.com>
parents:
28038
diff
changeset
|
213 # suboptions, so we use any that we found in the original config. |
6d0d11731e1c
zeroconf: fix crash in "hg paths" when zeroconf server is up
Danek Duvall <danek.duvall@oracle.com>
parents:
28038
diff
changeset
|
214 for zcname, zcurl in getzcpaths(): |
6d0d11731e1c
zeroconf: fix crash in "hg paths" when zeroconf server is up
Danek Duvall <danek.duvall@oracle.com>
parents:
28038
diff
changeset
|
215 if zcname == name: |
6d0d11731e1c
zeroconf: fix crash in "hg paths" when zeroconf server is up
Danek Duvall <danek.duvall@oracle.com>
parents:
28038
diff
changeset
|
216 return zcurl, sub |
6d0d11731e1c
zeroconf: fix crash in "hg paths" when zeroconf server is up
Danek Duvall <danek.duvall@oracle.com>
parents:
28038
diff
changeset
|
217 return opt, sub |
6d0d11731e1c
zeroconf: fix crash in "hg paths" when zeroconf server is up
Danek Duvall <danek.duvall@oracle.com>
parents:
28038
diff
changeset
|
218 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42549
diff
changeset
|
219 |
10342
579aae5aa549
zeroconf: override default destination folder on clone
Henrik Stuart <hg@hstuart.dk>
parents:
10317
diff
changeset
|
220 def defaultdest(orig, source): |
579aae5aa549
zeroconf: override default destination folder on clone
Henrik Stuart <hg@hstuart.dk>
parents:
10317
diff
changeset
|
221 for name, path in getzcpaths(): |
579aae5aa549
zeroconf: override default destination folder on clone
Henrik Stuart <hg@hstuart.dk>
parents:
10317
diff
changeset
|
222 if path == source: |
579aae5aa549
zeroconf: override default destination folder on clone
Henrik Stuart <hg@hstuart.dk>
parents:
10317
diff
changeset
|
223 return name.encode(encoding.encoding) |
579aae5aa549
zeroconf: override default destination folder on clone
Henrik Stuart <hg@hstuart.dk>
parents:
10317
diff
changeset
|
224 return orig(source) |
579aae5aa549
zeroconf: override default destination folder on clone
Henrik Stuart <hg@hstuart.dk>
parents:
10317
diff
changeset
|
225 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42549
diff
changeset
|
226 |
14104
23fc62e0a960
zeroconf: notify the Zeroconf threads when hg exits
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12076
diff
changeset
|
227 def cleanupafterdispatch(orig, ui, options, cmd, cmdfunc): |
23fc62e0a960
zeroconf: notify the Zeroconf threads when hg exits
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12076
diff
changeset
|
228 try: |
23fc62e0a960
zeroconf: notify the Zeroconf threads when hg exits
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12076
diff
changeset
|
229 return orig(ui, options, cmd, cmdfunc) |
23fc62e0a960
zeroconf: notify the Zeroconf threads when hg exits
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12076
diff
changeset
|
230 finally: |
23fc62e0a960
zeroconf: notify the Zeroconf threads when hg exits
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12076
diff
changeset
|
231 # we need to call close() on the server to notify() the various |
23fc62e0a960
zeroconf: notify the Zeroconf threads when hg exits
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12076
diff
changeset
|
232 # threading Conditions and allow the background threads to exit |
23fc62e0a960
zeroconf: notify the Zeroconf threads when hg exits
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12076
diff
changeset
|
233 global server |
23fc62e0a960
zeroconf: notify the Zeroconf threads when hg exits
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12076
diff
changeset
|
234 if server: |
23fc62e0a960
zeroconf: notify the Zeroconf threads when hg exits
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12076
diff
changeset
|
235 server.close() |
23fc62e0a960
zeroconf: notify the Zeroconf threads when hg exits
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12076
diff
changeset
|
236 |
43076
2372284d9457
formatting: blacken the codebase
Augie Fackler <augie@google.com>
parents:
42549
diff
changeset
|
237 |
50794
c3d7a0828b7b
wrapfunction: use sysstr instead of bytes as argument in "zeroconf"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48946
diff
changeset
|
238 extensions.wrapfunction(dispatch, '_runcommand', cleanupafterdispatch) |
14104
23fc62e0a960
zeroconf: notify the Zeroconf threads when hg exits
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12076
diff
changeset
|
239 |
50794
c3d7a0828b7b
wrapfunction: use sysstr instead of bytes as argument in "zeroconf"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48946
diff
changeset
|
240 extensions.wrapfunction(uimod.ui, 'config', config) |
c3d7a0828b7b
wrapfunction: use sysstr instead of bytes as argument in "zeroconf"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48946
diff
changeset
|
241 extensions.wrapfunction(uimod.ui, 'configitems', configitems) |
c3d7a0828b7b
wrapfunction: use sysstr instead of bytes as argument in "zeroconf"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48946
diff
changeset
|
242 extensions.wrapfunction(uimod.ui, 'configsuboptions', configsuboptions) |
c3d7a0828b7b
wrapfunction: use sysstr instead of bytes as argument in "zeroconf"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48946
diff
changeset
|
243 extensions.wrapfunction(hg, 'defaultdest', defaultdest) |
c3d7a0828b7b
wrapfunction: use sysstr instead of bytes as argument in "zeroconf"
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
48946
diff
changeset
|
244 extensions.wrapfunction(servermod, 'create_server', zc_create_server) |