This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7186

py3: use native strings as keys into **opts in chistedit
ClosedPublic

Authored by martinvonz on Oct 31 2019, 6:22 PM.

Details

Reviewers
durin42
indygreg
Group Reviewers
hg-reviewers
Commits
rHGde2c8722a787: py3: use native strings as keys into **opts in chistedit
rHG8d6259fd369c: py3: use native strings as keys into **opts in chistedit
rHGca1398169a73: py3: use native strings as keys into **opts in chistedit
Summary

Now you should be able to successfully confirm your histedit plan (at
least in the case I tried). Even continuing after conflicts and
finishing the histedit worked.

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.

Revision Contents
Changeset List

PathPackages
Mhgext/histedit.py (2 lines)

Diff 17462

hgext/histedit.py

ui.write(_(b"histedit aborted\n")) ui.write(_(b"histedit aborted\n"))
return 0 return 0
if type(rc) is list: if type(rc) is list:
ui.status(_(b"performing changes\n")) ui.status(_(b"performing changes\n"))
rules = makecommands(rc) rules = makecommands(rc)
with repo.vfs(b'chistedit', b'w+') as fp: with repo.vfs(b'chistedit', b'w+') as fp:
for r in rules: for r in rules:
fp.write(r) fp.write(r)
opts[b'commands'] = fp.name opts['commands'] = fp.name
return _texthistedit(ui, repo, *freeargs, **opts) return _texthistedit(ui, repo, *freeargs, **opts)
except KeyboardInterrupt: except KeyboardInterrupt:
pass pass
return -1 return -1
@command( @command(
b'histedit', b'histedit',