Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/commands.py @ 3504:f4ab58d4ccd4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove [-b] options from help syntax lines
author Matt Mackall <mpm@selenic.com>
date Tue, 24 Oct 2006 17:22:07 -0500
parents b28d3e0f9a8c
children e1421a77427e
comparison
equal deleted inserted replaced
3503:b28d3e0f9a8c 3504:f4ab58d4ccd4
2996 (heads, 2996 (heads,
2997 [('b', 'branches', None, _('show branches (DEPRECATED)')), 2997 [('b', 'branches', None, _('show branches (DEPRECATED)')),
2998 ('', 'style', '', _('display using template map file')), 2998 ('', 'style', '', _('display using template map file')),
2999 ('r', 'rev', '', _('show only heads which are descendants of rev')), 2999 ('r', 'rev', '', _('show only heads which are descendants of rev')),
3000 ('', 'template', '', _('display with template'))], 3000 ('', 'template', '', _('display with template'))],
3001 _('hg heads [-b] [-r <rev>]')), 3001 _('hg heads [-r <rev>]')),
3002 "help": (help_, [], _('hg help [COMMAND]')), 3002 "help": (help_, [], _('hg help [COMMAND]')),
3003 "identify|id": (identify, [], _('hg identify')), 3003 "identify|id": (identify, [], _('hg identify')),
3004 "import|patch": 3004 "import|patch":
3005 (import_, 3005 (import_,
3006 [('p', 'strip', 1, 3006 [('p', 'strip', 1,
3057 "manifest": (manifest, [], _('hg manifest [REV]')), 3057 "manifest": (manifest, [], _('hg manifest [REV]')),
3058 "merge": 3058 "merge":
3059 (merge, 3059 (merge,
3060 [('b', 'branch', '', _('merge with head of a specific branch (DEPRECATED)')), 3060 [('b', 'branch', '', _('merge with head of a specific branch (DEPRECATED)')),
3061 ('f', 'force', None, _('force a merge with outstanding changes'))], 3061 ('f', 'force', None, _('force a merge with outstanding changes'))],
3062 _('hg merge [-b TAG] [-f] [REV]')), 3062 _('hg merge [-f] [REV]')),
3063 "outgoing|out": (outgoing, 3063 "outgoing|out": (outgoing,
3064 [('M', 'no-merges', None, _('do not show merges')), 3064 [('M', 'no-merges', None, _('do not show merges')),
3065 ('f', 'force', None, 3065 ('f', 'force', None,
3066 _('run even when remote repository is unrelated')), 3066 _('run even when remote repository is unrelated')),
3067 ('p', 'patch', None, _('show patch')), 3067 ('p', 'patch', None, _('show patch')),
3075 (parents, 3075 (parents,
3076 [('b', 'branches', None, _('show branches (DEPRECATED)')), 3076 [('b', 'branches', None, _('show branches (DEPRECATED)')),
3077 ('r', 'rev', '', _('show parents from the specified rev')), 3077 ('r', 'rev', '', _('show parents from the specified rev')),
3078 ('', 'style', '', _('display using template map file')), 3078 ('', 'style', '', _('display using template map file')),
3079 ('', 'template', '', _('display with template'))], 3079 ('', 'template', '', _('display with template'))],
3080 _('hg parents [-b] [-r REV] [FILE]')), 3080 _('hg parents [-r REV] [FILE]')),
3081 "paths": (paths, [], _('hg paths [NAME]')), 3081 "paths": (paths, [], _('hg paths [NAME]')),
3082 "^pull": 3082 "^pull":
3083 (pull, 3083 (pull,
3084 [('u', 'update', None, 3084 [('u', 'update', None,
3085 _('update to new tip if changesets were pulled')), 3085 _('update to new tip if changesets were pulled')),
3175 (tip, 3175 (tip,
3176 [('b', 'branches', None, _('show branches (DEPRECATED)')), 3176 [('b', 'branches', None, _('show branches (DEPRECATED)')),
3177 ('', 'style', '', _('display using template map file')), 3177 ('', 'style', '', _('display using template map file')),
3178 ('p', 'patch', None, _('show patch')), 3178 ('p', 'patch', None, _('show patch')),
3179 ('', 'template', '', _('display with template'))], 3179 ('', 'template', '', _('display with template'))],
3180 _('hg tip [-b] [-p]')), 3180 _('hg tip [-p]')),
3181 "unbundle": 3181 "unbundle":
3182 (unbundle, 3182 (unbundle,
3183 [('u', 'update', None, 3183 [('u', 'update', None,
3184 _('update to new tip if changesets were unbundled'))], 3184 _('update to new tip if changesets were unbundled'))],
3185 _('hg unbundle [-u] FILE')), 3185 _('hg unbundle [-u] FILE')),
3189 [('b', 'branch', '', 3189 [('b', 'branch', '',
3190 _('checkout the head of a specific branch (DEPRECATED)')), 3190 _('checkout the head of a specific branch (DEPRECATED)')),
3191 ('m', 'merge', None, _('allow merging of branches (DEPRECATED)')), 3191 ('m', 'merge', None, _('allow merging of branches (DEPRECATED)')),
3192 ('C', 'clean', None, _('overwrite locally modified files')), 3192 ('C', 'clean', None, _('overwrite locally modified files')),
3193 ('f', 'force', None, _('force a merge with outstanding changes'))], 3193 ('f', 'force', None, _('force a merge with outstanding changes'))],
3194 _('hg update [-b TAG] [-m] [-C] [-f] [REV]')), 3194 _('hg update [-m] [-C] [-f] [REV]')),
3195 "verify": (verify, [], _('hg verify')), 3195 "verify": (verify, [], _('hg verify')),
3196 "version": (show_version, [], _('hg version')), 3196 "version": (show_version, [], _('hg version')),
3197 } 3197 }
3198 3198
3199 norepo = ("clone init version help debugancestor debugcomplete debugdata" 3199 norepo = ("clone init version help debugancestor debugcomplete debugdata"