This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10174

debug: convert a few exceptions to bytes before wrapping in another error
ClosedPublic

Authored by mharbison72 on Mar 12 2021, 1:08 PM.

Download Raw Diff

Details

Reviewers

pulkit

Group Reviewers

hg-reviewers

Commits

rHG8408c3198ec1: debug: convert a few exceptions to bytes before wrapping in another error

Summary

Caught by pytype:

File "/mnt/c/Users/Matt/hg/mercurial/debugcommands.py", line 2118, in debugmanifestfulltextcache: Function Abort.__init__ was called with the wrong arguments [wrong-arg-types]
         Expected: (self, message: Union[bytearray, bytes, memoryview], ...)
  Actually passed: (self, message: mercurial.error.LookupError, ...)
File "/mnt/c/Users/Matt/hg/mercurial/debugcommands.py", line 2453, in debugobsolete: Function _bytestr.__init__ was called with the wrong arguments [wrong-arg-types]
         Expected: (self, ints: Iterable[int])
  Actually passed: (self, ints: ValueError)
  The following methods aren't implemented on ValueError:
  __iter__

Diff Detail

Repository

rHG Mercurial

Branch

stable

Lint

No Linters Available

Unit

No Unit Test Coverage

Event Timeline

mharbison72 created this revision.Mar 12 2021, 1:08 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptMar 12 2021, 1:08 PM

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

mharbison72 added a child revision: D10175: typing: add an assertion instead of blacklisting mercurial/extensions.py.Mar 12 2021, 1:08 PM

pulkit accepted this revision.Mar 12 2021, 1:17 PM

This revision is now accepted and ready to land.Mar 12 2021, 1:17 PM

mharbison72 added a commit: rHG8408c3198ec1: debug: convert a few exceptions to bytes before wrapping in another error.Mar 17 2021, 6:11 AM

Closed by commit rHG8408c3198ec1: debug: convert a few exceptions to bytes before wrapping in another error (authored by mharbison72). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/debugcommands.py (6 lines)

Commit	Parents	Author	Summary	Date
06dc55c4ba30	2e3cc0e12ec6	Matt Harbison		Mar 11 2021, 5:27 PM

Status	Author	Revision
Closed	mharbison72	D10215 typing: rewrite a conditional assignment to unconfuse pytype
Closed	mharbison72	D10214 typing: add assertions to localrepo.py to appease pytype
Closed	mharbison72	D10213 obsutil: maintain a homogenous list when computing successors
Closed	mharbison72	D10212 typing: add an assertion to verify.py to appease pytype
Closed	mharbison72	D10211 typing: add an assertion to mercurial/hgweb/webcommands.py to help pytype
Closed	mharbison72	D10210 crecord: null out the curses attribute with `None` on failure to import
Closed	mharbison72	D10209 typing: fix directives mangled by black
Closed	mharbison72	D10208 typing: disable module attribute warnings for properly conditionalized code
Closed	mharbison72	D10207 typing: disable import error warnings that are already handled
Closed	mharbison72	D10206 typing: disable a few errors when accessing Windows specific attributes
Closed	mharbison72	D10205 typing: disable a few errors calling py3.7+ functions in resourceutil.py
Closed	mharbison72	D10204 wsgicgi: switch the default PATH_INFO back to str
Closed	mharbison72	D10203 crecord: convert an instance of bytes to str
Closed	mharbison72	D10202 crecord: change str literals to byte literals
Closed	mharbison72	D10201 bisect: replace a missing method on the list primitive
Closed	mharbison72	D10183 typing: disable a module-attr warning in the worker module's py2 code
Closed	mharbison72	D10182 wireprotoserver: convert ErrorResponse to bytes
Closed	mharbison72	D10181 verify: convert an exception to bytes before logging
Closed	mharbison72	D10180 typing: add an assertion to the upgrade engine to help pytype
Closed	mharbison72	D10179 subrepo: handle unexpected file types from git gracefully
Closed	mharbison72	D10178 patch: convert a UI message to bytes when editing a patch
Closed	mharbison72	D10177 merge: force an exception message to bytes before printing as a warning
Closed	mharbison72	D10176 hg: convert an exception to bytes in the repo creation exception handler
Closed	mharbison72	D10175 typing: add an assertion instead of blacklisting mercurial/extensions.py
Closed	mharbison72	D10174 debug: convert a few exceptions to bytes before wrapping in another error
Closed	mharbison72	D10173 grep: convert an exception to bytes for a warning message
Closed	mharbison72	D10172 morestatus: convert a UI message about merge conflicts to bytes
Closed	mharbison72	D10171 changegroup: convert a warning message to bytes
Closed	mharbison72	D10170 branchmap: force Exception to bytes before logging
Closed	mharbison72	D10169 nodemap: convert error message to bytes
Closed	mharbison72	D10168 mail: convert SMTPException to bytes before passing to error.Abort()
Closed	mharbison72	D10167 typing: switch an argument type to the generic form
Closed	mharbison72	D10166 typing: ensure that error.Abort is given bytes
Closed	mharbison72	D10165 typing: fix a suppression directive that was mangled by black formatting

Diff 26271

mercurial/debugcommands.py

	if add:			if add:
	with repo.wlock():			with repo.wlock():
	m = repo.manifestlog			m = repo.manifestlog
	store = m.getstorage(b'')			store = m.getstorage(b'')
	for n in add:			for n in add:
	try:			try:
	manifest = m[store.lookup(n)]			manifest = m[store.lookup(n)]
	except error.LookupError as e:			except error.LookupError as e:
	raise error.Abort(e, hint=b"Check your manifest node id")			raise error.Abort(
				bytes(e), hint=b"Check your manifest node id"
				)
	manifest.read() # stores revisision in cache too			manifest.read() # stores revisision in cache too
	return			return

	cache = getcache()			cache = getcache()
	if not len(cache):			if not len(cache):
	ui.write(_(b'cache empty\n'))			ui.write(_(b'cache empty\n'))
	else:			else:
	ui.write(			ui.write(
	parents=parents,			parents=parents,
	date=date,			date=date,
	metadata=metadata,			metadata=metadata,
	ui=ui,			ui=ui,
	)			)
	tr.close()			tr.close()
	except ValueError as exc:			except ValueError as exc:
	raise error.Abort(			raise error.Abort(
	_(b'bad obsmarker input: %s') % pycompat.bytestr(exc)			_(b'bad obsmarker input: %s') % stringutil.forcebytestr(exc)
	)			)
	finally:			finally:
	tr.release()			tr.release()
	finally:			finally:
	l.release()			l.release()
	else:			else:
	if opts[b'rev']:			if opts[b'rev']:
	revs = scmutil.revrange(repo, opts[b'rev'])			revs = scmutil.revrange(repo, opts[b'rev'])

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	26271		Mar 12 2021, 1:08 PM	★	★
Diff 2	26464	rHG8408c3198ec1bdb83caffc0ee278f23f15654b15	Mar 11 2021, 5:27 PM	★	★