##// END OF EJS Templates
histedit: fix call to _getgoal() by adding a byteskwargs() wrapper...
Augie Fackler -
r41259:32ef47b3 default
parent child Browse files
Show More
@@ -1604,7 +1604,8 b' def histedit(ui, repo, *freeargs, **opts'
1604 # kludge: _chistedit only works for starting an edit, not aborting
1604 # kludge: _chistedit only works for starting an edit, not aborting
1605 # or continuing, so fall back to regular _texthistedit for those
1605 # or continuing, so fall back to regular _texthistedit for those
1606 # operations.
1606 # operations.
1607 if ui.interface('histedit') == 'curses' and _getgoal(opts) == goalnew:
1607 if ui.interface('histedit') == 'curses' and _getgoal(
1608 pycompat.byteskwargs(opts)) == goalnew:
1608 return _chistedit(ui, repo, *freeargs, **opts)
1609 return _chistedit(ui, repo, *freeargs, **opts)
1609 return _texthistedit(ui, repo, *freeargs, **opts)
1610 return _texthistedit(ui, repo, *freeargs, **opts)
1610
1611
@@ -1621,11 +1622,11 b" goaleditplan = 'edit-plan'"
1621 goalnew = 'new'
1622 goalnew = 'new'
1622
1623
1623 def _getgoal(opts):
1624 def _getgoal(opts):
1624 if opts.get('continue'):
1625 if opts.get(b'continue'):
1625 return goalcontinue
1626 return goalcontinue
1626 if opts.get('abort'):
1627 if opts.get(b'abort'):
1627 return goalabort
1628 return goalabort
1628 if opts.get('edit_plan'):
1629 if opts.get(b'edit_plan'):
1629 return goaleditplan
1630 return goaleditplan
1630 return goalnew
1631 return goalnew
1631
1632
General Comments 0
You need to be logged in to leave comments. Login now