This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9352

config: clean up message about ignored untrusted config
ClosedPublic

Authored by martinvonz on Nov 20 2020, 7:24 PM.

Download Raw Diff

Details

Reviewers

mharbison72

Group Reviewers

hg-reviewers

Commits

rHGe5a0efd26f7a: config: clean up message about ignored untrusted config

Summary

The error message relied on Python's default formatting of arguments
to an Exception's constructor. Let's try to make it a little more
readable for users.

Diff Detail

Repository

rHG Mercurial

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Nov 20 2020, 7:24 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptNov 20 2020, 7:24 PM

Herald added a subscriber: mercurial-patches. · View Herald Transcript

martinvonz added a child revision: D9353: errors: let ParseError use Abort.__bytes__.Nov 20 2020, 7:25 PM

mharbison72 accepted this revision.Nov 20 2020, 9:45 PM

This revision is now accepted and ready to land.Nov 20 2020, 9:45 PM

martinvonz added a commit: rHGe5a0efd26f7a: config: clean up message about ignored untrusted config.Nov 20 2020, 9:51 PM

Closed by commit rHGe5a0efd26f7a: config: clean up message about ignored untrusted config (authored by martinvonz). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/ui.py (4 lines)
M			tests/test-trusted.py.out (2 lines)

Status	Author	Revision
Closed	martinvonz	D9340 errors: raise InputError in `hg absorb`
Closed	martinvonz	D9339 errors: introduce CanceledError and use it in a few places
Closed	martinvonz	D9338 errors: raise InputError in `hg split`
Closed	martinvonz	D9337 errors: raise StateError in `hg bisect`
Closed	martinvonz	D9336 errors: raise InputError in `hg debugobsolete`
Closed	martinvonz	D9333 errors: raise InputError when line range to followlines() is out of bounds
Closed	martinvonz	D9332 errors: use exit code 10 for parse errors
Closed	martinvonz	D9355 errors: raise ConfigError on failure to parse config file
Closed	martinvonz	D9354 errors: remove ParseError.args
Closed	martinvonz	D9353 errors: let ParseError use Abort.__bytes__
Closed	martinvonz	D9352 config: clean up message about ignored untrusted config
Closed	martinvonz	D9351 tests: use new ParseError.format() in test-trusted.py
Closed	martinvonz	D9350 errors: make ParseError a subtype of Abort
Closed	martinvonz	D9349 tests: make doctests not depend on str(ParseError()) format
Closed	martinvonz	D9348 errors: format "abort: " text in a new Abort.format() method
Closed	martinvonz	D9347 errors: make formatparse() an instance method on ParseError
Closed	martinvonz	D9346 errors: create "similarity hint" for UnknownIdentifier eagerly in constructor
Closed	martinvonz	D9345 errors: move similarity_hint() to error module
Closed	martinvonz	D9344 errors: morph reportsimilar() into similarity_hint()
Closed	martinvonz	D9343 errors: restructure formatparse() to clarify conditions a bit

Diff 23603

mercurial/ui.py

	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)
	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: %s\n') % (inst.location, inst.message)
				)

	self._applyconfig(cfg, trusted, root)			self._applyconfig(cfg, trusted, root)

	def applyconfig(self, configitems, source=b"", root=None):			def applyconfig(self, configitems, source=b"", root=None):
	"""Add configitems from a non-file source. Unlike with ``setconfig()``,			"""Add configitems from a non-file source. Unlike with ``setconfig()``,
	they can be overridden by subsequent config file reads. The items are			they can be overridden by subsequent config file reads. The items are
	in the same format as ``configoverride()``, namely a dict of the			in the same format as ``configoverride()``, namely a dict of the
	following structures: {(section, name) : value}			following structures: {(section, name) : value}

tests/test-trusted.py.out

	# error handling			# error handling
	# file doesn't exist			# file doesn't exist
	# same user, same group			# same user, same group
	# different user, different group			# different user, different group

	# parse error			# parse error
	# different user, different group			# different user, different group
	not trusting file .hg/hgrc from untrusted user abc, group def			not trusting file .hg/hgrc from untrusted user abc, group def
	ignored: ('foo', '.hg/hgrc:1')			ignored .hg/hgrc:1: foo
	# same user, same group			# same user, same group
	hg: parse error at .hg/hgrc:1: foo			hg: parse error at .hg/hgrc:1: foo


	# access typed information			# access typed information
	# different user, different group			# different user, different group
	not trusting file .hg/hgrc from untrusted user abc, group def			not trusting file .hg/hgrc from untrusted user abc, group def
	# suboptions, trusted and untrusted			# suboptions, trusted and untrusted

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	23589		Nov 20 2020, 7:24 PM	★	★
Diff 2	23603	rHGe5a0efd26f7aced809b846b3e46d41c589c03b0d	Nov 20 2020, 1:31 PM	★	★