This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6728

config: add experimental argument to the config registrar
ClosedPublic

Authored by navaneeth.suresh on Aug 15 2019, 10:22 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG9f2189b6bf2a: config: add experimental argument to the config registrar
rHGa11fd395e83f: config: add experimental argument to the config registrar
rHGe67d9b6bad4d: config: add experimental argument to the config registrar
Summary

Until now, there are almost 28 config items which are considered as
experimental but, not present in the experimental section of
the registrar. This patch adds an experimental argument to the
config registrar to mark such config items.

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

navaneeth.suresh added a commit: rHGe67d9b6bad4d: config: add experimental argument to the config registrar.Aug 15 2019, 11:24 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGe67d9b6bad4d: config: add experimental argument to the config registrar (authored by navaneeth.suresh). · Explain Why
This revision was automatically updated to reflect the committed changes.
pulkit added a subscriber: pulkit.Aug 17 2019, 3:25 PM
pulkit added inline comments.
contrib/perf.py
244

This breaks contrib/perf.py with older versions of mercurial. Can you send a compatibility fix as followup?

navaneeth.suresh added inline comments.Aug 18 2019, 7:56 AM
contrib/perf.py
244

I'm not sure I understood that. Do you want me to remove the changes in contrib/perf.py?

marmoute added a subscriber: marmoute.Aug 19 2019, 10:11 AM

This change breaks contrib/perf.py on older version (that extension is
special and we expect it to be compatible with older version). Can you
follow up with a fix ?

(note: when doing this kind of change it is often useful to have
different patch for adding the feature and using it. It help to deal
with this kind of case).

Revision Contents
Changeset List

Diff 16213

contrib/perf.py

try: try:
import mercurial.registrar import mercurial.registrar
import mercurial.configitems import mercurial.configitems
configtable = {} configtable = {}
configitem = mercurial.registrar.configitem(configtable) configitem = mercurial.registrar.configitem(configtable)
configitem(b'perf', b'presleep', configitem(b'perf', b'presleep',
default=mercurial.configitems.dynamicdefault, default=mercurial.configitems.dynamicdefault,
experimental=True,
pulkitUnsubmitted
Not Done

This breaks contrib/perf.py with older versions of mercurial. Can you send a compatibility fix as followup?

pulkit: This breaks `contrib/perf.py` with older versions of mercurial. Can you send a compatibility…
navaneeth.sureshAuthorUnsubmitted
Done

I'm not sure I understood that. Do you want me to remove the changes in contrib/perf.py?

navaneeth.suresh: I'm not sure I understood that. Do you want me to remove the changes in `contrib/perf.py`?
) )
configitem(b'perf', b'stub', configitem(b'perf', b'stub',
default=mercurial.configitems.dynamicdefault, default=mercurial.configitems.dynamicdefault,
experimental=True,
) )
configitem(b'perf', b'parentscount', configitem(b'perf', b'parentscount',
default=mercurial.configitems.dynamicdefault, default=mercurial.configitems.dynamicdefault,
experimental=True,
) )
configitem(b'perf', b'all-timing', configitem(b'perf', b'all-timing',
default=mercurial.configitems.dynamicdefault, default=mercurial.configitems.dynamicdefault,
experimental=True,
) )
configitem(b'perf', b'pre-run', configitem(b'perf', b'pre-run',
default=mercurial.configitems.dynamicdefault, default=mercurial.configitems.dynamicdefault,
) )
configitem(b'perf', b'profile-benchmark', configitem(b'perf', b'profile-benchmark',
default=mercurial.configitems.dynamicdefault, default=mercurial.configitems.dynamicdefault,
) )
configitem(b'perf', b'run-limits', configitem(b'perf', b'run-limits',
default=mercurial.configitems.dynamicdefault, default=mercurial.configitems.dynamicdefault,
experimental=True,
) )
except (ImportError, AttributeError): except (ImportError, AttributeError):
pass pass
def getlen(ui): def getlen(ui):
if ui.configbool(b"perf", b"stub", False): if ui.configbool(b"perf", b"stub", False):
return lambda x: 1 return lambda x: 1
return len return len

hgext/fsmonitor/__init__.py

configitem('fsmonitor', 'blacklistusers', configitem('fsmonitor', 'blacklistusers',
default=list, default=list,
) )
configitem('fsmonitor', 'watchman_exe', configitem('fsmonitor', 'watchman_exe',
default='watchman', default='watchman',
) )
configitem('fsmonitor', 'verbose', configitem('fsmonitor', 'verbose',
default=True, default=True,
experimental=True,
) )
configitem('experimental', 'fsmonitor.transaction_notify', configitem('experimental', 'fsmonitor.transaction_notify',
default=False, default=False,
) )
# This extension is incompatible with the following blacklisted extensions # This extension is incompatible with the following blacklisted extensions
# and will disable itself when encountering one of these: # and will disable itself when encountering one of these:
_blacklist = ['largefiles', 'eol'] _blacklist = ['largefiles', 'eol']

