This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11819

extensions: ignore "sub-options" when looking for extensions
ClosedPublic

Authored by marmoute on Nov 29 2021, 11:51 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGc6d44457f7e3: extensions: ignore "sub-options" when looking for extensions
Summary

config suboptions are separated by ":" (see the path one for example). So we
dont want to confuse these config with actual extensions.

We don't have extensions sub option yet, but I am about to introduce one for
making sure an extensions can load. So lets level the floor first.

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/configitems.py (2 lines)
Mmercurial/extensions.py (1 line)

Diff 31206

mercurial/configitems.py

) )
coreconfigitem( coreconfigitem(
b'experimental', b'experimental',
b'xdiff', b'xdiff',
default=False, default=False,
) )
coreconfigitem( coreconfigitem(
b'extensions', b'extensions',
b'.*', b'[^:]*',
default=None, default=None,
generic=True, generic=True,
) )
coreconfigitem( coreconfigitem(
b'extdata', b'extdata',
b'.*', b'.*',
default=None, default=None,
generic=True, generic=True,

mercurial/extensions.py

return True return True
def loadall(ui, whitelist=None): def loadall(ui, whitelist=None):
loadingtime = collections.defaultdict(int) loadingtime = collections.defaultdict(int)
result = ui.configitems(b"extensions") result = ui.configitems(b"extensions")
if whitelist is not None: if whitelist is not None:
result = [(k, v) for (k, v) in result if k in whitelist] result = [(k, v) for (k, v) in result if k in whitelist]
result = [(k, v) for (k, v) in result if b':' not in k]
newindex = len(_order) newindex = len(_order)
ui.log( ui.log(
b'extension', b'extension',
b'loading %sextensions\n', b'loading %sextensions\n',
b'additional ' if newindex else b'', b'additional ' if newindex else b'',
) )
ui.log(b'extension', b'- processing %d entries\n', len(result)) ui.log(b'extension', b'- processing %d entries\n', len(result))
with util.timedcm('load all extensions') as stats: with util.timedcm('load all extensions') as stats: