This is an archive of the discontinued Mercurial Phabricator instance.

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	18656		Dec 12 2019, 6:44 PM	★	★
Diff 2	18778		Dec 16 2019, 6:33 PM	★	★
Diff 3	18805	rHGc41ed5d4f77025d883e87f1fb5b21f38476cb49e	Dec 11 2019, 6:06 PM	★	★

Status	Author	Revision
Closed	martinvonz	D7627 config: drop debug messages saying where config was read from
Closed	martinvonz	D7626 config: close file even if we fail to read it
Closed	martinvonz	D7625 config: catch intended exception when failing to parse config
Closed	martinvonz	D7624 rcutil: don't check if defaultrc/ is a directory -- we know it is
Closed	martinvonz	D7623 tests: make test-config-env.py a little less hacky
Closed	martinvonz	D7622 help: get helptext/ data from `resources` module if available
Closed	martinvonz	D7621 pycompat: allow pycompat.sysbytes() even if input already is bytes

Diff 18805

	):			):
	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',