990 'single': { |
990 'single': { |
991 'discard': _("discard this change to '%s'?"), |
991 'discard': _("discard this change to '%s'?"), |
992 'record': _("record this change to '%s'?"), |
992 'record': _("record this change to '%s'?"), |
993 'revert': _("revert this change to '%s'?"), |
993 'revert': _("revert this change to '%s'?"), |
994 }[operation], |
994 }[operation], |
|
995 'help': { |
|
996 'discard': _('[Ynesfdaq?]' |
|
997 '$$ &Yes, discard this change' |
|
998 '$$ &No, skip this change' |
|
999 '$$ &Edit this change manually' |
|
1000 '$$ &Skip remaining changes to this file' |
|
1001 '$$ Discard remaining changes to this &file' |
|
1002 '$$ &Done, skip remaining changes and files' |
|
1003 '$$ Discard &all changes to all remaining files' |
|
1004 '$$ &Quit, discarding no changes' |
|
1005 '$$ &? (display help)'), |
|
1006 'record': _('[Ynesfdaq?]' |
|
1007 '$$ &Yes, record this change' |
|
1008 '$$ &No, skip this change' |
|
1009 '$$ &Edit this change manually' |
|
1010 '$$ &Skip remaining changes to this file' |
|
1011 '$$ Record remaining changes to this &file' |
|
1012 '$$ &Done, skip remaining changes and files' |
|
1013 '$$ Record &all changes to all remaining files' |
|
1014 '$$ &Quit, recording no changes' |
|
1015 '$$ &? (display help)'), |
|
1016 'revert': _('[Ynesfdaq?]' |
|
1017 '$$ &Yes, revert this change' |
|
1018 '$$ &No, skip this change' |
|
1019 '$$ &Edit this change manually' |
|
1020 '$$ &Skip remaining changes to this file' |
|
1021 '$$ Revert remaining changes to this &file' |
|
1022 '$$ &Done, skip remaining changes and files' |
|
1023 '$$ Revert &all changes to all remaining files' |
|
1024 '$$ &Quit, reverting no changes' |
|
1025 '$$ &? (display help)') |
|
1026 }[operation] |
995 } |
1027 } |
996 |
1028 |
997 def prompt(skipfile, skipall, query, chunk): |
1029 def prompt(skipfile, skipall, query, chunk): |
998 """prompt query, and process base inputs |
1030 """prompt query, and process base inputs |
999 |
1031 |
1008 if skipall is not None: |
1040 if skipall is not None: |
1009 return skipall, skipfile, skipall, newpatches |
1041 return skipall, skipfile, skipall, newpatches |
1010 if skipfile is not None: |
1042 if skipfile is not None: |
1011 return skipfile, skipfile, skipall, newpatches |
1043 return skipfile, skipfile, skipall, newpatches |
1012 while True: |
1044 while True: |
1013 resps = _('[Ynesfdaq?]' |
1045 resps = messages['help'] |
1014 '$$ &Yes, record this change' |
|
1015 '$$ &No, skip this change' |
|
1016 '$$ &Edit this change manually' |
|
1017 '$$ &Skip remaining changes to this file' |
|
1018 '$$ Record remaining changes to this &file' |
|
1019 '$$ &Done, skip remaining changes and files' |
|
1020 '$$ Record &all changes to all remaining files' |
|
1021 '$$ &Quit, recording no changes' |
|
1022 '$$ &? (display help)') |
|
1023 r = ui.promptchoice("%s %s" % (query, resps)) |
1046 r = ui.promptchoice("%s %s" % (query, resps)) |
1024 ui.write("\n") |
1047 ui.write("\n") |
1025 if r == 8: # ? |
1048 if r == 8: # ? |
1026 for c, t in ui.extractchoices(resps)[1]: |
1049 for c, t in ui.extractchoices(resps)[1]: |
1027 ui.write('%s - %s\n' % (c, encoding.lower(t))) |
1050 ui.write('%s - %s\n' % (c, encoding.lower(t))) |