hgext/remotefilelog/__init__.py

configitem('remotefilelog', 'batchsize', configitems.dynamicdefault) configitem('remotefilelog', 'batchsize', configitems.dynamicdefault)
configitem('remotefilelog', 'fetchwarning', default='') configitem('remotefilelog', 'fetchwarning', default='')
configitem('remotefilelog', 'includepattern', default=None) configitem('remotefilelog', 'includepattern', default=None)
configitem('remotefilelog', 'excludepattern', default=None) configitem('remotefilelog', 'excludepattern', default=None)
configitem('remotefilelog', 'gcrepack', default=False) configitem('remotefilelog', 'gcrepack', default=False)
configitem('remotefilelog', 'repackonhggc', default=False) configitem('remotefilelog', 'repackonhggc', default=False)
configitem('repack', 'chainorphansbysize', default=True) configitem('repack', 'chainorphansbysize', default=True, experimental=True)
configitem('packs', 'maxpacksize', default=0) configitem('packs', 'maxpacksize', default=0)
configitem('packs', 'maxchainlen', default=1000) configitem('packs', 'maxchainlen', default=1000)
# default TTL limit is 30 days # default TTL limit is 30 days
_defaultlimit = 60 * 60 * 24 * 30 _defaultlimit = 60 * 60 * 24 * 30
configitem('remotefilelog', 'nodettl', default=_defaultlimit) configitem('remotefilelog', 'nodettl', default=_defaultlimit)

hgext/sqlitestore.py

except ImportError: except ImportError:
zstd = None zstd = None
configtable = {} configtable = {}
configitem = registrar.configitem(configtable) configitem = registrar.configitem(configtable)
# experimental config: storage.sqlite.compression # experimental config: storage.sqlite.compression
configitem('storage', 'sqlite.compression', configitem('storage', 'sqlite.compression',
default='zstd' if zstd else 'zlib') default='zstd' if zstd else 'zlib',
experimental=True)
# 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.
testedwith = 'ships-with-hg-core' testedwith = 'ships-with-hg-core'
REQUIREMENT = b'exp-sqlite-001' REQUIREMENT = b'exp-sqlite-001'

mercurial/configitems.py

