##// END OF EJS Templates
config: simplify aliasing commands.update.check...
Boris Feld -
r34806:c4a0480d default
parent child Browse files
Show More
@@ -181,6 +181,8 b" coreconfigitem('commands', 'status.verbo"
181 )
181 )
182 coreconfigitem('commands', 'update.check',
182 coreconfigitem('commands', 'update.check',
183 default=None,
183 default=None,
184 # Deprecated, remove after 4.4 release
185 alias=[('experimental', 'updatecheck')]
184 )
186 )
185 coreconfigitem('commands', 'update.requiredest',
187 coreconfigitem('commands', 'update.requiredest',
186 default=False,
188 default=False,
@@ -412,10 +414,6 b" coreconfigitem('experimental', 'spacemov"
412 coreconfigitem('experimental', 'treemanifest',
414 coreconfigitem('experimental', 'treemanifest',
413 default=False,
415 default=False,
414 )
416 )
415 # Deprecated, remove after 4.4 release
416 coreconfigitem('experimental', 'updatecheck',
417 default=None,
418 )
419 coreconfigitem('extensions', '.*',
417 coreconfigitem('extensions', '.*',
420 default=None,
418 default=None,
421 generic=True,
419 generic=True,
@@ -758,9 +758,6 b' def updatetotally(ui, repo, checkout, br'
758 """
758 """
759 if updatecheck is None:
759 if updatecheck is None:
760 updatecheck = ui.config('commands', 'update.check')
760 updatecheck = ui.config('commands', 'update.check')
761 if updatecheck is None:
762 # pre-4.4 compat on the old spelling of this config item
763 updatecheck = ui.config('experimental', 'updatecheck')
764 if updatecheck not in ('abort', 'none', 'linear', 'noconflict'):
761 if updatecheck not in ('abort', 'none', 'linear', 'noconflict'):
765 # If not configured, or invalid value configured
762 # If not configured, or invalid value configured
766 updatecheck = 'linear'
763 updatecheck = 'linear'
General Comments 0
You need to be logged in to leave comments. Login now