# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1529016316 25200
# Node ID 79dcaad9d1451d213a604857a676c6844fd1e8b7
# Parent  565074cc9ac699dbe31ac762e2cf91ed615ffedf
graft: use context manager for config override

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

diff -r 565074cc9ac6 -r 79dcaad9d145 mercurial/commands.py
--- a/mercurial/commands.py	Thu Jun 14 11:49:10 2018 -0400
+++ b/mercurial/commands.py	Thu Jun 14 15:45:16 2018 -0700
@@ -2358,14 +2358,9 @@
         # we don't merge the first commit when continuing
         if not cont:
             # perform the graft merge with p1(rev) as 'ancestor'
-            try:
-                # ui.forcemerge is an internal variable, do not document
-                repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
-                                  'graft')
-                stats = mergemod.graft(repo, ctx, ctx.p1(),
-                                       ['local', 'graft'])
-            finally:
-                repo.ui.setconfig('ui', 'forcemerge', '', 'graft')
+            overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
+            with ui.configoverride(overrides, 'graft'):
+                stats = mergemod.graft(repo, ctx, ctx.p1(), ['local', 'graft'])
             # report any conflicts
             if stats.unresolvedcount > 0:
                 # write out state for --continue