This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7185

py3: open chistedit file in binary mode using vfs
ClosedPublic

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

Details

Reviewers
durin42
indygreg
Group Reviewers
hg-reviewers
Commits
rHG66a0c5faed1e: py3: open chistedit file in binary mode using vfs
rHGa8ca8b4cc632: py3: open chistedit file in binary mode using vfs
rHG093b85e2db05: py3: open chistedit file in binary mode using vfs
Summary

We write bytes to the file, so it should be open in binary
mode. Opening it via the vfs takes care of that for us.

Now you'll get yet a different traceback if you try to confirm you
histedit plan.

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 (5 lines)

Diff 17461

hgext/histedit.py

curses.echo() curses.echo()
curses.endwin() curses.endwin()
if rc is False: if rc is False:
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)
filename = repo.vfs.join(b'chistedit') with repo.vfs(b'chistedit', b'w+') as fp:
with open(filename, b'w+') as fp:
for r in rules: for r in rules:
fp.write(r) fp.write(r)
opts[b'commands'] = filename opts[b'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',