comparison hgext/histedit.py @ 41223:32ef47b3c91c

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

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.

Differential Revision: https://phab.mercurial-scm.org/D5585

41222:8aca89a694d4

    conflicts).
    """
    # kludge: _chistedit only works for starting an edit, not aborting
    # or continuing, so fall back to regular _texthistedit for those
    # operations.
    if ui.interface('histedit') == 'curses' and  _getgoal(opts) == goalnew:
        return _chistedit(ui, repo, *freeargs, **opts)
    return _texthistedit(ui, repo, *freeargs, **opts)

def _texthistedit(ui, repo, *freeargs, **opts):
    state = histeditstate(repo)

goalabort = 'abort'
goaleditplan = 'edit-plan'
goalnew = 'new'

def _getgoal(opts):
    if opts.get('continue'):
        return goalcontinue
    if opts.get('abort'):
        return goalabort
    if opts.get('edit_plan'):
        return goaleditplan
    return goalnew

def _readfile(ui, path):
    if path == '-':

41223:32ef47b3c91c

    conflicts).
    """
    # kludge: _chistedit only works for starting an edit, not aborting
    # or continuing, so fall back to regular _texthistedit for those
    # operations.
    if ui.interface('histedit') == 'curses' and  _getgoal(
            pycompat.byteskwargs(opts)) == goalnew:
        return _chistedit(ui, repo, *freeargs, **opts)
    return _texthistedit(ui, repo, *freeargs, **opts)

def _texthistedit(ui, repo, *freeargs, **opts):
    state = histeditstate(repo)

goalabort = 'abort'
goaleditplan = 'edit-plan'
goalnew = 'new'

def _getgoal(opts):
    if opts.get(b'continue'):
        return goalcontinue
    if opts.get(b'abort'):
        return goalabort
    if opts.get(b'edit_plan'):
        return goaleditplan
    return goalnew

def _readfile(ui, path):
    if path == '-':