diff --git a/mercurial/exchange.py b/mercurial/exchange.py --- a/mercurial/exchange.py +++ b/mercurial/exchange.py @@ -1151,8 +1151,8 @@ for newremotehead in outdated: r = pushop.remote.pushkey('phases', newremotehead.hex(), - str(phases.draft), - str(phases.public)) + ('%d' % phases.draft), + ('%d' % phases.public)) if not r: pushop.ui.warn(_('updating %s to public failed!\n') % newremotehead) diff --git a/mercurial/obsolete.py b/mercurial/obsolete.py --- a/mercurial/obsolete.py +++ b/mercurial/obsolete.py @@ -656,7 +656,7 @@ self.caches.clear() # records the number of new markers for the transaction hooks previous = int(transaction.hookargs.get('new_obsmarkers', '0')) - transaction.hookargs['new_obsmarkers'] = str(previous + len(new)) + transaction.hookargs['new_obsmarkers'] = '%d' % (previous + len(new)) return len(new) def mergemarkers(self, transaction, data): diff --git a/mercurial/patch.py b/mercurial/patch.py --- a/mercurial/patch.py +++ b/mercurial/patch.py @@ -566,7 +566,7 @@ root = tempfile.mkdtemp(prefix='hg-patch-') self.opener = vfsmod.vfs(root) # Avoid filename issues with these simple names - fn = str(self.created) + fn = '%d' % self.created self.opener.write(fn, data) self.created += 1 self.files[fname] = (fn, mode, copied) diff --git a/mercurial/progress.py b/mercurial/progress.py --- a/mercurial/progress.py +++ b/mercurial/progress.py @@ -121,7 +121,7 @@ if total: add = b'%*d/%d' % (len(str(total)), pos, total) else: - add = str(pos) + add = b'%d' % pos elif indicator.startswith('item') and item: slice = 'end' if '-' in indicator: