Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 5778:9e97a7a0bb82

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
realign commands table
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 01 Jan 2008 11:19:15 +0100
parents 35ec669cdd43
children 45d034c79ece
comparison
equal deleted inserted replaced
5777:51776e50bc8c 5778:9e97a7a0bb82
2740 _('merge with old dirstate parent after backout')), 2740 _('merge with old dirstate parent after backout')),
2741 ('', 'parent', '', _('parent to choose when backing out merge')), 2741 ('', 'parent', '', _('parent to choose when backing out merge')),
2742 ('r', 'rev', '', _('revision to backout')), 2742 ('r', 'rev', '', _('revision to backout')),
2743 ] + walkopts + commitopts + commitopts2, 2743 ] + walkopts + commitopts + commitopts2,
2744 _('hg backout [OPTION]... [-r] REV')), 2744 _('hg backout [OPTION]... [-r] REV')),
2745 "bisect": (bisect, 2745 "bisect":
2746 [('r', 'reset', False, _('reset bisect state')), 2746 (bisect,
2747 ('g', 'good', False, _('mark changeset good')), 2747 [('r', 'reset', False, _('reset bisect state')),
2748 ('b', 'bad', False, _('mark changeset bad')), 2748 ('g', 'good', False, _('mark changeset good')),
2749 ('s', 'skip', False, _('skip testing changeset')), 2749 ('b', 'bad', False, _('mark changeset bad')),
2750 ('U', 'noupdate', False, _('do not update to target'))], 2750 ('s', 'skip', False, _('skip testing changeset')),
2751 _("hg bisect [-gbsr] [REV]")), 2751 ('U', 'noupdate', False, _('do not update to target'))],
2752 _("hg bisect [-gbsr] [REV]")),
2752 "branch": 2753 "branch":
2753 (branch, 2754 (branch,
2754 [('f', 'force', None, 2755 [('f', 'force', None,
2755 _('set branch name even if it shadows an existing branch'))], 2756 _('set branch name even if it shadows an existing branch'))],
2756 _('hg branch [NAME]')), 2757 _('hg branch [-f] [NAME]')),
2757 "branches": 2758 "branches":
2758 (branches, 2759 (branches,
2759 [('a', 'active', False, 2760 [('a', 'active', False,
2760 _('show only branches that have unmerged heads'))], 2761 _('show only branches that have unmerged heads'))],
2761 _('hg branches [-a]')), 2762 _('hg branches [-a]')),
2888 ('', 'exact', None, 2889 ('', 'exact', None,
2889 _('apply patch to the nodes from which it was generated')), 2890 _('apply patch to the nodes from which it was generated')),
2890 ('', 'import-branch', None, 2891 ('', 'import-branch', None,
2891 _('Use any branch information in patch (implied by --exact)'))] + commitopts, 2892 _('Use any branch information in patch (implied by --exact)'))] + commitopts,
2892 _('hg import [-p NUM] [-m MESSAGE] [-f] PATCH...')), 2893 _('hg import [-p NUM] [-m MESSAGE] [-f] PATCH...')),
2893 "incoming|in": (incoming, 2894 "incoming|in":
2895 (incoming,
2894 [('M', 'no-merges', None, _('do not show merges')), 2896 [('M', 'no-merges', None, _('do not show merges')),
2895 ('f', 'force', None, 2897 ('f', 'force', None,
2896 _('run even when remote repository is unrelated')), 2898 _('run even when remote repository is unrelated')),
2897 ('', 'style', '', _('display using template map file')), 2899 ('', 'style', '', _('display using template map file')),
2898 ('n', 'newest-first', None, _('show newest record first')), 2900 ('n', 'newest-first', None, _('show newest record first')),
2934 ('p', 'patch', None, _('show patch')), 2936 ('p', 'patch', None, _('show patch')),
2935 ('P', 'prune', [], _('do not display revision or any of its ancestors')), 2937 ('P', 'prune', [], _('do not display revision or any of its ancestors')),
2936 ('', 'template', '', _('display with template')), 2938 ('', 'template', '', _('display with template')),
2937 ] + walkopts, 2939 ] + walkopts,
2938 _('hg log [OPTION]... [FILE]')), 2940 _('hg log [OPTION]... [FILE]')),
2939 "manifest": (manifest, [('r', 'rev', '', _('revision to display'))], 2941 "manifest":
2940 _('hg manifest [-r REV]')), 2942 (manifest,
2943 [('r', 'rev', '', _('revision to display'))],
2944 _('hg manifest [-r REV]')),
2941 "^merge": 2945 "^merge":
2942 (merge, 2946 (merge,
2943 [('f', 'force', None, _('force a merge with outstanding changes')), 2947 [('f', 'force', None, _('force a merge with outstanding changes')),
2944 ('r', 'rev', '', _('revision to merge')), 2948 ('r', 'rev', '', _('revision to merge')),
2945 ], 2949 ],
2946 _('hg merge [-f] [[-r] REV]')), 2950 _('hg merge [-f] [[-r] REV]')),
2947 "outgoing|out": (outgoing, 2951 "outgoing|out":
2952 (outgoing,
2948 [('M', 'no-merges', None, _('do not show merges')), 2953 [('M', 'no-merges', None, _('do not show merges')),
2949 ('f', 'force', None, 2954 ('f', 'force', None,
2950 _('run even when remote repository is unrelated')), 2955 _('run even when remote repository is unrelated')),
2951 ('p', 'patch', None, _('show patch')), 2956 ('p', 'patch', None, _('show patch')),
2952 ('', 'style', '', _('display using template map file')), 2957 ('', 'style', '', _('display using template map file')),