This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3853

py3: convert opts keys to bytes using pycompat.byteskwargs()
ClosedPublic

Authored by pulkit on Jun 28 2018, 1:38 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG2394cd58b81f: py3: convert opts keys to bytes using pycompat.byteskwargs()
Summary

This fixes the py3 build broken due to
56b2074114b19e12abd9cd4c378d58b702232705.

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.Jun 28 2018, 1:38 PM
Closed by commit rHG2394cd58b81f: py3: convert opts keys to bytes using pycompat.byteskwargs() (authored by pulkit). · Explain WhyJun 29 2018, 8:31 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/rebase.py (2 lines)

Diff 9352

hgext/rebase.py

('--' + pycompat.bytestr(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 dryrun: if dryrun:
leaveunfinished = True leaveunfinished = True
inmemory = True inmemory = True
rbsrt = rebaseruntime(repo, ui, inmemory, opts) rbsrt = rebaseruntime(repo, ui, inmemory, pycompat.byteskwargs(opts))
try: try:
overrides = {('rebase', 'singletransaction'): True} overrides = {('rebase', 'singletransaction'): True}
with ui.configoverride(overrides, 'rebase'): with ui.configoverride(overrides, 'rebase'):
_origrebase(ui, repo, inmemory=True, rbsrt=rbsrt, _origrebase(ui, repo, inmemory=True, rbsrt=rbsrt,
leaveunfinished=leaveunfinished, **opts) leaveunfinished=leaveunfinished, **opts)
except error.InMemoryMergeConflictsError: except error.InMemoryMergeConflictsError:
ui.status(_('hit a merge conflict\n')) ui.status(_('hit a merge conflict\n'))
return 1 return 1