Mercurial > public > mercurial-scm > hg
diff hgext/histedit.py @ 41175:9bc7ec924234
histedit: fix --continue and --abort when curses is enabled
I overlooked this when I did the initial import.
Differential Revision: https://phab.mercurial-scm.org/D5540
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Wed, 09 Jan 2019 18:00:20 -0500 |
| parents | 9365b8cb90e0 |
| children | 99125b7fb93e |
line wrap: on
line diff
--- a/hgext/histedit.py Thu Jan 10 21:57:21 2019 +0900 +++ b/hgext/histedit.py Wed Jan 09 18:00:20 2019 -0500 @@ -1593,7 +1593,10 @@ for intentional "edit" command, but also for resolving unexpected conflicts). """ - if ui.interface('histedit') == 'curses': + # 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)