Mercurial > public > mercurial-scm > hg
diff mercurial/hg.py @ 34705:23ed47a895d5
config: graduate experimental.updatecheck to commands.update.check
.. feature::
New `commands.update.check` feature to adjust constraints on when
`hg update` will allow updates with a dirty working copy.
also
.. bc::
The `experimental.updatecheck` name for the new `commands.update.check`
feature is now deprecated, and will be removed after this release.
Differential Revision: https://phab.mercurial-scm.org/D1070
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Sat, 14 Oct 2017 03:13:50 -0400 |
| parents | 0fa781320203 |
| children | c4a0480d1951 |
line wrap: on
line diff
--- a/mercurial/hg.py Sat Oct 14 15:42:38 2017 -0400 +++ b/mercurial/hg.py Sat Oct 14 03:13:50 2017 -0400 @@ -757,7 +757,10 @@ This returns whether conflict is detected at updating or not. """ if updatecheck is None: - updatecheck = ui.config('experimental', 'updatecheck') + updatecheck = ui.config('commands', 'update.check') + if updatecheck is None: + # pre-4.4 compat on the old spelling of this config item + updatecheck = ui.config('experimental', 'updatecheck') if updatecheck not in ('abort', 'none', 'linear', 'noconflict'): # If not configured, or invalid value configured updatecheck = 'linear'