author | Martin von Zweigbergk <martinvonz@google.com> |
Fri, 12 Jul 2019 17:02:35 -0700 | |
changeset 4753 | 87d3955467b4 |
parent 4752 | 8a73a8df63b6 |
child 4754 | 75307f276a79 |
--- 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