This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10170

branchmap: force Exception to bytes before logging
ClosedPublic

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

Download Raw Diff

Details

Reviewers

pulkit

Group Reviewers

hg-reviewers

Commits

rHG799973a44c82: branchmap: force Exception to bytes before logging

Summary

Here was an instance where black mangled the formatting so that pytype
didn't recognize the suppression directive. But it seems that the error was
correct, and the code should follow other recent changes around exception
conversion.

File "/mnt/c/Users/Matt/hg/mercurial/branchmap.py", line 303, in fromfile: Function _bytestr.__init__ was called with the wrong arguments [wrong-arg-types]
         Expected: (self, ints: Iterable[int])
  Actually passed: (self, ints: Exception)
  The following methods aren't implemented on Exception:
  __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.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: D10171: changegroup: convert a warning message to bytes.Mar 12 2021, 1:08 PM

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

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

mharbison72 added a commit: rHG799973a44c82: branchmap: force Exception to bytes before logging.Mar 17 2021, 6:11 AM

Closed by commit rHG799973a44c82: branchmap: force Exception to bytes before logging (authored by mharbison72). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

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 26460

mercurial/branchmap.py


	except Exception as inst:			except Exception as inst:
	if repo.ui.debugflag:			if repo.ui.debugflag:
	msg = b'invalid %s: %s\n'			msg = b'invalid %s: %s\n'
	repo.ui.debug(			repo.ui.debug(
	msg			msg
	% (			% (
	_branchcachedesc(repo),			_branchcachedesc(repo),
	pycompat.bytestr(			stringutil.forcebytestr(inst),
	inst
	), # pytype: disable=wrong-arg-types
	)			)
	)			)
	bcache = None			bcache = None

	finally:			finally:
	if f:			if f:
	f.close()			f.close()

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	26267		Mar 12 2021, 1:08 PM	★	★
Diff 2	26460	rHG799973a44c82e428b67ed8621878c41d9400fa3d	Mar 11 2021, 5:10 PM	★	★