Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/commands.py @ 9952:5b149c88d9e8 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commands: add missing options in command line help
author timeless@mozdev.org
date Sat, 28 Nov 2009 23:44:18 +0100
parents 9b626a63f556
children 0347eb4d2236 36760956f6d3
comparison
equal deleted inserted replaced
9951:9b626a63f556 9952:5b149c88d9e8
3344 ('g', 'good', False, _('mark changeset good')), 3344 ('g', 'good', False, _('mark changeset good')),
3345 ('b', 'bad', False, _('mark changeset bad')), 3345 ('b', 'bad', False, _('mark changeset bad')),
3346 ('s', 'skip', False, _('skip testing changeset')), 3346 ('s', 'skip', False, _('skip testing changeset')),
3347 ('c', 'command', '', _('use command to check changeset state')), 3347 ('c', 'command', '', _('use command to check changeset state')),
3348 ('U', 'noupdate', False, _('do not update to target'))], 3348 ('U', 'noupdate', False, _('do not update to target'))],
3349 _("[-gbsr] [-c CMD] [REV]")), 3349 _("[-gbsr] [-U] [-c CMD] [REV]")),
3350 "branch": 3350 "branch":
3351 (branch, 3351 (branch,
3352 [('f', 'force', None, 3352 [('f', 'force', None,
3353 _('set branch name even if it shadows an existing branch')), 3353 _('set branch name even if it shadows an existing branch')),
3354 ('C', 'clean', None, _('reset branch name to parent branch name'))], 3354 ('C', 'clean', None, _('reset branch name to parent branch name'))],
3357 (branches, 3357 (branches,
3358 [('a', 'active', False, 3358 [('a', 'active', False,
3359 _('show only branches that have unmerged heads')), 3359 _('show only branches that have unmerged heads')),
3360 ('c', 'closed', False, 3360 ('c', 'closed', False,
3361 _('show normal and closed branches'))], 3361 _('show normal and closed branches'))],
3362 _('[-a]')), 3362 _('[-ac]')),
3363 "bundle": 3363 "bundle":
3364 (bundle, 3364 (bundle,
3365 [('f', 'force', None, 3365 [('f', 'force', None,
3366 _('run even when remote repository is unrelated')), 3366 _('run even when remote repository is unrelated')),
3367 ('r', 'rev', [], 3367 ('r', 'rev', [],
3369 ('', 'base', [], 3369 ('', 'base', [],
3370 _('a base changeset to specify instead of a destination')), 3370 _('a base changeset to specify instead of a destination')),
3371 ('a', 'all', None, _('bundle all changesets in the repository')), 3371 ('a', 'all', None, _('bundle all changesets in the repository')),
3372 ('t', 'type', 'bzip2', _('bundle compression type to use')), 3372 ('t', 'type', 'bzip2', _('bundle compression type to use')),
3373 ] + remoteopts, 3373 ] + remoteopts,
3374 _('[-f] [-a] [-r REV]... [--base REV]... FILE [DEST]')), 3374 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]')),
3375 "cat": 3375 "cat":
3376 (cat, 3376 (cat,
3377 [('o', 'output', '', _('print output to file with formatted name')), 3377 [('o', 'output', '', _('print output to file with formatted name')),
3378 ('r', 'rev', '', _('print the given revision')), 3378 ('r', 'rev', '', _('print the given revision')),
3379 ('', 'decode', None, _('apply any matching decode filter')), 3379 ('', 'decode', None, _('apply any matching decode filter')),
3479 ('a', 'active', False, 3479 ('a', 'active', False,
3480 _('show only the active branch heads from open branches')), 3480 _('show only the active branch heads from open branches')),
3481 ('c', 'closed', False, 3481 ('c', 'closed', False,
3482 _('show normal and closed branch heads')), 3482 _('show normal and closed branch heads')),
3483 ] + templateopts, 3483 ] + templateopts,
3484 _('[-r STARTREV] [REV]...')), 3484 _('[-ac] [-r STARTREV] [REV]...')),
3485 "help": (help_, [], _('[TOPIC]')), 3485 "help": (help_, [], _('[TOPIC]')),
3486 "identify|id": 3486 "identify|id":
3487 (identify, 3487 (identify,
3488 [('r', 'rev', '', _('identify the specified revision')), 3488 [('r', 'rev', '', _('identify the specified revision')),
3489 ('n', 'num', None, _('show local revision number')), 3489 ('n', 'num', None, _('show local revision number')),
3556 (merge, 3556 (merge,
3557 [('f', 'force', None, _('force a merge with outstanding changes')), 3557 [('f', 'force', None, _('force a merge with outstanding changes')),
3558 ('r', 'rev', '', _('revision to merge')), 3558 ('r', 'rev', '', _('revision to merge')),
3559 ('P', 'preview', None, 3559 ('P', 'preview', None,
3560 _('review revisions to merge (no merge is performed)'))], 3560 _('review revisions to merge (no merge is performed)'))],
3561 _('[-f] [[-r] REV]')), 3561 _('[-P] [-f] [[-r] REV]')),
3562 "outgoing|out": 3562 "outgoing|out":
3563 (outgoing, 3563 (outgoing,
3564 [('f', 'force', None, 3564 [('f', 'force', None,
3565 _('run even when remote repository is unrelated')), 3565 _('run even when remote repository is unrelated')),
3566 ('r', 'rev', [], 3566 ('r', 'rev', [],
3676 ('r', 'rev', '', _('revision to tag')), 3676 ('r', 'rev', '', _('revision to tag')),
3677 ('', 'remove', None, _('remove a tag')), 3677 ('', 'remove', None, _('remove a tag')),
3678 # -l/--local is already there, commitopts cannot be used 3678 # -l/--local is already there, commitopts cannot be used
3679 ('m', 'message', '', _('use <text> as commit message')), 3679 ('m', 'message', '', _('use <text> as commit message')),
3680 ] + commitopts2, 3680 ] + commitopts2,
3681 _('[-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...')), 3681 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...')),
3682 "tags": (tags, [], ''), 3682 "tags": (tags, [], ''),
3683 "tip": 3683 "tip":
3684 (tip, 3684 (tip,
3685 [('p', 'patch', None, _('show patch')), 3685 [('p', 'patch', None, _('show patch')),
3686 ('g', 'git', None, _('use git extended diff format')), 3686 ('g', 'git', None, _('use git extended diff format')),
3687 ] + templateopts, 3687 ] + templateopts,
3688 _('[-p]')), 3688 _('[-p] [-g]')),
3689 "unbundle": 3689 "unbundle":
3690 (unbundle, 3690 (unbundle,
3691 [('u', 'update', None, 3691 [('u', 'update', None,
3692 _('update to new tip if changesets were unbundled'))], 3692 _('update to new tip if changesets were unbundled'))],
3693 _('[-u] FILE...')), 3693 _('[-u] FILE...')),