:section: the official config section where to find this item, :section: the official config section where to find this item,
:name: the official name within the section, :name: the official name within the section,
:default: default value for this item, :default: default value for this item,
:alias: optional list of tuples as alternatives, :alias: optional list of tuples as alternatives,
:generic: this is a generic definition, match name using regular expression. :generic: this is a generic definition, match name using regular expression.
""" """
def __init__(self, section, name, default=None, alias=(), def __init__(self, section, name, default=None, alias=(),
generic=False, priority=0): generic=False, priority=0, experimental=False):
self.section = section self.section = section
self.name = name self.name = name
self.default = default self.default = default
self.alias = list(alias) self.alias = list(alias)
self.generic = generic self.generic = generic
self.priority = priority self.priority = priority
self.experimental = experimental
self._re = None self._re = None
if generic: if generic:
self._re = re.compile(self.name) self._re = re.compile(self.name)
class itemregister(dict): class itemregister(dict):
"""A specialized dictionary that can handle wild-card selection""" """A specialized dictionary that can handle wild-card selection"""
def __init__(self): def __init__(self):
default=list, default=list,
) )
# bundle.mainreporoot: internal hack for bundlerepo # bundle.mainreporoot: internal hack for bundlerepo
coreconfigitem('bundle', 'mainreporoot', coreconfigitem('bundle', 'mainreporoot',
default='', default='',
) )
coreconfigitem('censor', 'policy', coreconfigitem('censor', 'policy',
default='abort', default='abort',
experimental=True,
) )
coreconfigitem('chgserver', 'idletimeout', coreconfigitem('chgserver', 'idletimeout',
default=3600, default=3600,
) )
coreconfigitem('chgserver', 'skiphash', coreconfigitem('chgserver', 'skiphash',
default=False, default=False,
) )
coreconfigitem('cmdserver', 'log', coreconfigitem('cmdserver', 'log',
default=None, default=None,
) )
coreconfigitem('cmdserver', 'max-log-files', coreconfigitem('cmdserver', 'max-log-files',
default=7, default=7,
) )
coreconfigitem('cmdserver', 'max-log-size', coreconfigitem('cmdserver', 'max-log-size',
default='1 MB', default='1 MB',
) )
coreconfigitem('cmdserver', 'max-repo-cache', coreconfigitem('cmdserver', 'max-repo-cache',
default=0, default=0,
experimental=True,
) )
coreconfigitem('cmdserver', 'message-encodings', coreconfigitem('cmdserver', 'message-encodings',
default=list, default=list,
experimental=True,
) )
coreconfigitem('cmdserver', 'track-log', coreconfigitem('cmdserver', 'track-log',
default=lambda: ['chgserver', 'cmdserver', 'repocache'], default=lambda: ['chgserver', 'cmdserver', 'repocache'],
) )
coreconfigitem('color', '.*', coreconfigitem('color', '.*',
default=None, default=None,
generic=True, generic=True,
) )
coreconfigitem('color', 'mode', coreconfigitem('color', 'mode',
default='auto', default='auto',
) )
coreconfigitem('color', 'pagermode', coreconfigitem('color', 'pagermode',
default=dynamicdefault, default=dynamicdefault,
) )
_registerdiffopts(section='commands', configprefix='commit.interactive.') _registerdiffopts(section='commands', configprefix='commit.interactive.')
coreconfigitem('commands', 'commit.post-status', coreconfigitem('commands', 'commit.post-status',
default=False, default=False,
) )
coreconfigitem('commands', 'grep.all-files', coreconfigitem('commands', 'grep.all-files',
default=False, default=False,
experimental=True,
) )
coreconfigitem('commands', 'resolve.confirm', coreconfigitem('commands', 'resolve.confirm',
default=False, default=False,
) )
coreconfigitem('commands', 'resolve.explicit-re-merge', coreconfigitem('commands', 'resolve.explicit-re-merge',
default=False, default=False,
) )
coreconfigitem('commands', 'resolve.mark-check', coreconfigitem('commands', 'resolve.mark-check',
default='none', default='none',
) )
_registerdiffopts(section='commands', configprefix='revert.interactive.') _registerdiffopts(section='commands', configprefix='revert.interactive.')
coreconfigitem('commands', 'show.aliasprefix', coreconfigitem('commands', 'show.aliasprefix',
default=list, default=list,
) )
coreconfigitem('commands', 'status.relative', coreconfigitem('commands', 'status.relative',
default=False, default=False,
) )
coreconfigitem('commands', 'status.skipstates', coreconfigitem('commands', 'status.skipstates',
default=[], default=[],
experimental=True,
) )
coreconfigitem('commands', 'status.terse', coreconfigitem('commands', 'status.terse',
default='', default='',
) )
coreconfigitem('commands', 'status.verbose', coreconfigitem('commands', 'status.verbose',
default=False, default=False,
) )
coreconfigitem('commands', 'update.check', coreconfigitem('commands', 'update.check',
coreconfigitem('convert', 'hg.tagsbranch', coreconfigitem('convert', 'hg.tagsbranch',
default='default', default='default',
) )
coreconfigitem('convert', 'hg.usebranchnames', coreconfigitem('convert', 'hg.usebranchnames',
default=True, default=True,
) )
coreconfigitem('convert', 'ignoreancestorcheck', coreconfigitem('convert', 'ignoreancestorcheck',
default=False, default=False,
experimental=True,
) )
coreconfigitem('convert', 'localtimezone', coreconfigitem('convert', 'localtimezone',
default=False, default=False,
) )
coreconfigitem('convert', 'p4.encoding', coreconfigitem('convert', 'p4.encoding',
default=dynamicdefault, default=dynamicdefault,
) )
coreconfigitem('convert', 'p4.startrev', coreconfigitem('convert', 'p4.startrev',
default=None, default=None,
generic=True, generic=True,
) )
coreconfigitem('format', 'bookmarks-in-store', coreconfigitem('format', 'bookmarks-in-store',
default=False, default=False,
) )
coreconfigitem('format', 'chunkcachesize', coreconfigitem('format', 'chunkcachesize',
default=None, default=None,
experimental=True,
) )
coreconfigitem('format', 'dotencode', coreconfigitem('format', 'dotencode',
default=True, default=True,
) )
coreconfigitem('format', 'generaldelta', coreconfigitem('format', 'generaldelta',
default=False, default=False,
experimental=True,
) )
coreconfigitem('format', 'manifestcachesize', coreconfigitem('format', 'manifestcachesize',
default=None, default=None,
experimental=True,
) )
coreconfigitem('format', 'maxchainlen', coreconfigitem('format', 'maxchainlen',
default=dynamicdefault, default=dynamicdefault,
experimental=True,
) )
coreconfigitem('format', 'obsstore-version', coreconfigitem('format', 'obsstore-version',
default=None, default=None,
) )
coreconfigitem('format', 'sparse-revlog', coreconfigitem('format', 'sparse-revlog',
default=True, default=True,
) )
coreconfigitem('format', 'revlog-compression', coreconfigitem('format', 'revlog-compression',
default='zlib', default='zlib',
alias=[('experimental', 'format.compression')] alias=[('experimental', 'format.compression')]
) )
coreconfigitem('format', 'usefncache', coreconfigitem('format', 'usefncache',
default=True, default=True,
) )
coreconfigitem('format', 'usegeneraldelta', coreconfigitem('format', 'usegeneraldelta',
default=True, default=True,
) )
coreconfigitem('format', 'usestore', coreconfigitem('format', 'usestore',
default=True, default=True,
) )
coreconfigitem('format', 'internal-phase', coreconfigitem('format', 'internal-phase',
default=False, default=False,
experimental=True,
) )
coreconfigitem('fsmonitor', 'warn_when_unused', coreconfigitem('fsmonitor', 'warn_when_unused',
default=True, default=True,
) )
coreconfigitem('fsmonitor', 'warn_update_file_count', coreconfigitem('fsmonitor', 'warn_update_file_count',
default=50000, default=50000,
) )
coreconfigitem('help', br'hidden-command\..*', coreconfigitem('help', br'hidden-command\..*',
coreconfigitem('merge', 'followcopies', coreconfigitem('merge', 'followcopies',
default=True, default=True,
) )
coreconfigitem('merge', 'on-failure', coreconfigitem('merge', 'on-failure',
default='continue', default='continue',
) )
coreconfigitem('merge', 'preferancestor', coreconfigitem('merge', 'preferancestor',
default=lambda: ['*'], default=lambda: ['*'],
experimental=True,
) )
coreconfigitem('merge', 'strict-capability-check', coreconfigitem('merge', 'strict-capability-check',
default=False, default=False,
) )
coreconfigitem('merge-tools', '.*', coreconfigitem('merge-tools', '.*',
default=None, default=None,
generic=True, generic=True,
) )
default=True, default=True,
alias=[('ui', 'history-editing-backup')], alias=[('ui', 'history-editing-backup')],
) )
coreconfigitem('rewrite', 'update-timestamp', coreconfigitem('rewrite', 'update-timestamp',
default=False, default=False,
) )
coreconfigitem('storage', 'new-repo-backend', coreconfigitem('storage', 'new-repo-backend',
default='revlogv1', default='revlogv1',
experimental=True,
) )
coreconfigitem('storage', 'revlog.optimize-delta-parent-choice', coreconfigitem('storage', 'revlog.optimize-delta-parent-choice',
default=True, default=True,
alias=[('format', 'aggressivemergedeltas')], alias=[('format', 'aggressivemergedeltas')],
) )
coreconfigitem('storage', 'revlog.reuse-external-delta', coreconfigitem('storage', 'revlog.reuse-external-delta',
default=True, default=True,
) )
coreconfigitem('smtp', 'tls', coreconfigitem('smtp', 'tls',
default='none', default='none',
) )
coreconfigitem('smtp', 'username', coreconfigitem('smtp', 'username',
default=None, default=None,
) )
coreconfigitem('sparse', 'missingwarning', coreconfigitem('sparse', 'missingwarning',
default=True, default=True,
experimental=True,
) )
coreconfigitem('subrepos', 'allowed', coreconfigitem('subrepos', 'allowed',
default=dynamicdefault, # to make backporting simpler default=dynamicdefault, # to make backporting simpler
) )
coreconfigitem('subrepos', 'hg:allowed', coreconfigitem('subrepos', 'hg:allowed',
default=dynamicdefault, default=dynamicdefault,
) )
coreconfigitem('subrepos', 'git:allowed', coreconfigitem('subrepos', 'git:allowed',
coreconfigitem('web', 'style', coreconfigitem('web', 'style',
default='paper', default='paper',
) )
coreconfigitem('web', 'templates', coreconfigitem('web', 'templates',
default=None, default=None,
) )
coreconfigitem('web', 'view', coreconfigitem('web', 'view',
default='served', default='served',
experimental=True,
) )
coreconfigitem('worker', 'backgroundclose', coreconfigitem('worker', 'backgroundclose',
default=dynamicdefault, default=dynamicdefault,
) )
# Windows defaults to a limit of 512 open files. A buffer of 128 # Windows defaults to a limit of 512 open files. A buffer of 128
# should give us enough headway. # should give us enough headway.
coreconfigitem('worker', 'backgroundclosemaxqueue', coreconfigitem('worker', 'backgroundclosemaxqueue',
default=384, default=384,