Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 10375:adf9505e8888

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commands: Try to improve help options text for basic commands Mostly rewrite -r text
author timeless@mozdev.org
date Fri, 20 Nov 2009 14:37:36 +0200
parents 98a0421b9e52
children a2950e053614
comparison
equal deleted inserted replaced
10374:3aa35db5e38c 10375:adf9505e8888
3328 ] + templateopts 3328 ] + templateopts
3329 3329
3330 diffopts = [ 3330 diffopts = [
3331 ('a', 'text', None, _('treat all files as text')), 3331 ('a', 'text', None, _('treat all files as text')),
3332 ('g', 'git', None, _('use git extended diff format')), 3332 ('g', 'git', None, _('use git extended diff format')),
3333 ('', 'nodates', None, _("don't include dates in diff headers")) 3333 ('', 'nodates', None, _('omit dates from diff headers'))
3334 ] 3334 ]
3335 3335
3336 diffopts2 = [ 3336 diffopts2 = [
3337 ('p', 'show-function', None, _('show which function each change is in')), 3337 ('p', 'show-function', None, _('show which function each change is in')),
3338 ('', 'reverse', None, _('produce a diff that undoes the changes')), 3338 ('', 'reverse', None, _('produce a diff that undoes the changes')),
3410 _('show normal and closed branches'))], 3410 _('show normal and closed branches'))],
3411 _('[-ac]')), 3411 _('[-ac]')),
3412 "bundle": 3412 "bundle":
3413 (bundle, 3413 (bundle,
3414 [('f', 'force', None, 3414 [('f', 'force', None,
3415 _('run even when remote repository is unrelated')), 3415 _('run even when the destination is unrelated')),
3416 ('r', 'rev', [], 3416 ('r', 'rev', [],
3417 _('a changeset up to which you would like to bundle')), 3417 _('a changeset intended to be added to the destination')),
3418 ('', 'base', [], 3418 ('', 'base', [],
3419 _('a base changeset to specify instead of a destination')), 3419 _('a base changeset assumed to be available at the destination')),
3420 ('a', 'all', None, _('bundle all changesets in the repository')), 3420 ('a', 'all', None, _('bundle all changesets in the repository')),
3421 ('t', 'type', 'bzip2', _('bundle compression type to use')), 3421 ('t', 'type', 'bzip2', _('bundle compression type to use')),
3422 ] + remoteopts, 3422 ] + remoteopts,
3423 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]')), 3423 _('[-f] [-t TYPE] [-a] [-r REV]... [--base REV]... FILE [DEST]')),
3424 "cat": 3424 "cat":
3429 ] + walkopts, 3429 ] + walkopts,
3430 _('[OPTION]... FILE...')), 3430 _('[OPTION]... FILE...')),
3431 "^clone": 3431 "^clone":
3432 (clone, 3432 (clone,
3433 [('U', 'noupdate', None, 3433 [('U', 'noupdate', None,
3434 _('the clone will only contain a repository (no working copy)')), 3434 _('the clone will include an empty working copy (only a repository)')),
3435 ('u', 'updaterev', '', 3435 ('u', 'updaterev', '',
3436 _('revision, tag or branch to check out')), 3436 _('revision, tag or branch to check out')),
3437 ('r', 'rev', [], 3437 ('r', 'rev', [],
3438 _('clone only the specified revisions and ancestors')), 3438 _('include the specified changeset')),
3439 ('', 'pull', None, _('use pull protocol to copy metadata')), 3439 ('', 'pull', None, _('use pull protocol to copy metadata')),
3440 ('', 'uncompressed', None, 3440 ('', 'uncompressed', None,
3441 _('use uncompressed transfer (fast over LAN)')), 3441 _('use uncompressed transfer (fast over LAN)')),
3442 ] + remoteopts, 3442 ] + remoteopts,
3443 _('[OPTION]... SOURCE [DEST]')), 3443 _('[OPTION]... SOURCE [DEST]')),
3560 commitopts + commitopts2 + similarityopts, 3560 commitopts + commitopts2 + similarityopts,
3561 _('[OPTION]... PATCH...')), 3561 _('[OPTION]... PATCH...')),
3562 "incoming|in": 3562 "incoming|in":
3563 (incoming, 3563 (incoming,
3564 [('f', 'force', None, 3564 [('f', 'force', None,
3565 _('run even when remote repository is unrelated')), 3565 _('run even if remote repository is unrelated')),
3566 ('n', 'newest-first', None, _('show newest record first')), 3566 ('n', 'newest-first', None, _('show newest record first')),
3567 ('', 'bundle', '', _('file to store the bundles into')), 3567 ('', 'bundle', '', _('file to store the bundles into')),
3568 ('r', 'rev', [], 3568 ('r', 'rev', [],
3569 _('a specific remote revision up to which you would like to pull')), 3569 _('a remote changeset intended to be added')),
3570 ] + logopts + remoteopts, 3570 ] + logopts + remoteopts,
3571 _('[-p] [-n] [-M] [-f] [-r REV]...' 3571 _('[-p] [-n] [-M] [-f] [-r REV]...'
3572 ' [--bundle FILENAME] [SOURCE]')), 3572 ' [--bundle FILENAME] [SOURCE]')),
3573 "^init": 3573 "^init":
3574 (init, 3574 (init,
3575 remoteopts, 3575 remoteopts,
3576 _('[-e CMD] [--remotecmd CMD] [DEST]')), 3576 _('[-e CMD] [--remotecmd CMD] [DEST]')),
3577 "locate": 3577 "locate":
3578 (locate, 3578 (locate,
3579 [('r', 'rev', '', _('search the repository as it stood at REV')), 3579 [('r', 'rev', '', _('search the repository as it is in REV')),
3580 ('0', 'print0', None, 3580 ('0', 'print0', None,
3581 _('end filenames with NUL, for use with xargs')), 3581 _('end filenames with NUL, for use with xargs')),
3582 ('f', 'fullpath', None, 3582 ('f', 'fullpath', None,
3583 _('print complete paths from the filesystem root')), 3583 _('print complete paths from the filesystem root')),
3584 ] + walkopts, 3584 ] + walkopts,
3615 _('review revisions to merge (no merge is performed)'))], 3615 _('review revisions to merge (no merge is performed)'))],
3616 _('[-P] [-f] [[-r] REV]')), 3616 _('[-P] [-f] [[-r] REV]')),
3617 "outgoing|out": 3617 "outgoing|out":
3618 (outgoing, 3618 (outgoing,
3619 [('f', 'force', None, 3619 [('f', 'force', None,
3620 _('run even when remote repository is unrelated')), 3620 _('run even when the destination is unrelated')),
3621 ('r', 'rev', [], 3621 ('r', 'rev', [],
3622 _('a specific revision up to which you would like to push')), 3622 _('a changeset intended to be included in the destination')),
3623 ('n', 'newest-first', None, _('show newest record first')), 3623 ('n', 'newest-first', None, _('show newest record first')),
3624 ] + logopts + remoteopts, 3624 ] + logopts + remoteopts,
3625 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]')), 3625 _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]')),
3626 "parents": 3626 "parents":
3627 (parents, 3627 (parents,
3628 [('r', 'rev', '', _('show parents from the specified revision')), 3628 [('r', 'rev', '', _('show parents of the specified revision')),
3629 ] + templateopts, 3629 ] + templateopts,
3630 _('[-r REV] [FILE]')), 3630 _('[-r REV] [FILE]')),
3631 "paths": (paths, [], _('[NAME]')), 3631 "paths": (paths, [], _('[NAME]')),
3632 "^pull": 3632 "^pull":
3633 (pull, 3633 (pull,
3634 [('u', 'update', None, 3634 [('u', 'update', None,
3635 _('update to new branch head if changesets were pulled')), 3635 _('update to new branch head if changesets were pulled')),
3636 ('f', 'force', None, 3636 ('f', 'force', None,
3637 _('run even when remote repository is unrelated')), 3637 _('run even when remote repository is unrelated')),
3638 ('r', 'rev', [], 3638 ('r', 'rev', [],
3639 _('a specific remote revision up to which you would like to pull')), 3639 _('a remote changeset intended to be added')),
3640 ] + remoteopts, 3640 ] + remoteopts,
3641 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]')), 3641 _('[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]')),
3642 "^push": 3642 "^push":
3643 (push, 3643 (push,
3644 [('f', 'force', None, _('force push')), 3644 [('f', 'force', None, _('force push')),
3645 ('r', 'rev', [], 3645 ('r', 'rev', [],
3646 _('a specific revision up to which you would like to push')), 3646 _('a changeset intended to be included in the destination')),
3647 ] + remoteopts, 3647 ] + remoteopts,
3648 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]')), 3648 _('[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]')),
3649 "recover": (recover, []), 3649 "recover": (recover, []),
3650 "^remove|rm": 3650 "^remove|rm":
3651 (remove, 3651 (remove,
3672 _('[OPTION]... [FILE]...')), 3672 _('[OPTION]... [FILE]...')),
3673 "revert": 3673 "revert":
3674 (revert, 3674 (revert,
3675 [('a', 'all', None, _('revert all changes when no arguments given')), 3675 [('a', 'all', None, _('revert all changes when no arguments given')),
3676 ('d', 'date', '', _('tipmost revision matching date')), 3676 ('d', 'date', '', _('tipmost revision matching date')),
3677 ('r', 'rev', '', _('revision to revert to')), 3677 ('r', 'rev', '', _('revert to the specified revision')),
3678 ('', 'no-backup', None, _('do not save backup copies of files')), 3678 ('', 'no-backup', None, _('do not save backup copies of files')),
3679 ] + walkopts + dryrunopts, 3679 ] + walkopts + dryrunopts,
3680 _('[OPTION]... [-r REV] [NAME]...')), 3680 _('[OPTION]... [-r REV] [NAME]...')),
3681 "rollback": (rollback, []), 3681 "rollback": (rollback, []),
3682 "root": (root, []), 3682 "root": (root, []),