Mercurial > hg
comparison mercurial/hg.py @ 34805:c4a0480d1951
config: simplify aliasing commands.update.check
experimental.updatecheck was renamed into commands.update.check, use the
config system to provides the fallback on the old config name instead of
adding more code.
Differential Revision: https://phab.mercurial-scm.org/D1117
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Mon, 16 Oct 2017 18:58:16 +0200 |
parents | 23ed47a895d5 |
children | 68e0bcb90357 |
comparison
equal
deleted
inserted
replaced
34804:149109c96904 | 34805:c4a0480d1951 |
---|---|
756 | 756 |
757 This returns whether conflict is detected at updating or not. | 757 This returns whether conflict is detected at updating or not. |
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' |
767 with repo.wlock(): | 764 with repo.wlock(): |
768 movemarkfrom = None | 765 movemarkfrom = None |