Mercurial > hg-stable
comparison mercurial/crecord.py @ 35091:57c79542bebb
crecord: fix revert -ir '.^' crash caused by 3649c3f2cd
3649c3f2cd (revert: do not reverse hunks in interactive when REV is not
parent (issue5096)) changed the record "operation" for the text version but
missed the curses version. Without this patch, running
`hg revert -ir '.^' --config ui.interface=curses` would crash with:
ProgrammingError: unexpected operation: apply
Differential Revision: https://phab.mercurial-scm.org/D1381
author | Jun Wu <quark@fb.com> |
---|---|
date | Mon, 13 Nov 2017 18:22:25 -0800 |
parents | 6e6452bc441d |
children | f43dc62cfe11 |
comparison
equal
deleted
inserted
replaced
35090:929858db4d22 | 35091:57c79542bebb |
---|---|
553 if chunkselector.handlekeypressed(testcommands.pop(0), test=True): | 553 if chunkselector.handlekeypressed(testcommands.pop(0), test=True): |
554 break | 554 break |
555 return chunkselector.opts | 555 return chunkselector.opts |
556 | 556 |
557 _headermessages = { # {operation: text} | 557 _headermessages = { # {operation: text} |
558 'revert': _('Select hunks to revert'), | 558 'apply': _('Select hunks to apply'), |
559 'discard': _('Select hunks to discard'), | 559 'discard': _('Select hunks to discard'), |
560 None: _('Select hunks to record'), | 560 None: _('Select hunks to record'), |
561 } | 561 } |
562 | 562 |
563 class curseschunkselector(object): | 563 class curseschunkselector(object): |