# HG changeset patch # User Pulkit Goyal <7895pulkit@gmail.com> # Date 2018-02-14 11:35:33 # Node ID acc8e6e52af60d8f5cd29a9b0cb9e2525cfc2122 # Parent 56635c506608c162b1b2929e80502c398b4b3ee7 py3: use "%d" to convert integers to bytes Differential Revision: https://phab.mercurial-scm.org/D2263 diff --git a/hgext/rebase.py b/hgext/rebase.py --- a/hgext/rebase.py +++ b/hgext/rebase.py @@ -541,7 +541,7 @@ class rebaseruntime(object): 'to commit\n') % (rev, ctx)) self.skipped.add(rev) self.state[rev] = p1 - ui.debug('next revision set to %s\n' % p1) + ui.debug('next revision set to %d\n' % p1) else: ui.status(_('already rebased %s as %s\n') % (desc, repo[self.state[rev]])) diff --git a/hgext/shelve.py b/hgext/shelve.py --- a/hgext/shelve.py +++ b/hgext/shelve.py @@ -271,7 +271,7 @@ class shelvedstate(object): "activebook": activebook or cls._noactivebook } scmutil.simplekeyvaluefile(repo.vfs, cls._filename)\ - .write(info, firstline=str(cls._version)) + .write(info, firstline=("%d" % cls._version)) @classmethod def clear(cls, repo): diff --git a/mercurial/verify.py b/mercurial/verify.py --- a/mercurial/verify.py +++ b/mercurial/verify.py @@ -60,6 +60,7 @@ class verifier(object): def err(self, linkrev, msg, filename=None): if linkrev is not None: self.badrevs.add(linkrev) + linkrev = "%d" % linkrev else: linkrev = '?' msg = "%s: %s" % (linkrev, msg)