Mercurial > hg
changeset 31455:7b5fb4b0c0e8
commit: get rid of ui.backupconfig
| author | Jun Wu <quark@fb.com> |
|---|---|
| date | Thu, 16 Mar 2017 14:15:20 -0700 |
| parents | a5bad127128d |
| children | 2545ee88a57e |
| files | mercurial/commands.py |
| diffstat | 1 files changed, 15 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Wed Mar 15 15:48:57 2017 -0700 +++ b/mercurial/commands.py Thu Mar 16 14:15:20 2017 -0700 @@ -1702,25 +1702,22 @@ return 1 else: def commitfunc(ui, repo, message, match, opts): - backup = ui.backupconfig('phases', 'new-commit') + overrides = {} + if opts.get('secret'): + overrides[('phases', 'new-commit')] = 'secret' + baseui = repo.baseui - basebackup = baseui.backupconfig('phases', 'new-commit') - try: - if opts.get('secret'): - ui.setconfig('phases', 'new-commit', 'secret', 'commit') - # Propagate to subrepos - baseui.setconfig('phases', 'new-commit', 'secret', 'commit') - - editform = cmdutil.mergeeditform(repo[None], 'commit.normal') - editor = cmdutil.getcommiteditor(editform=editform, **opts) - return repo.commit(message, opts.get('user'), opts.get('date'), - match, - editor=editor, - extra=extra) - finally: - ui.restoreconfig(backup) - repo.baseui.restoreconfig(basebackup) - + with baseui.configoverride(overrides, 'commit'): + with ui.configoverride(overrides, 'commit'): + editform = cmdutil.mergeeditform(repo[None], + 'commit.normal') + editor = cmdutil.getcommiteditor(editform=editform, **opts) + return repo.commit(message, + opts.get('user'), + opts.get('date'), + match, + editor=editor, + extra=extra) node = cmdutil.commit(ui, repo, commitfunc, pats, opts)