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.

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
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mmercurial/debugcommands.py (6 lines)

Diff 26464

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'])