This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3740

resolve: use context manager for config override
ClosedPublic

Authored by martinvonz on Jun 14 2018, 7:32 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGff9694ea3852: resolve: use context manager for config override
Summary

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Jun 14 2018, 7:32 PM
Closed by commit rHGff9694ea3852: resolve: use context manager for config override (authored by martinvonz). · Explain WhyJun 15 2018, 8:48 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (14 lines)

Diff 9069

mercurial/commands.py

try: try:
util.copyfile(a, a + ".resolve") util.copyfile(a, a + ".resolve")
except (IOError, OSError) as inst: except (IOError, OSError) as inst:
if inst.errno != errno.ENOENT: if inst.errno != errno.ENOENT:
raise raise
try: try:
# preresolve file # preresolve file
ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
'resolve') with ui.configoverride(overrides, 'resolve'):
complete, r = ms.preresolve(f, wctx) complete, r = ms.preresolve(f, wctx)
if not complete: if not complete:
tocomplete.append(f) tocomplete.append(f)
elif r: elif r:
ret = 1 ret = 1
finally: finally:
ui.setconfig('ui', 'forcemerge', '', 'resolve')
ms.commit() ms.commit()
# replace filemerge's .orig file with our resolve file, but only # replace filemerge's .orig file with our resolve file, but only
# for merges that are complete # for merges that are complete
if complete: if complete:
try: try:
util.rename(a + ".resolve", util.rename(a + ".resolve",
scmutil.origpath(ui, repo, a)) scmutil.origpath(ui, repo, a))
except OSError as inst: except OSError as inst:
if inst.errno != errno.ENOENT: if inst.errno != errno.ENOENT:
raise raise
for f in tocomplete: for f in tocomplete:
try: try:
# resolve file # resolve file
ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
'resolve') with ui.configoverride(overrides, 'resolve'):
r = ms.resolve(f, wctx) r = ms.resolve(f, wctx)
if r: if r:
ret = 1 ret = 1
finally: finally:
ui.setconfig('ui', 'forcemerge', '', 'resolve')
ms.commit() ms.commit()
# replace filemerge's .orig file with our resolve file # replace filemerge's .orig file with our resolve file
a = repo.wjoin(f) a = repo.wjoin(f)
try: try:
util.rename(a + ".resolve", scmutil.origpath(ui, repo, a)) util.rename(a + ".resolve", scmutil.origpath(ui, repo, a))
except OSError as inst: except OSError as inst:
if inst.errno != errno.ENOENT: if inst.errno != errno.ENOENT: