This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3617

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

Authored by pulkit on May 19 2018, 12:18 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG64280cd4b454: py3: use pycompat.bytestr() to convert str into bytes
Summary

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

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

pulkit created this revision.May 19 2018, 12:18 PM
Closed by commit rHG64280cd4b454: py3: use pycompat.bytestr() to convert str into bytes (authored by pulkit). · Explain WhyMay 19 2018, 3:38 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (2 lines)

Diff 8794

hgext/rebase.py

# (Or if it is run within a transaction, since the restart logic can # (Or if it is run within a transaction, since the restart logic can
# fail the entire transaction.) # fail the entire transaction.)
inmemory = False inmemory = False
if opts.get(r'auto_orphans'): if opts.get(r'auto_orphans'):
for key in opts: for key in opts:
if key != r'auto_orphans' and opts.get(key): if key != r'auto_orphans' and opts.get(key):
raise error.Abort(_('--auto-orphans is incompatible with %s') % raise error.Abort(_('--auto-orphans is incompatible with %s') %
('--' + key)) ('--' + pycompat.bytestr(key)))
userrevs = list(repo.revs(opts.get(r'auto_orphans'))) userrevs = list(repo.revs(opts.get(r'auto_orphans')))
opts[r'rev'] = [revsetlang.formatspec('%ld and orphan()', userrevs)] opts[r'rev'] = [revsetlang.formatspec('%ld and orphan()', userrevs)]
opts[r'dest'] = '_destautoorphanrebase(SRC)' opts[r'dest'] = '_destautoorphanrebase(SRC)'
if inmemory: if inmemory:
try: try:
# in-memory merge doesn't support conflicts, so if we hit any, abort # in-memory merge doesn't support conflicts, so if we hit any, abort
# and re-run as an on-disk merge. # and re-run as an on-disk merge.