This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3741

update: use context manager for config override (API)
ClosedPublic

Authored by martinvonz on Jun 14 2018, 7:32 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG929405af558a: update: use context manager for config override (API)
Summary

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.)

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Jun 14 2018, 7:32 PM
Closed by commit rHG929405af558a: update: use context manager for config override (API) (authored by martinvonz). · Explain WhyJun 15 2018, 8:48 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (8 lines)

Diff 9085

mercurial/commands.py

# if we defined a bookmark, we have to remember the original name # if we defined a bookmark, we have to remember the original name
brev = rev brev = rev
if rev: if rev:
repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn') repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn')
ctx = scmutil.revsingle(repo, rev, rev) ctx = scmutil.revsingle(repo, rev, rev)
rev = ctx.rev() rev = ctx.rev()
hidden = ctx.hidden() hidden = ctx.hidden()
repo.ui.setconfig('ui', 'forcemerge', opts.get(r'tool'), 'update') overrides = {('ui', 'forcemerge'): opts.get(r'tool', '')}
with ui.configoverride(overrides, 'update'):
ret = hg.updatetotally(ui, repo, rev, brev, clean=clean, ret = hg.updatetotally(ui, repo, rev, brev, clean=clean,
updatecheck=updatecheck) updatecheck=updatecheck)
if hidden: if hidden:
ctxstr = ctx.hex()[:12] ctxstr = ctx.hex()[:12]
ui.warn(_("updated to hidden changeset %s\n") % ctxstr) ui.warn(_("updated to hidden changeset %s\n") % ctxstr)
if ctx.obsolete(): if ctx.obsolete():
obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx) obsfatemsg = obsutil._getfilteredreason(repo, ctxstr, ctx)
ui.warn("(%s)\n" % obsfatemsg) ui.warn("(%s)\n" % obsfatemsg)
return ret return ret