Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: use context manager for config override
authorMartin von Zweigbergk <martinvonz@google.com>
Thu, 14 Jun 2018 15:45:45 -0700
changeset 38316 7e34fc78701a
parent 38315 79dcaad9d145
child 38317 ff9694ea3852
merge: use context manager for config override Differential Revision: https://phab.mercurial-scm.org/D3739
mercurial/commands.py file | annotate | diff | comparison | revisions 
--- a/mercurial/commands.py	Thu Jun 14 15:45:16 2018 -0700
+++ b/mercurial/commands.py	Thu Jun 14 15:45:45 2018 -0700
@@ -3684,15 +3684,13 @@
         displayer.close()
         return 0
 
-    try:
-        # ui.forcemerge is an internal variable, do not document
-        repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), 'merge')
+    # ui.forcemerge is an internal variable, do not document
+    overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
+    with ui.configoverride(overrides, 'merge'):
         force = opts.get('force')
         labels = ['working copy', 'merge rev']
         return hg.merge(repo, node, force=force, mergeforce=force,
                         labels=labels, abort=abort)
-    finally:
-        ui.setconfig('ui', 'forcemerge', '', 'merge')
 
 @command('outgoing|out',
     [('f', 'force', None, _('run even when the destination is unrelated')),
Mercurial