This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8150

histedit: py3 fixes for curses mode
ClosedPublic

Authored by sfink on Feb 25 2020, 4:32 PM.

Details

Reviewers
durin42
pulkit
Group Reviewers
hg-reviewers
Commits
rHG9b8e13a038db: histedit: py3 fixes for curses mode

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

sfink created this revision.Feb 25 2020, 4:32 PM
sfink added a comment.Feb 25 2020, 4:37 PM

Maybe this should be in the patch comment, but justification for the change:

_chistedit is looking for bytestr opt keys, but is getting string keys. Normally, I'd use pycompat.byteskwargs at the top, except that _texthistedit is called at the bottom and it's expecting to see str keys initially (before it fixes them up). So I canonicalize in the caller (that chooses between an initial _chistedit or _texthistedit), except that it's passing the opts with **opts and Python requires keywords to be str. So I stop splatting the args and opts.

I wasn't involved in the py3 port, but it does seem weird to me that strings are forced to be bytes everywhere. That makes sense for everything read out of a repo, but it seems like the command line should think in strings for both keys and non-path values. But I'm sure there were some hard decisions to make.

pulkit accepted this revision.Mar 2 2020, 8:02 AM
This revision is now accepted and ready to land.Mar 2 2020, 8:02 AM

Revision Contents
Changeset List

PathPackages
Mhgext/histedit.py (25 lines)

Diff 20417

hgext/histedit.py

renderhelp(helpwin, state) renderhelp(helpwin, state)
curses.doupdate() curses.doupdate()
# done rendering # done rendering
ch = encoding.strtolocal(stdscr.getkey()) ch = encoding.strtolocal(stdscr.getkey())
except curses.error: except curses.error:
pass pass
def _chistedit(ui, repo, *freeargs, **opts): def _chistedit(ui, repo, freeargs, opts):
"""interactively edit changeset history via a curses interface """interactively edit changeset history via a curses interface
Provides a ncurses interface to histedit. Press ? in chistedit mode Provides a ncurses interface to histedit. Press ? in chistedit mode
to see an extensive help. Requires python-curses to be installed.""" to see an extensive help. Requires python-curses to be installed."""
if curses is None: if curses is None:
raise error.Abort(_(b"Python curses library required")) raise error.Abort(_(b"Python curses library required"))
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['commands'] = fp.name 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',
[ [
pick 8ef592ce7cc4 4 Bedazzle the zerlog pick 8ef592ce7cc4 4 Bedazzle the zerlog
pick 5339bf82f0ca 3 Zworgle the foobar pick 5339bf82f0ca 3 Zworgle the foobar
pick 252a1af424ad 2 Blorb a morgwazzle pick 252a1af424ad 2 Blorb a morgwazzle
Returns 0 on success, 1 if user intervention is required (not only Returns 0 on success, 1 if user intervention is required (not only
for intentional "edit" command, but also for resolving unexpected for intentional "edit" command, but also for resolving unexpected
conflicts). conflicts).
""" """
opts = pycompat.byteskwargs(opts)
# kludge: _chistedit only works for starting an edit, not aborting # kludge: _chistedit only works for starting an edit, not aborting
# or continuing, so fall back to regular _texthistedit for those # or continuing, so fall back to regular _texthistedit for those
# operations. # operations.
if ( if (
ui.interface(b'histedit') == b'curses' ui.interface(b'histedit') == b'curses'
and _getgoal(pycompat.byteskwargs(opts)) == goalnew and _getgoal(opts) == goalnew
): ):
return _chistedit(ui, repo, *freeargs, **opts) return _chistedit(ui, repo, freeargs, opts)
return _texthistedit(ui, repo, *freeargs, **opts) return _texthistedit(ui, repo, freeargs, opts)
def _texthistedit(ui, repo, *freeargs, **opts): def _texthistedit(ui, repo, freeargs, opts):
state = histeditstate(repo) state = histeditstate(repo)
with repo.wlock() as wlock, repo.lock() as lock: with repo.wlock() as wlock, repo.lock() as lock:
state.wlock = wlock state.wlock = wlock
state.lock = lock state.lock = lock
_histedit(ui, repo, state, *freeargs, **opts) _histedit(ui, repo, state, freeargs, opts)
goalcontinue = b'continue' goalcontinue = b'continue'
goalabort = b'abort' goalabort = b'abort'
goaleditplan = b'edit-plan' goaleditplan = b'edit-plan'
goalnew = b'new' goalnew = b'new'
revs.append(defaultrev) revs.append(defaultrev)
if len(revs) != 1: if len(revs) != 1:
raise error.Abort( raise error.Abort(
_(b'histedit requires exactly one ancestor revision') _(b'histedit requires exactly one ancestor revision')
) )
def _histedit(ui, repo, state, *freeargs, **opts): def _histedit(ui, repo, state, freeargs, opts):
opts = pycompat.byteskwargs(opts)
fm = ui.formatter(b'histedit', opts) fm = ui.formatter(b'histedit', opts)
fm.startitem() fm.startitem()
goal = _getgoal(opts) goal = _getgoal(opts)
revs = opts.get(b'rev', []) revs = opts.get(b'rev', [])
nobackup = not ui.configbool(b'rewrite', b'backup-bundle') nobackup = not ui.configbool(b'rewrite', b'backup-bundle')
rules = opts.get(b'commands', b'') rules = opts.get(b'commands', b'')
state.keep = opts.get(b'keep', False) state.keep = opts.get(b'keep', False)