This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8074

config: also respect HGRCSKIPREPO in hgwebdir_mod
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGbf23d6ee7ec7: config: also respect HGRCSKIPREPO in hgwebdir_mod
rHG890de6f991f2: config: also respect HGRCSKIPREPO in hgwebdir_mod

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: rHG890de6f991f2: config: also respect HGRCSKIPREPO in hgwebdir_mod.Feb 5 2020, 11:48 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG890de6f991f2: config: also respect HGRCSKIPREPO in hgwebdir_mod (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/hgweb/hgwebdir_mod.py (12 lines)
Mtests/test-hgrc.t (18 lines)

Diff 19912

mercurial/hgweb/hgwebdir_mod.py

configitems, configitems,
encoding, encoding,
error, error,
extensions, extensions,
hg, hg,
pathutil, pathutil,
profiling, profiling,
pycompat, pycompat,
rcutil,
registrar, registrar,
scmutil, scmutil,
templater, templater,
templateutil, templateutil,
ui as uimod, ui as uimod,
util, util,
) )
b'labels': templateutil.hybridlist([], name=b'label'), b'labels': templateutil.hybridlist([], name=b'label'),
} }
seendirs.add(name) seendirs.add(name)
yield row yield row
continue continue
u = ui.copy() u = ui.copy()
if rcutil.use_repo_hgrc():
try: try:
u.readconfig(os.path.join(path, b'.hg', b'hgrc')) u.readconfig(os.path.join(path, b'.hg', b'hgrc'))
except Exception as e: except Exception as e:
u.warn(_(b'error reading %s/.hg/hgrc: %s\n') % (path, e)) u.warn(_(b'error reading %s/.hg/hgrc: %s\n') % (path, e))
continue continue
def get(section, name, default=uimod._unset): def get(section, name, default=uimod._unset):
return u.config(section, name, default, untrusted=True) return u.config(section, name, default, untrusted=True)
if u.configbool(b"web", b"hidden", untrusted=True): if u.configbool(b"web", b"hidden", untrusted=True):
continue continue
if not readallowed(u, req): if not readallowed(u, req):

tests/test-hgrc.t

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