Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/commands.py @ 7303:d14c25e823ba

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Corrected some command synopsises
author Thomas Arendsen Hein <thomas@intevation.de>
date Sun, 02 Nov 2008 17:28:03 +0100
parents 810ca383da9c
children 56380212d630
comparison
equal deleted inserted replaced
7302:972737252d05 7303:d14c25e823ba
3033 ('g', 'good', False, _('mark changeset good')), 3033 ('g', 'good', False, _('mark changeset good')),
3034 ('b', 'bad', False, _('mark changeset bad')), 3034 ('b', 'bad', False, _('mark changeset bad')),
3035 ('s', 'skip', False, _('skip testing changeset')), 3035 ('s', 'skip', False, _('skip testing changeset')),
3036 ('c', 'command', '', _('Use command to check changeset state')), 3036 ('c', 'command', '', _('Use command to check changeset state')),
3037 ('U', 'noupdate', False, _('do not update to target'))], 3037 ('U', 'noupdate', False, _('do not update to target'))],
3038 _("hg bisect [-gbsr] [REV] [-c COMMAND]")), 3038 _("hg bisect [-gbsr] [-c CMD] [REV]")),
3039 "branch": 3039 "branch":
3040 (branch, 3040 (branch,
3041 [('f', 'force', None, 3041 [('f', 'force', None,
3042 _('set branch name even if it shadows an existing branch')), 3042 _('set branch name even if it shadows an existing branch')),
3043 ('C', 'clean', None, _('reset branch name to parent branch name'))], 3043 ('C', 'clean', None, _('reset branch name to parent branch name'))],
3125 [], 3125 [],
3126 _('hg debugsetparents REV1 [REV2]')), 3126 _('hg debugsetparents REV1 [REV2]')),
3127 "debugstate": 3127 "debugstate":
3128 (debugstate, 3128 (debugstate,
3129 [('', 'nodates', None, _('do not display the saved mtime'))], 3129 [('', 'nodates', None, _('do not display the saved mtime'))],
3130 _('hg debugstate [OPTS]')), 3130 _('hg debugstate [OPTION]...')),
3131 "debugwalk": (debugwalk, walkopts, _('hg debugwalk [OPTION]... [FILE]...')), 3131 "debugwalk": (debugwalk, walkopts, _('hg debugwalk [OPTION]... [FILE]...')),
3132 "^diff": 3132 "^diff":
3133 (diff, 3133 (diff,
3134 [('r', 'rev', [], _('revision')) 3134 [('r', 'rev', [], _('revision'))
3135 ] + diffopts + diffopts2 + walkopts, 3135 ] + diffopts + diffopts2 + walkopts,
3286 "resolve": 3286 "resolve":
3287 (resolve, 3287 (resolve,
3288 [('l', 'list', None, _('list state of files needing merge')), 3288 [('l', 'list', None, _('list state of files needing merge')),
3289 ('m', 'mark', None, _('mark files as resolved')), 3289 ('m', 'mark', None, _('mark files as resolved')),
3290 ('u', 'unmark', None, _('unmark files as resolved'))], 3290 ('u', 'unmark', None, _('unmark files as resolved'))],
3291 _('hg resolve [OPTION] [FILES...]')), 3291 _('hg resolve [OPTION]... [FILE]...')),
3292 "revert": 3292 "revert":
3293 (revert, 3293 (revert,
3294 [('a', 'all', None, _('revert all changes when no arguments given')), 3294 [('a', 'all', None, _('revert all changes when no arguments given')),
3295 ('d', 'date', '', _('tipmost revision matching date')), 3295 ('d', 'date', '', _('tipmost revision matching date')),
3296 ('r', 'rev', '', _('revision to revert to')), 3296 ('r', 'rev', '', _('revision to revert to')),