Show More
@@ -994,53 +994,56 b' class recordhunk(object):' | |||||
994 | def __repr__(self): |
|
994 | def __repr__(self): | |
995 | return '<hunk %r@%d>' % (self.filename(), self.fromline) |
|
995 | return '<hunk %r@%d>' % (self.filename(), self.fromline) | |
996 |
|
996 | |||
997 | messages = { |
|
997 | def getmessages(): | |
998 | 'multiple': { |
|
998 | return { | |
999 | 'discard': _("discard change %d/%d to '%s'?"), |
|
999 | 'multiple': { | |
1000 |
' |
|
1000 | 'discard': _("discard change %d/%d to '%s'?"), | |
1001 |
're |
|
1001 | 'record': _("record change %d/%d to '%s'?"), | |
1002 | }, |
|
1002 | 'revert': _("revert change %d/%d to '%s'?"), | |
1003 | 'single': { |
|
1003 | }, | |
1004 | 'discard': _("discard this change to '%s'?"), |
|
1004 | 'single': { | |
1005 |
' |
|
1005 | 'discard': _("discard this change to '%s'?"), | |
1006 |
're |
|
1006 | 'record': _("record this change to '%s'?"), | |
1007 | }, |
|
1007 | 'revert': _("revert this change to '%s'?"), | |
1008 | 'help': { |
|
1008 | }, | |
1009 | 'discard': _('[Ynesfdaq?]' |
|
1009 | 'help': { | |
1010 | '$$ &Yes, discard this change' |
|
1010 | 'discard': _('[Ynesfdaq?]' | |
1011 |
'$$ & |
|
1011 | '$$ &Yes, discard this change' | |
1012 |
'$$ & |
|
1012 | '$$ &No, skip this change' | |
1013 |
'$$ & |
|
1013 | '$$ &Edit this change manually' | |
1014 |
'$$ |
|
1014 | '$$ &Skip remaining changes to this file' | |
1015 |
'$$ |
|
1015 | '$$ Discard remaining changes to this &file' | |
1016 |
'$$ |
|
1016 | '$$ &Done, skip remaining changes and files' | |
1017 |
'$$ |
|
1017 | '$$ Discard &all changes to all remaining files' | |
1018 |
'$$ & |
|
1018 | '$$ &Quit, discarding no changes' | |
1019 | 'record': _('[Ynesfdaq?]' |
|
1019 | '$$ &? (display help)'), | |
1020 | '$$ &Yes, record this change' |
|
1020 | 'record': _('[Ynesfdaq?]' | |
1021 |
'$$ & |
|
1021 | '$$ &Yes, record this change' | |
1022 |
'$$ & |
|
1022 | '$$ &No, skip this change' | |
1023 |
'$$ & |
|
1023 | '$$ &Edit this change manually' | |
1024 |
'$$ |
|
1024 | '$$ &Skip remaining changes to this file' | |
1025 |
'$$ |
|
1025 | '$$ Record remaining changes to this &file' | |
1026 |
'$$ |
|
1026 | '$$ &Done, skip remaining changes and files' | |
1027 |
'$$ |
|
1027 | '$$ Record &all changes to all remaining files' | |
1028 |
'$$ & |
|
1028 | '$$ &Quit, recording no changes' | |
1029 | 'revert': _('[Ynesfdaq?]' |
|
1029 | '$$ &? (display help)'), | |
1030 | '$$ &Yes, revert this change' |
|
1030 | 'revert': _('[Ynesfdaq?]' | |
1031 |
'$$ & |
|
1031 | '$$ &Yes, revert this change' | |
1032 |
'$$ & |
|
1032 | '$$ &No, skip this change' | |
1033 |
'$$ & |
|
1033 | '$$ &Edit this change manually' | |
1034 |
'$$ |
|
1034 | '$$ &Skip remaining changes to this file' | |
1035 |
'$$ |
|
1035 | '$$ Revert remaining changes to this &file' | |
1036 |
'$$ |
|
1036 | '$$ &Done, skip remaining changes and files' | |
1037 |
'$$ |
|
1037 | '$$ Revert &all changes to all remaining files' | |
1038 | '$$ &? (display help)') |
|
1038 | '$$ &Quit, reverting no changes' | |
|
1039 | '$$ &? (display help)') | |||
|
1040 | } | |||
1039 | } |
|
1041 | } | |
1040 | } |
|
|||
1041 |
|
1042 | |||
1042 | def filterpatch(ui, headers, operation=None): |
|
1043 | def filterpatch(ui, headers, operation=None): | |
1043 | """Interactively filter patch chunks into applied-only chunks""" |
|
1044 | """Interactively filter patch chunks into applied-only chunks""" | |
|
1045 | messages = getmessages() | |||
|
1046 | ||||
1044 | if operation is None: |
|
1047 | if operation is None: | |
1045 | operation = 'record' |
|
1048 | operation = 'record' | |
1046 |
|
1049 |
General Comments 0
You need to be logged in to leave comments.
Login now