facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-10 00:45:18 +03:00
Code Issues Projects Releases Wiki Activity

amend: use context manager for config override

Browse Source 
Differential Revision: https://phab.mercurial-scm.org/D639
This commit is contained in:
Martin von Zweigbergk 2017-09-06 10:41:13 -07:00
parent f238d550cd
commit e34765d999
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mercurial/cmdutil.py
View File

@ -35,7 +35,6 @@ from . import (
obsolete,
patch,
pathutil,
phases,
pycompat,
registrar,
revlog,
@ -3162,16 +3161,13 @@ def amend(ui, repo, commitfunc, old, extra, pats, opts):
# This not what we expect from amend.
return old.node()
ph = repo.ui.config('phases', 'new-commit', phases.draft)
try:
if opts.get('secret'):
commitphase = 'secret'
else:
commitphase = old.phase()
repo.ui.setconfig('phases', 'new-commit', commitphase, 'amend')
if opts.get('secret'):
commitphase = 'secret'
else:
commitphase = old.phase()
overrides = {('phases', 'new-commit'): commitphase}
with ui.configoverride(overrides, 'amend'):
newid = repo.commitctx(new)
finally:
repo.ui.setconfig('phases', 'new-commit', ph, 'amend')
# Reroute the working copy parent to the new changeset
repo.setparents(newid, nullid)