diff --git a/hgext/gpg.py b/hgext/gpg.py --- a/hgext/gpg.py +++ b/hgext/gpg.py @@ -318,7 +318,7 @@ repo.commit(message, opts['user'], opts['date'], match=msigs, editor=editor) except ValueError as inst: - raise error.Abort(str(inst)) + raise error.Abort(pycompat.bytestr(inst)) def node2txt(repo, node, ver): """map a manifest into some text""" diff --git a/hgext/journal.py b/hgext/journal.py --- a/hgext/journal.py +++ b/hgext/journal.py @@ -508,7 +508,7 @@ ctx = repo[hash] displayer.show(ctx) except error.RepoLookupError as e: - fm.write('repolookuperror', "%s\n\n", str(e)) + fm.write('repolookuperror', "%s\n\n", pycompat.bytestr(e)) displayer.close() fm.end() diff --git a/hgext/largefiles/overrides.py b/hgext/largefiles/overrides.py --- a/hgext/largefiles/overrides.py +++ b/hgext/largefiles/overrides.py @@ -598,7 +598,7 @@ try: result = orig(ui, repo, pats, opts, rename) except error.Abort as e: - if str(e) != _('no files to copy'): + if pycompat.bytestr(e) != _('no files to copy'): raise e else: nonormalfiles = True @@ -705,7 +705,7 @@ lfdirstate.add(destlfile) lfdirstate.write() except error.Abort as e: - if str(e) != _('no files to copy'): + if pycompat.bytestr(e) != _('no files to copy'): raise e else: nolfiles = True