durin42 created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers.
REVISION 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. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5585 AFFECTED FILES hgext/histedit.py CHANGE DETAILS diff --git a/hgext/histedit.py b/hgext/histedit.py --- a/hgext/histedit.py +++ b/hgext/histedit.py @@ -1604,7 +1604,8 @@ # 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: + if ui.interface('histedit') == 'curses' and _getgoal( + pycompat.byteskwargs(opts)) == goalnew: return _chistedit(ui, repo, *freeargs, **opts) return _texthistedit(ui, repo, *freeargs, **opts) @@ -1621,11 +1622,11 @@ goalnew = 'new' def _getgoal(opts): - if opts.get('continue'): + if opts.get(b'continue'): return goalcontinue - if opts.get('abort'): + if opts.get(b'abort'): return goalabort - if opts.get('edit_plan'): + if opts.get(b'edit_plan'): return goaleditplan return goalnew To: durin42, #hg-reviewers Cc: mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel