Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/commands.py @ 3520:b0dc459cd06c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove some more deprecated options from help syntax summaries
author Matt Mackall <mpm@selenic.com>
date Wed, 25 Oct 2006 17:40:03 -0500
parents 5c57a5a17963
children 467d923e4e3d
comparison
equal deleted inserted replaced
3519:5c57a5a17963 3520:b0dc459cd06c
3012 'meaning as the corresponding patch option')), 3012 'meaning as the corresponding patch option')),
3013 ('m', 'message', '', _('use <text> as commit message')), 3013 ('m', 'message', '', _('use <text> as commit message')),
3014 ('b', 'base', '', _('base path (DEPRECATED)')), 3014 ('b', 'base', '', _('base path (DEPRECATED)')),
3015 ('f', 'force', None, 3015 ('f', 'force', None,
3016 _('skip check for outstanding uncommitted changes'))], 3016 _('skip check for outstanding uncommitted changes'))],
3017 _('hg import [-p NUM] [-b BASE] [-m MESSAGE] [-f] PATCH...')), 3017 _('hg import [-p NUM] [-m MESSAGE] [-f] PATCH...')),
3018 "incoming|in": (incoming, 3018 "incoming|in": (incoming,
3019 [('M', 'no-merges', None, _('do not show merges')), 3019 [('M', 'no-merges', None, _('do not show merges')),
3020 ('f', 'force', None, 3020 ('f', 'force', None,
3021 _('run even when remote repository is unrelated')), 3021 _('run even when remote repository is unrelated')),
3022 ('', 'style', '', _('display using template map file')), 3022 ('', 'style', '', _('display using template map file')),
3193 [('b', 'branch', '', 3193 [('b', 'branch', '',
3194 _('checkout the head of a specific branch (DEPRECATED)')), 3194 _('checkout the head of a specific branch (DEPRECATED)')),
3195 ('m', 'merge', None, _('allow merging of branches (DEPRECATED)')), 3195 ('m', 'merge', None, _('allow merging of branches (DEPRECATED)')),
3196 ('C', 'clean', None, _('overwrite locally modified files')), 3196 ('C', 'clean', None, _('overwrite locally modified files')),
3197 ('f', 'force', None, _('force a merge with outstanding changes'))], 3197 ('f', 'force', None, _('force a merge with outstanding changes'))],
3198 _('hg update [-m] [-C] [-f] [REV]')), 3198 _('hg update [-C] [-f] [REV]')),
3199 "verify": (verify, [], _('hg verify')), 3199 "verify": (verify, [], _('hg verify')),
3200 "version": (show_version, [], _('hg version')), 3200 "version": (show_version, [], _('hg version')),
3201 } 3201 }
3202 3202
3203 norepo = ("clone init version help debugancestor debugcomplete debugdata" 3203 norepo = ("clone init version help debugancestor debugcomplete debugdata"