Mercurial > hg-stable
changeset 38327:929405af558a
update: use context manager for config override (API)
Note that update wasn't resetting the value before, so any extensions
that called commands.update() and relied on ui.forcemerge being set
after it returned would now have to set it themselves.
(There technically a small API change in all of the patches in this
series, I believe: If extensions relied on the methods to *clear*
ui.forcemerge, then they would have to do that themselves now, because
ui.configoverride() actually restores the previous config, it doesn't
just clear it like these functions did before.)
Differential Revision: https://phab.mercurial-scm.org/D3741
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 14 Jun 2018 15:46:31 -0700 |
| parents | ff9694ea3852 |
| children | 0d6d0aa3c4bf |
| files | mercurial/commands.py |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Thu Jun 14 15:46:17 2018 -0700 +++ b/mercurial/commands.py Thu Jun 14 15:46:31 2018 -0700 @@ -5657,10 +5657,10 @@ ctx = scmutil.revsingle(repo, rev, rev) rev = ctx.rev() hidden = ctx.hidden() - repo.ui.setconfig('ui', 'forcemerge', opts.get(r'tool'), 'update') - - ret = hg.updatetotally(ui, repo, rev, brev, clean=clean, - updatecheck=updatecheck) + overrides = {('ui', 'forcemerge'): opts.get(r'tool', '')} + with ui.configoverride(overrides, 'update'): + ret = hg.updatetotally(ui, repo, rev, brev, clean=clean, + updatecheck=updatecheck) if hidden: ctxstr = ctx.hex()[:12] ui.warn(_("updated to hidden changeset %s\n") % ctxstr)