This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8075

config: also respect HGRCSKIPREPO in the zeroconf extension
ClosedPublic

Authored by marmoute on Feb 4 2020, 5:50 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGeecc005229ff: config: also respect HGRCSKIPREPO in the zeroconf extension
rHG1c530957a3ea: config: also respect HGRCSKIPREPO in the zeroconf extension

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

marmoute created this revision.Feb 4 2020, 5:50 PM
marmoute added a commit: rHG1c530957a3ea: config: also respect HGRCSKIPREPO in the zeroconf extension.Feb 5 2020, 11:48 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG1c530957a3ea: config: also respect HGRCSKIPREPO in the zeroconf extension (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/zeroconf/__init__.py (4 lines)
Mtests/test-hgrc.t (8 lines)

Diff 19913

hgext/zeroconf/__init__.py

from . import Zeroconf from . import Zeroconf
from mercurial import ( from mercurial import (
dispatch, dispatch,
encoding, encoding,
extensions, extensions,
hg, hg,
pycompat, pycompat,
rcutil,
ui as uimod, ui as uimod,
) )
from mercurial.hgweb import server as servermod from mercurial.hgweb import server as servermod
# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
# extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
# be specifying the version(s) of Mercurial they are tested with, or # be specifying the version(s) of Mercurial they are tested with, or
# leave the attribute unspecified. # leave the attribute unspecified.
if not desc: if not desc:
desc = name desc = name
publish(name, desc, path, port) publish(name, desc, path, port)
else: else:
# webdir # webdir
prefix = app.ui.config(b"web", b"prefix", b"").strip(b'/') + b'/' prefix = app.ui.config(b"web", b"prefix", b"").strip(b'/') + b'/'
for repo, path in repos: for repo, path in repos:
u = app.ui.copy() u = app.ui.copy()
if rcutil.use_repo_hgrc():
u.readconfig(os.path.join(path, b'.hg', b'hgrc')) u.readconfig(os.path.join(path, b'.hg', b'hgrc'))
name = os.path.basename(repo) name = os.path.basename(repo)
path = (prefix + repo).strip(b'/') path = (prefix + repo).strip(b'/')
desc = u.config(b'web', b'description') desc = u.config(b'web', b'description')
if not desc: if not desc:
desc = name desc = name
publish(name, desc, path, port) publish(name, desc, path, port)
return httpd return httpd

tests/test-hgrc.t

$ test -f errors.log && cat errors.log $ test -f errors.log && cat errors.log
[1] [1]
$ HGRCSKIPREPO=1 hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log $ HGRCSKIPREPO=1 hg serve -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
$ cat hg.pid >> $DAEMON_PIDS $ cat hg.pid >> $DAEMON_PIDS
$ killdaemons.py $ killdaemons.py
$ cat access.log $ cat access.log
$ cat errors.log $ cat errors.log
Check that zeroconf respect HGRCSKIPREPO=1
$ hg paths --config extensions.zeroconf=
hg: parse error at $TESTTMP/.hg/hgrc:3: [broken
[255]
$ HGRCSKIPREPO=1 hg paths --config extensions.zeroconf=
foo = $TESTTMP/bar