( )⚙ D7626 config: close file even if we fail to read it

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7626

config: close file even if we fail to read it
ClosedPublic

Authored by martinvonz on Dec 12 2019, 6:44 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGc41ed5d4f770: config: close file even if we fail to read it
Summary

If we get an exception from cfg.read(), we would not close the file
before this patch. This patch uses a context manager to make sure we
close it.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Revision Contents
Changeset List

PathPackages
Mmercurial/ui.py (18 lines)

Diff 18656

mercurial/ui.py

): ):
try: try:
fp = open(filename, 'rb') fp = open(filename, 'rb')
except IOError: except IOError:
if not sections: # ignore unless we were looking for something if not sections: # ignore unless we were looking for something
return return
raise raise
with fp:
cfg = config.config() cfg = config.config()
trusted = sections or trust or self._trusted(fp, filename) trusted = sections or trust or self._trusted(fp, filename)
try: try:
cfg.read(filename, fp, sections=sections, remap=remap) cfg.read(filename, fp, sections=sections, remap=remap)
fp.close()
except error.ParseError as inst: except error.ParseError as inst:
if trusted: if trusted:
raise raise
self.warn(_(b"ignored: %s\n") % stringutil.forcebytestr(inst)) self.warn(_(b'ignored: %s\n') % stringutil.forcebytestr(inst))
if self.plain(): if self.plain():
for k in ( for k in (
b'debug', b'debug',
b'fallbackencoding', b'fallbackencoding',
b'quiet', b'quiet',
b'slash', b'slash',
b'logtemplate', b'logtemplate',