diff hgext/remotefilelog/basestore.py @ 43735:7eb701e355bd

merge with stable
author Yuya Nishihara <yuya@tcha.org>
date Fri, 22 Nov 2019 21:42:04 +0900
parents 9f70512ae2cf aff3f6e407a1
children 2d49482d0dd4
line wrap: on
line diff
--- a/hgext/remotefilelog/basestore.py	Thu Nov 21 15:46:35 2019 -0500
+++ b/hgext/remotefilelog/basestore.py	Fri Nov 22 21:42:04 2019 +0900
@@ -441,7 +441,10 @@
             i = 0
             while i < self.numattempts:
                 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()
                 i += 1
                 try: