diff --git a/hgext/rebase.py b/hgext/rebase.py --- a/hgext/rebase.py +++ b/hgext/rebase.py @@ -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 diff --git a/mercurial/configitems.py b/mercurial/configitems.py --- a/mercurial/configitems.py +++ b/mercurial/configitems.py @@ -1085,3 +1085,16 @@ coreconfigitem('worker', 'backgroundclos 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, +)