D3740: resolve: use context manager for config override
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Fri Jun 15 12:49:03 UTC 2018
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGff9694ea3852: resolve: use context manager for config override (authored by martinvonz, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3740?vs=9069&id=9084
REVISION DETAIL
https://phab.mercurial-scm.org/D3740
AFFECTED FILES
mercurial/commands.py
CHANGE DETAILS
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -4553,15 +4553,14 @@
try:
# preresolve file
- ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
- 'resolve')
- complete, r = ms.preresolve(f, wctx)
+ overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
+ with ui.configoverride(overrides, 'resolve'):
+ complete, r = ms.preresolve(f, wctx)
if not complete:
tocomplete.append(f)
elif r:
ret = 1
finally:
- ui.setconfig('ui', 'forcemerge', '', 'resolve')
ms.commit()
# replace filemerge's .orig file with our resolve file, but only
@@ -4577,13 +4576,12 @@
for f in tocomplete:
try:
# resolve file
- ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
- 'resolve')
- r = ms.resolve(f, wctx)
+ overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
+ with ui.configoverride(overrides, 'resolve'):
+ r = ms.resolve(f, wctx)
if r:
ret = 1
finally:
- ui.setconfig('ui', 'forcemerge', '', 'resolve')
ms.commit()
# replace filemerge's .orig file with our resolve file
To: martinvonz, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list