This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5585

histedit: fix call to _getgoal() by adding a byteskwargs() wrapper
ClosedPublic

Authored by durin42 on Jan 14 2019, 10:19 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG32ef47b3c91c: histedit: fix call to _getgoal() by adding a byteskwargs() wrapper
Summary

I also added some b-prefixes while I was here because I got confused
and it seems silly to not just add them since it clarifies the whole
change.

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

durin42 created this revision.Jan 14 2019, 10:19 PM
martinvonz added a subscriber: martinvonz.Jan 15 2019, 12:34 AM

Just for my understanding, this is just a py3 thing, right? Or is it somehow broken with py2 as well?

durin42 added a comment.Jan 15 2019, 8:07 AM

Yes just a py3 fix.

Closed by commit rHG32ef47b3c91c: histedit: fix call to _getgoal() by adding a byteskwargs() wrapper (authored by durin42). · Explain WhyJan 15 2019, 11:24 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/histedit.py (9 lines)

Diff 13221

hgext/histedit.py

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).
""" """
# 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 ui.interface('histedit') == 'curses' and _getgoal(opts) == goalnew: if ui.interface('histedit') == 'curses' and _getgoal(
pycompat.byteskwargs(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 = 'continue' goalcontinue = 'continue'
goalabort = 'abort' goalabort = 'abort'
goaleditplan = 'edit-plan' goaleditplan = 'edit-plan'
goalnew = 'new' goalnew = 'new'
def _getgoal(opts): def _getgoal(opts):
if opts.get('continue'): if opts.get(b'continue'):
return goalcontinue return goalcontinue
if opts.get('abort'): if opts.get(b'abort'):
return goalabort return goalabort
if opts.get('edit_plan'): if opts.get(b'edit_plan'):
return goaleditplan return goaleditplan
return goalnew return goalnew
def _readfile(ui, path): def _readfile(ui, path):
if path == '-': if path == '-':
with ui.timeblockedsection('histedit'): with ui.timeblockedsection('histedit'):
return ui.fin.read() return ui.fin.read()
else: else: