Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/commands.py @ 3885:6081b4c68baf
Corrected synopsis for many commands.
Use CMD instead of FILE for -e and --remotecmd (thanks, Neal Becker)
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Thu, 14 Dec 2006 19:30:18 +0100 |
parents | 46abbed02b2d |
children | 57b797601b61 2b3175acb653 |
comparison
equal
deleted
inserted
replaced
3884:daa42bac8611 | 3885:6081b4c68baf |
---|---|
2608 ('u', 'user', None, _('list the author')), | 2608 ('u', 'user', None, _('list the author')), |
2609 ('d', 'date', None, _('list the date')), | 2609 ('d', 'date', None, _('list the date')), |
2610 ('n', 'number', None, _('list the revision number (default)')), | 2610 ('n', 'number', None, _('list the revision number (default)')), |
2611 ('c', 'changeset', None, _('list the changeset')), | 2611 ('c', 'changeset', None, _('list the changeset')), |
2612 ] + walkopts, | 2612 ] + walkopts, |
2613 _('hg annotate [-r REV] [-a] [-u] [-d] [-n] [-c] FILE...')), | 2613 _('hg annotate [-r REV] [-f] [-a] [-u] [-d] [-n] [-c] FILE...')), |
2614 "archive": | 2614 "archive": |
2615 (archive, | 2615 (archive, |
2616 [('', 'no-decode', None, _('do not pass files through decoders')), | 2616 [('', 'no-decode', None, _('do not pass files through decoders')), |
2617 ('p', 'prefix', '', _('directory prefix for files in archive')), | 2617 ('p', 'prefix', '', _('directory prefix for files in archive')), |
2618 ('r', 'rev', '', _('revision to distribute')), | 2618 ('r', 'rev', '', _('revision to distribute')), |
2637 ('r', 'rev', [], | 2637 ('r', 'rev', [], |
2638 _('a changeset you would like to bundle')), | 2638 _('a changeset you would like to bundle')), |
2639 ('', 'base', [], | 2639 ('', 'base', [], |
2640 _('a base changeset to specify instead of a destination')), | 2640 _('a base changeset to specify instead of a destination')), |
2641 ] + remoteopts, | 2641 ] + remoteopts, |
2642 _('hg bundle [--base REV]... [--rev REV]... FILE [DEST]')), | 2642 _('hg bundle [-f] [-r REV]... [--base REV]... FILE [DEST]')), |
2643 "cat": | 2643 "cat": |
2644 (cat, | 2644 (cat, |
2645 [('o', 'output', '', _('print output to file with formatted name')), | 2645 [('o', 'output', '', _('print output to file with formatted name')), |
2646 ('r', 'rev', '', _('print the given revision')), | 2646 ('r', 'rev', '', _('print the given revision')), |
2647 ] + walkopts, | 2647 ] + walkopts, |
2706 ('b', 'ignore-space-change', None, | 2706 ('b', 'ignore-space-change', None, |
2707 _('ignore changes in the amount of white space')), | 2707 _('ignore changes in the amount of white space')), |
2708 ('B', 'ignore-blank-lines', None, | 2708 ('B', 'ignore-blank-lines', None, |
2709 _('ignore changes whose lines are all blank')), | 2709 _('ignore changes whose lines are all blank')), |
2710 ] + walkopts, | 2710 ] + walkopts, |
2711 _('hg diff [-a] [-I] [-X] [-r REV1 [-r REV2]] [FILE]...')), | 2711 _('hg diff [OPTION]... [-r REV1 [-r REV2]] [FILE]...')), |
2712 "^export": | 2712 "^export": |
2713 (export, | 2713 (export, |
2714 [('o', 'output', '', _('print output to file with formatted name')), | 2714 [('o', 'output', '', _('print output to file with formatted name')), |
2715 ('a', 'text', None, _('treat all files as text')), | 2715 ('a', 'text', None, _('treat all files as text')), |
2716 ('g', 'git', None, _('use git extended diff format')), | 2716 ('g', 'git', None, _('use git extended diff format')), |
2717 ('', 'nodates', None, _("don't include dates in diff headers")), | 2717 ('', 'nodates', None, _("don't include dates in diff headers")), |
2718 ('', 'switch-parent', None, _('diff against the second parent'))], | 2718 ('', 'switch-parent', None, _('diff against the second parent'))], |
2719 _('hg export [-a] [-o OUTFILESPEC] REV...')), | 2719 _('hg export [OPTION]... [-o OUTFILESPEC] REV...')), |
2720 "grep": | 2720 "grep": |
2721 (grep, | 2721 (grep, |
2722 [('0', 'print0', None, _('end fields with NUL')), | 2722 [('0', 'print0', None, _('end fields with NUL')), |
2723 ('', 'all', None, _('print all revisions that match')), | 2723 ('', 'all', None, _('print all revisions that match')), |
2724 ('f', 'follow', None, | 2724 ('f', 'follow', None, |
2758 ('', 'bundle', '', _('file to store the bundles into')), | 2758 ('', 'bundle', '', _('file to store the bundles into')), |
2759 ('p', 'patch', None, _('show patch')), | 2759 ('p', 'patch', None, _('show patch')), |
2760 ('r', 'rev', [], _('a specific revision up to which you would like to pull')), | 2760 ('r', 'rev', [], _('a specific revision up to which you would like to pull')), |
2761 ('', 'template', '', _('display with template')), | 2761 ('', 'template', '', _('display with template')), |
2762 ] + remoteopts, | 2762 ] + remoteopts, |
2763 _('hg incoming [-p] [-n] [-M] [-r REV]...' | 2763 _('hg incoming [-p] [-n] [-M] [-f] [-r REV]...' |
2764 ' [--bundle FILENAME] [SOURCE]')), | 2764 ' [--bundle FILENAME] [SOURCE]')), |
2765 "^init": | 2765 "^init": |
2766 (init, remoteopts, _('hg init [-e FILE] [--remotecmd FILE] [DEST]')), | 2766 (init, |
2767 remoteopts, | |
2768 _('hg init [-e CMD] [--remotecmd CMD] [DEST]')), | |
2767 "locate": | 2769 "locate": |
2768 (locate, | 2770 (locate, |
2769 [('r', 'rev', '', _('search the repository as it stood at rev')), | 2771 [('r', 'rev', '', _('search the repository as it stood at rev')), |
2770 ('0', 'print0', None, | 2772 ('0', 'print0', None, |
2771 _('end filenames with NUL, for use with xargs')), | 2773 _('end filenames with NUL, for use with xargs')), |
2808 ('', 'style', '', _('display using template map file')), | 2810 ('', 'style', '', _('display using template map file')), |
2809 ('r', 'rev', [], _('a specific revision you would like to push')), | 2811 ('r', 'rev', [], _('a specific revision you would like to push')), |
2810 ('n', 'newest-first', None, _('show newest record first')), | 2812 ('n', 'newest-first', None, _('show newest record first')), |
2811 ('', 'template', '', _('display with template')), | 2813 ('', 'template', '', _('display with template')), |
2812 ] + remoteopts, | 2814 ] + remoteopts, |
2813 _('hg outgoing [-M] [-p] [-n] [-r REV]... [DEST]')), | 2815 _('hg outgoing [-M] [-p] [-n] [-f] [-r REV]... [DEST]')), |
2814 "^parents": | 2816 "^parents": |
2815 (parents, | 2817 (parents, |
2816 [('b', 'branches', None, _('show branches (DEPRECATED)')), | 2818 [('b', 'branches', None, _('show branches (DEPRECATED)')), |
2817 ('r', 'rev', '', _('show parents from the specified rev')), | 2819 ('r', 'rev', '', _('show parents from the specified rev')), |
2818 ('', 'style', '', _('display using template map file')), | 2820 ('', 'style', '', _('display using template map file')), |
2823 (pull, | 2825 (pull, |
2824 [('u', 'update', None, | 2826 [('u', 'update', None, |
2825 _('update to new tip if changesets were pulled')), | 2827 _('update to new tip if changesets were pulled')), |
2826 ('f', 'force', None, | 2828 ('f', 'force', None, |
2827 _('run even when remote repository is unrelated')), | 2829 _('run even when remote repository is unrelated')), |
2828 ('r', 'rev', [], _('a specific revision up to which you would like to pull')), | 2830 ('r', 'rev', [], |
2831 _('a specific revision up to which you would like to pull')), | |
2829 ] + remoteopts, | 2832 ] + remoteopts, |
2830 _('hg pull [-u] [-r REV]... [-e FILE] [--remotecmd FILE] [SOURCE]')), | 2833 _('hg pull [-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]')), |
2831 "^push": | 2834 "^push": |
2832 (push, | 2835 (push, |
2833 [('f', 'force', None, _('force push')), | 2836 [('f', 'force', None, _('force push')), |
2834 ('r', 'rev', [], _('a specific revision you would like to push')), | 2837 ('r', 'rev', [], _('a specific revision you would like to push')), |
2835 ] + remoteopts, | 2838 ] + remoteopts, |
2836 _('hg push [-f] [-r REV]... [-e FILE] [--remotecmd FILE] [DEST]')), | 2839 _('hg push [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]')), |
2837 "debugrawcommit|rawcommit": | 2840 "debugrawcommit|rawcommit": |
2838 (rawcommit, | 2841 (rawcommit, |
2839 [('p', 'parent', [], _('parent')), | 2842 [('p', 'parent', [], _('parent')), |
2840 ('d', 'date', '', _('date code')), | 2843 ('d', 'date', '', _('date code')), |
2841 ('u', 'user', '', _('user')), | 2844 ('u', 'user', '', _('user')), |
2861 [('a', 'all', None, _('revert all changes when no arguments given')), | 2864 [('a', 'all', None, _('revert all changes when no arguments given')), |
2862 ('d', 'date', '', _('tipmost revision matching date')), | 2865 ('d', 'date', '', _('tipmost revision matching date')), |
2863 ('r', 'rev', '', _('revision to revert to')), | 2866 ('r', 'rev', '', _('revision to revert to')), |
2864 ('', 'no-backup', None, _('do not save backup copies of files')), | 2867 ('', 'no-backup', None, _('do not save backup copies of files')), |
2865 ] + walkopts + dryrunopts, | 2868 ] + walkopts + dryrunopts, |
2866 _('hg revert [-r REV] [NAME]...')), | 2869 _('hg revert [OPTION]... [-r REV] [NAME]...')), |
2867 "rollback": (rollback, [], _('hg rollback')), | 2870 "rollback": (rollback, [], _('hg rollback')), |
2868 "root": (root, [], _('hg root')), | 2871 "root": (root, [], _('hg root')), |
2869 "showconfig|debugconfig": | 2872 "showconfig|debugconfig": |
2870 (showconfig, | 2873 (showconfig, |
2871 [('u', 'untrusted', None, _('show untrusted configuration options'))], | 2874 [('u', 'untrusted', None, _('show untrusted configuration options'))], |
2930 (update, | 2933 (update, |
2931 [('b', 'branch', '', | 2934 [('b', 'branch', '', |
2932 _('checkout the head of a specific branch (DEPRECATED)')), | 2935 _('checkout the head of a specific branch (DEPRECATED)')), |
2933 ('C', 'clean', None, _('overwrite locally modified files')), | 2936 ('C', 'clean', None, _('overwrite locally modified files')), |
2934 ('d', 'date', '', _('tipmost revision matching date'))], | 2937 ('d', 'date', '', _('tipmost revision matching date'))], |
2935 _('hg update [-C] [REV]')), | 2938 _('hg update [-C] [-d DATE] [REV]')), |
2936 "verify": (verify, [], _('hg verify')), | 2939 "verify": (verify, [], _('hg verify')), |
2937 "version": (version_, [], _('hg version')), | 2940 "version": (version_, [], _('hg version')), |
2938 } | 2941 } |
2939 | 2942 |
2940 norepo = ("clone init version help debugancestor debugcomplete debugdata" | 2943 norepo = ("clone init version help debugancestor debugcomplete debugdata" |