This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7461

py3: wrap a __func__ in sysbytes() before logging as bytes
ClosedPublic

Authored by martinvonz on Nov 20 2019, 11:51 AM.

Details

Reviewers
dlax
pulkit
Group Reviewers
hg-reviewers
Commits
rHGaff3f6e407a1: py3: wrap a __func__ in sysbytes() before logging as bytes

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 2019, 11:51 AM
dlax accepted this revision.Nov 20 2019, 2:59 PM
pulkit accepted this revision.Nov 21 2019, 7:38 AM
This revision is now accepted and ready to land.Nov 21 2019, 7:38 AM

Revision Contents
Changeset List

PathPackages
Mhgext/remotefilelog/basestore.py (5 lines)

Diff 18263

hgext/remotefilelog/basestore.py

pass pass
def wrapped(self, *args, **kwargs): def wrapped(self, *args, **kwargs):
retrylog = self.retrylog or noop retrylog = self.retrylog or noop
funcname = fn.__name__ funcname = fn.__name__
i = 0 i = 0
while i < self.numattempts: while i < self.numattempts:
if i > 0: if i > 0:
retrylog(b're-attempting (n=%d) %s\n' % (i, funcname)) retrylog(
b're-attempting (n=%d) %s\n'
% (i, pycompat.sysbytes(funcname))
)
self.markforrefresh() self.markforrefresh()
i += 1 i += 1
try: try:
return fn(self, *args, **kwargs) return fn(self, *args, **kwargs)
except KeyError: except KeyError:
if i == self.numattempts: if i == self.numattempts:
# retries exhausted # retries exhausted
retrylog( retrylog(
b'retries exhausted in %s, raising KeyError\n' b'retries exhausted in %s, raising KeyError\n'
% pycompat.sysbytes(funcname) % pycompat.sysbytes(funcname)
) )
raise raise
return wrapped return wrapped