2929 logopts = [ |
2929 logopts = [ |
2930 ('p', 'patch', None, _('show patch')), |
2930 ('p', 'patch', None, _('show patch')), |
2931 ('l', 'limit', '', _('limit number of changes displayed')), |
2931 ('l', 'limit', '', _('limit number of changes displayed')), |
2932 ('M', 'no-merges', None, _('do not show merges')), |
2932 ('M', 'no-merges', None, _('do not show merges')), |
2933 ] + templateopts |
2933 ] + templateopts |
|
2934 |
|
2935 diffopts = [ |
|
2936 ('a', 'text', None, _('treat all files as text')), |
|
2937 ('g', 'git', None, _('use git extended diff format')), |
|
2938 ('', 'nodates', None, _("don't include dates in diff headers")) |
|
2939 ] |
|
2940 |
|
2941 diffopts2 = [ |
|
2942 ('p', 'show-function', None, _('show which function each change is in')), |
|
2943 ('w', 'ignore-all-space', None, |
|
2944 _('ignore white space when comparing lines')), |
|
2945 ('b', 'ignore-space-change', None, |
|
2946 _('ignore changes in the amount of white space')), |
|
2947 ('B', 'ignore-blank-lines', None, |
|
2948 _('ignore changes whose lines are all blank')), |
|
2949 ('U', 'unified', '', _('number of lines of context to show')) |
|
2950 ] |
2934 |
2951 |
2935 table = { |
2952 table = { |
2936 "^add": (add, walkopts + dryrunopts, _('hg add [OPTION]... [FILE]...')), |
2953 "^add": (add, walkopts + dryrunopts, _('hg add [OPTION]... [FILE]...')), |
2937 "addremove": |
2954 "addremove": |
2938 (addremove, |
2955 (addremove, |
3069 [('', 'nodates', None, _('do not display the saved mtime'))], |
3086 [('', 'nodates', None, _('do not display the saved mtime'))], |
3070 _('hg debugstate [OPTS]')), |
3087 _('hg debugstate [OPTS]')), |
3071 "debugwalk": (debugwalk, walkopts, _('hg debugwalk [OPTION]... [FILE]...')), |
3088 "debugwalk": (debugwalk, walkopts, _('hg debugwalk [OPTION]... [FILE]...')), |
3072 "^diff": |
3089 "^diff": |
3073 (diff, |
3090 (diff, |
3074 [('r', 'rev', [], _('revision')), |
3091 [('r', 'rev', [], _('revision')) |
3075 ('a', 'text', None, _('treat all files as text')), |
3092 ] + diffopts + diffopts2 + walkopts, |
3076 ('p', 'show-function', None, |
|
3077 _('show which function each change is in')), |
|
3078 ('g', 'git', None, _('use git extended diff format')), |
|
3079 ('', 'nodates', None, _("don't include dates in diff headers")), |
|
3080 ('w', 'ignore-all-space', None, |
|
3081 _('ignore white space when comparing lines')), |
|
3082 ('b', 'ignore-space-change', None, |
|
3083 _('ignore changes in the amount of white space')), |
|
3084 ('B', 'ignore-blank-lines', None, |
|
3085 _('ignore changes whose lines are all blank')), |
|
3086 ('U', 'unified', '', |
|
3087 _('number of lines of context to show')) |
|
3088 ] + walkopts, |
|
3089 _('hg diff [OPTION]... [-r REV1 [-r REV2]] [FILE]...')), |
3093 _('hg diff [OPTION]... [-r REV1 [-r REV2]] [FILE]...')), |
3090 "^export": |
3094 "^export": |
3091 (export, |
3095 (export, |
3092 [('o', 'output', '', _('print output to file with formatted name')), |
3096 [('o', 'output', '', _('print output to file with formatted name')), |
3093 ('a', 'text', None, _('treat all files as text')), |
3097 ('', 'switch-parent', None, _('diff against the second parent')) |
3094 ('g', 'git', None, _('use git extended diff format')), |
3098 ] + diffopts, |
3095 ('', 'nodates', None, _("don't include dates in diff headers")), |
|
3096 ('', 'switch-parent', None, _('diff against the second parent'))], |
|
3097 _('hg export [OPTION]... [-o OUTFILESPEC] REV...')), |
3099 _('hg export [OPTION]... [-o OUTFILESPEC] REV...')), |
3098 "grep": |
3100 "grep": |
3099 (grep, |
3101 (grep, |
3100 [('0', 'print0', None, _('end fields with NUL')), |
3102 [('0', 'print0', None, _('end fields with NUL')), |
3101 ('', 'all', None, _('print all revisions that match')), |
3103 ('', 'all', None, _('print all revisions that match')), |