This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8073

config: also respect HGRCSKIPREPO in `dispatch._getlocal`
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGef11dfc56674: config: also respect HGRCSKIPREPO in `dispatch._getlocal`
rHG9514f2fc64ca: config: also respect HGRCSKIPREPO in `dispatch._getlocal`
Summary

For some reason, we are also reading the local config in that function.

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.

Revision Contents
Changeset List

PathPackages
Mmercurial/dispatch.py (8 lines)
Mtests/test-hgrc.t (10 lines)

Diff 19911

mercurial/dispatch.py

error, error,
extensions, extensions,
fancyopts, fancyopts,
help, help,
hg, hg,
hook, hook,
profiling, profiling,
pycompat, pycompat,
rcutil,
registrar, registrar,
scmutil, scmutil,
ui as uimod, ui as uimod,
util, util,
) )
from .utils import ( from .utils import (
procutil, procutil,
if wd is None: if wd is None:
try: try:
wd = encoding.getcwd() wd = encoding.getcwd()
except OSError as e: except OSError as e:
raise error.Abort( raise error.Abort(
_(b"error getting current working directory: %s") _(b"error getting current working directory: %s")
% encoding.strtolocal(e.strerror) % encoding.strtolocal(e.strerror)
) )
path = cmdutil.findrepo(wd) or b"" path = cmdutil.findrepo(wd) or b""
if not path: if not path:
lui = ui lui = ui
else: else:
lui = ui.copy() lui = ui.copy()
if rcutil.use_repo_hgrc():
lui.readconfig(os.path.join(path, b".hg", b"hgrc"), path) lui.readconfig(os.path.join(path, b".hg", b"hgrc"), path)
if rpath: if rpath:
path = lui.expandpath(rpath) path = lui.expandpath(rpath)
lui = ui.copy() lui = ui.copy()
if rcutil.use_repo_hgrc():
lui.readconfig(os.path.join(path, b".hg", b"hgrc"), path) lui.readconfig(os.path.join(path, b".hg", b"hgrc"), path)
return path, lui return path, lui
def _checkshellalias(lui, ui, args): def _checkshellalias(lui, ui, args):
"""Return the function to run the shell alias, if it is required""" """Return the function to run the shell alias, if it is required"""
options = {} options = {}

tests/test-hgrc.t

> elephant = babar > elephant = babar
> EOF > EOF
$ hg path $ hg path
elephant = $TESTTMP/babar elephant = $TESTTMP/babar
foo = $TESTTMP/bar foo = $TESTTMP/bar
$ HGRCSKIPREPO=1 hg path $ HGRCSKIPREPO=1 hg path
foo = $TESTTMP/bar foo = $TESTTMP/bar
$ cat >> .hg/hgrc <<EOF
> [broken
> EOF
$ hg path
hg: parse error at $TESTTMP/.hg/hgrc:3: [broken
[255]
$ HGRCSKIPREPO=1 hg path
foo = $TESTTMP/bar