# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1529015178 25200
# Node ID 0d6d0aa3c4bfa16c46c1a9f1895ff987b627b544
# Parent  929405af558ac698c0bac0a53817caf99c460e2b
backout: use context manager for config override

Differential Revision: https://phab.mercurial-scm.org/D3742

diff -r 929405af558a -r 0d6d0aa3c4bf mercurial/commands.py
--- a/mercurial/commands.py	Thu Jun 14 15:46:31 2018 -0700
+++ b/mercurial/commands.py	Thu Jun 14 15:26:18 2018 -0700
@@ -619,9 +619,9 @@
     if not opts.get('merge') and op1 != node:
         dsguard = dirstateguard.dirstateguard(repo, 'backout')
         try:
-            ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
-                         'backout')
-            stats = mergemod.update(repo, parent, True, True, node, False)
+            overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
+            with ui.configoverride(overrides, 'backout'):
+                stats = mergemod.update(repo, parent, True, True, node, False)
             repo.setparents(op1, op2)
             dsguard.close()
             hg._showstats(repo, stats)
@@ -630,7 +630,6 @@
                                  "file merges\n"))
                 return 1
         finally:
-            ui.setconfig('ui', 'forcemerge', '', '')
             lockmod.release(dsguard)
     else:
         hg.clean(repo, node, show_stats=False)
@@ -667,12 +666,9 @@
         hg.clean(repo, op1, show_stats=False)
         ui.status(_('merging with changeset %s\n')
                   % nice(repo.changelog.tip()))
-        try:
-            ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
-                         'backout')
+        overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
+        with ui.configoverride(overrides, 'backout'):
             return hg.merge(repo, hex(repo.changelog.tip()))
-        finally:
-            ui.setconfig('ui', 'forcemerge', '', '')
     return 0
 
 @command('bisect',