Mercurial > evolve

changeset 4753:87d3955467b4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: convert str to bytes before passing to core exception
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 12 Jul 2019 17:02:35 -0700
parents 8a73a8df63b6
children 75307f276a79
files hgext3rd/evolve/cmdrewrite.py
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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