diff --git a/hgext/convert/__init__.py b/hgext/convert/__init__.py --- a/hgext/convert/__init__.py +++ b/hgext/convert/__init__.py @@ -482,7 +482,7 @@ rev = ctx.extra().get('convert_revision', '') if rev.startswith('svn:'): if name == 'svnrev': - return str(subversion.revsplit(rev)[2]) + return (b"%d" % subversion.revsplit(rev)[2]) elif name == 'svnpath': return subversion.revsplit(rev)[1] elif name == 'svnuuid': diff --git a/hgext/convert/cvs.py b/hgext/convert/cvs.py --- a/hgext/convert/cvs.py +++ b/hgext/convert/cvs.py @@ -91,7 +91,7 @@ for cs in db: if maxrev and cs.id > maxrev: break - id = str(cs.id) + id = (b"%d" % cs.id) cs.author = self.recode(cs.author) self.lastbranch[cs.branch] = id cs.comment = self.recode(cs.comment) @@ -102,13 +102,13 @@ files = {} for f in cs.entries: - files[f.file] = "%s%s" % ('.'.join([str(x) + files[f.file] = "%s%s" % ('.'.join([(b"%d" % x) for x in f.revision]), ['', '(DEAD)'][f.dead]) # add current commit to set c = commit(author=cs.author, date=date, - parents=[str(p.id) for p in cs.parents], + parents=[(b"%d" % p.id) for p in cs.parents], desc=cs.comment, branch=cs.branch or '') self.changeset[id] = c self.files[id] = files diff --git a/hgext/convert/cvsps.py b/hgext/convert/cvsps.py --- a/hgext/convert/cvsps.py +++ b/hgext/convert/cvsps.py @@ -919,7 +919,7 @@ if opts["parents"] and cs.parents: if len(cs.parents) > 1: ui.write(('Parents: %s\n' % - (','.join([str(p.id) for p in cs.parents])))) + (','.join([(b"%d" % p.id) for p in cs.parents])))) else: ui.write(('Parent: %d\n' % cs.parents[0].id)) @@ -941,18 +941,18 @@ fn = fn[len(opts["prefix"]):] ui.write('\t%s:%s->%s%s \n' % ( fn, '.'.join([str(x) for x in f.parent]) or 'INITIAL', - '.'.join([str(x) for x in f.revision]), + '.'.join([(b"%d" % x) for x in f.revision]), ['', '(DEAD)'][f.dead])) ui.write('\n') # have we seen the start tag? if revisions and off: - if revisions[0] == str(cs.id) or \ + if revisions[0] == (b"%d" % cs.id) or \ revisions[0] in cs.tags: off = False # see if we reached the end tag if len(revisions) > 1 and not off: - if revisions[1] == str(cs.id) or \ + if revisions[1] == (b"%d" % cs.id) or \ revisions[1] in cs.tags: break diff --git a/mercurial/lock.py b/mercurial/lock.py --- a/mercurial/lock.py +++ b/mercurial/lock.py @@ -348,7 +348,7 @@ if self._parentheld: lockname = self.parentlock else: - lockname = '%s:%s' % (lock._host, self.pid) + lockname = b'%s:%d' % (lock._host, self.pid) self._inherited = True try: yield lockname