# HG changeset patch # User Martin von Zweigbergk # Date 1562976155 25200 # Node ID 87d3955467b4a34c4b7f6d986f9ca22df26d74c4 # Parent 8a73a8df63b680b0a04dd9bc58f3384e9d618732 py3: convert str to bytes before passing to core exception diff -r 8a73a8df63b6 -r 87d3955467b4 hgext3rd/evolve/cmdrewrite.py --- a/hgext3rd/evolve/cmdrewrite.py Wed Jul 17 11:03:09 2019 -0700 +++ b/hgext3rd/evolve/cmdrewrite.py Fri Jul 12 17:02:35 2019 -0700 @@ -1017,7 +1017,8 @@ options = [o for o in ('pair', 'fold', 'split') if opts.get(o)] if 1 < len(options): - raise error.Abort(_("can only specify one of %s") % ', '.join(options)) + _opts = pycompat.sysbytes(', '.join(options)) + raise error.Abort(_("can only specify one of %s") % _opts) if bookmarks: reachablefrombookmark = rewriteutil.reachablefrombookmark