This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11472

archival: force a `CompressionError` to bytes before passing to `error.Abort`
ClosedPublic

Authored by mharbison72 on Sep 21 2021, 11:38 AM.

Download Raw Diff

Details

Reviewers

Alphare

Group Reviewers

hg-reviewers

Commits

rHG406a7e629946: archival: force a `CompressionError` to bytes before passing to `error.Abort`

Summary

I'm not sure what changed before pytype 09-09-2021 (from 04-15-2021), but this
started getting flagged.

This fixes:

File "/mnt/c/Users/Matt/hg/mercurial/archival.py", line 199, in taropen: Function bytestr.__init__ was called with the wrong arguments [wrong-arg-types]
         Expected: (self, ints: Iterable[int])
  Actually passed: (self, ints: tarfile.CompressionError)
  Attributes of protocol Iterable[int] are not implemented on tarfile.CompressionError: __iter__

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

mharbison72 created this revision.Sep 21 2021, 11:38 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptSep 21 2021, 11:38 AM

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

mharbison72 added a child revision: D11473: util: eliminate the possibility of returning None from `versiontuple()`.Sep 21 2021, 11:38 AM

Alphare accepted this revision.Sep 22 2021, 3:48 AM

This revision is now accepted and ready to land.Sep 22 2021, 3:48 AM

mharbison72 added a commit: rHG406a7e629946: archival: force a `CompressionError` to bytes before passing to `error.Abort`.Sep 22 2021, 3:56 AM

Closed by commit rHG406a7e629946: archival: force a `CompressionError` to bytes before passing to `error.Abort` (authored by mharbison72). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/archival.py (4 lines)

Status	Author	Revision
Closed	mharbison72	D11476 extensions: prevent a crash on py3 with a `minimumhgversion` str value
Closed	mharbison72	D11475 extensions: prevent a crash on py3 when testing a bad extension minimum
Closed	mharbison72	D11474 typing: drop annotations on `mercurial/logcmdutil.walkopts` attributes
Closed	mharbison72	D11473 util: eliminate the possibility of returning None from `versiontuple()`
Closed	mharbison72	D11472 archival: force a `CompressionError` to bytes before passing to `error.Abort`
Closed	mharbison72	D11471 parser: force a `ValueError` to bytes before passing to `error.ParseError`
Closed	mharbison72	D11470 util: avoid a name-error warning in the `mmapread` exception handler
Closed	mharbison72	D11469 typing: suppress an name-error warning in `mercurial/windows.py`
Closed	mharbison72	D11468 typing: suppress an import-error warning in `mercurial/utils/resourceutil.py`
Closed	mharbison72	D11467 encoding: force a few Errors to bytes before passing to `error.Abort`
Closed	mharbison72	D11466 typing: add a fake `__init__()` to bytestr to distract pytype

Diff 30364

mercurial/archival.py

	formatter,			formatter,
	match as matchmod,			match as matchmod,
	pycompat,			pycompat,
	scmutil,			scmutil,
	util,			util,
	vfs as vfsmod,			vfs as vfsmod,
	)			)

				from .utils import stringutil

	stringio = util.stringio			stringio = util.stringio

	# from unzip source code:			# from unzip source code:
	_UNX_IFREG = 0x8000			_UNX_IFREG = 0x8000
	_UNX_IFLNK = 0xA000			_UNX_IFLNK = 0xA000


	def tidyprefix(dest, kind, prefix):			def tidyprefix(dest, kind, prefix):
	)			)
	)			)
	else:			else:
	try:			try:
	return tarfile.open(			return tarfile.open(
	name, pycompat.sysstr(mode + kind), fileobj			name, pycompat.sysstr(mode + kind), fileobj
	)			)
	except tarfile.CompressionError as e:			except tarfile.CompressionError as e:
	raise error.Abort(pycompat.bytestr(e))			raise error.Abort(stringutil.forcebytestr(e))

	if isinstance(dest, bytes):			if isinstance(dest, bytes):
	self.z = taropen(b'w:', name=dest)			self.z = taropen(b'w:', name=dest)
	else:			else:
	self.z = taropen(b'w\|', fileobj=dest)			self.z = taropen(b'w\|', fileobj=dest)

	def addfile(self, name, mode, islink, data):			def addfile(self, name, mode, islink, data):
	name = pycompat.fsdecode(name)			name = pycompat.fsdecode(name)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	30346		Sep 21 2021, 11:38 AM	★	★
Diff 2	30364	rHG406a7e62994674e4292ef5b49d8d60e612e15675	Sep 20 2021, 11:03 AM	★	★