This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7933

config: add a function to insert non-file based, but overridable settings
ClosedPublic

Authored by mharbison72 on Jan 17 2020, 5:47 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGe2278581b1c6: config: add a function to insert non-file based, but overridable settings
Summary

This will be used in the next patch.

Until relatively recently (473510bf0575), there was no official way for
extensions to inject per-repo config data, so it probably makes sense that
ui.setconfig() items are sticky, and not affected by loading more config
files. But that makes it cumbersome if the extension wants to allow the data it
might add to be overridden by any data in the local hgrc file. The only thing I
could get to work was to load the local hgrc first, and then check if the source
for the config item that should be overridden was *not* the local hgrc file
name. But that's brittle because in addition to the file name, the source
contains the line number, there are the usual '\' vs '/' platform differences,
etc.

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

Diff 19484

mercurial/ui.py

try: try:
cfg.read(filename, fp, sections=sections, remap=remap) cfg.read(filename, fp, sections=sections, remap=remap)
except error.ParseError as inst: except error.ParseError as inst:
if trusted: if trusted:
raise raise
self.warn(_(b'ignored: %s\n') % stringutil.forcebytestr(inst)) self.warn(_(b'ignored: %s\n') % stringutil.forcebytestr(inst))
self._applyconfig(cfg, trusted, root)
def applyconfig(self, configitems, source=b"", root=None):
"""Add configitems from a non-file source. Unlike with ``setconfig()``,
they can be overridden by subsequent config file reads. The items are
in the same format as ``configoverride()``, namely a dict of the
following structures: {(section, name) : value}
Typically this is used by extensions that inject themselves into the
config file load procedure by monkeypatching ``localrepo.loadhgrc()``.
"""
cfg = config.config()
for (section, name), value in configitems.items():
cfg.set(section, name, value, source)
self._applyconfig(cfg, True, root)
def _applyconfig(self, cfg, trusted, root):
if self.plain(): if self.plain():
for k in ( for k in (
b'debug', b'debug',
b'fallbackencoding', b'fallbackencoding',
b'quiet', b'quiet',
b'slash', b'slash',
b'logtemplate', b'logtemplate',
b'message-output', b'message-output',