Mercurial > public > mercurial-scm > hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 34704:c51380879054 | 34705:23ed47a895d5 |
|---|---|
| 755 * noconflict: check that the update does not result in file merges | 755 * noconflict: check that the update does not result in file merges |
| 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('experimental', 'updatecheck') | 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') | |
| 761 if updatecheck not in ('abort', 'none', 'linear', 'noconflict'): | 764 if updatecheck not in ('abort', 'none', 'linear', 'noconflict'): |
| 762 # If not configured, or invalid value configured | 765 # If not configured, or invalid value configured |
| 763 updatecheck = 'linear' | 766 updatecheck = 'linear' |
| 764 with repo.wlock(): | 767 with repo.wlock(): |
| 765 movemarkfrom = None | 768 movemarkfrom = None |