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

pulkit (Pulkit Goyal) phabricator at mercurial-scm.org
Sat May 19 15:38:50 EDT 2018


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

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)'



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


More information about the Mercurial-devel mailing list