Patchwork D3617: py3: use pycompat.bytestr() to convert str into bytes

login
register
mail settings
Submitter phabricator
Date May 19, 2018, 7:38 p.m.
Message ID <a84a5591c992f5ed7c4b314331c443d6@localhost.localdomain>
Download mbox | patch
Permalink /patch/31712/
State Not Applicable
Headers show

Comments

phabricator - May 19, 2018, 7:38 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG64280cd4b454: py3: use pycompat.bytestr() to convert str into bytes (authored by pulkit, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D3617?vs=8789&id=8794

REVISION DETAIL
  https://phab.mercurial-scm.org/D3617

AFFECTED FILES
  hgext/rebase.py

CHANGE DETAILS




To: pulkit, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -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)'