# HG changeset patch
# User Pulkit Goyal <7895pulkit@gmail.com>
# Date 1526746679 -19800
# Node ID 64280cd4b454dc300c8158f8d465df2dd029b40d
# Parent  46e8abc4eb041505919a30ee6dcdab2db546f5c4
py3: use pycompat.bytestr() to convert str into bytes

the keys of opts are str here, so we have to convert it to bytes before passing
into error.Abort()

Differential Revision: https://phab.mercurial-scm.org/D3617

diff -r 46e8abc4eb04 -r 64280cd4b454 hgext/rebase.py
--- a/hgext/rebase.py	Sat May 19 21:46:54 2018 +0530
+++ b/hgext/rebase.py	Sat May 19 21:47:59 2018 +0530
@@ -809,7 +809,7 @@
         for key in opts:
             if key != r'auto_orphans' and opts.get(key):
                 raise error.Abort(_('--auto-orphans is incompatible with %s') %
-                                  ('--' + key))
+                                  ('--' + pycompat.bytestr(key)))
         userrevs = list(repo.revs(opts.get(r'auto_orphans')))
         opts[r'rev'] = [revsetlang.formatspec('%ld and orphan()', userrevs)]
         opts[r'dest'] = '_destautoorphanrebase(SRC)'