configitems: move rebase config into core

The shelve extensions import and call rebase content without loading the
extension. This is problematic as the config items rebase uses are not
declared and the default value are not set, etc...

The shelve extension should be using core utilities only and the necessary bit
should be moved from rebase into core. In the meantime, I'm taking a small
step to get config registration completed with minimal overhead. The rebase
extension is shipped with core so registering its config option within core is
not a big issue.

This is the last step needed before we can install a warning that enforces all
config to be registered.
This commit is contained in:
Boris Feld 2017-10-13 23:00:31 +02:00
parent 0e5c2b08a6
commit ad5f3bc109
2 changed files with 13 additions and 14 deletions

View File

@ -73,20 +73,6 @@ command = registrar.command(cmdtable)
# leave the attribute unspecified.
testedwith = 'ships-with-hg-core'
configtable = {}
configitem = registrar.configitem(configtable)
configitem('commands', 'rebase.requiredest',
default=False,
)
configitem('experimental', 'rebaseskipobsolete',
default=True,
)
configitem('rebase', 'singletransaction',
default=False,
)
def _nothingtorebase():
return 1

View File

@ -1085,3 +1085,16 @@ coreconfigitem('worker', 'backgroundclosethreadcount',
coreconfigitem('worker', 'numcpus',
default=None,
)
# Rebase related configuration moved to core because other extension are doing
# strange things. For example, shelve import the extensions to reuse some bit
# without formally loading it.
coreconfigitem('commands', 'rebase.requiredest',
default=False,
)
coreconfigitem('experimental', 'rebaseskipobsolete',
default=True,
)
coreconfigitem('rebase', 'singletransaction',
default=False,
)