Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/commands.py @ 21952:3838b910fa6b stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
doc: unify help text for "--edit" option This patch changes help text for "--edit" option of commands below: - fetch - qnew - qrefresh - qfold - commit - tag This unification reduces translation cost, too. This patch chooses not "further edit commit message already specified" (of "hg commit") but "invoke editor on commit messages" as unified help text for "--edit" option, because the latter is much older than the former.
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Wed, 30 Jul 2014 00:14:52 +0900
parents 59af0b21ec31
children 2122b82b6987
comparison
equal deleted inserted replaced
21951:59af0b21ec31 21952:3838b910fa6b
1337 _('mark new/missing files as added/removed before committing')), 1337 _('mark new/missing files as added/removed before committing')),
1338 ('', 'close-branch', None, 1338 ('', 'close-branch', None,
1339 _('mark a branch as closed, hiding it from the branch list')), 1339 _('mark a branch as closed, hiding it from the branch list')),
1340 ('', 'amend', None, _('amend the parent of the working dir')), 1340 ('', 'amend', None, _('amend the parent of the working dir')),
1341 ('s', 'secret', None, _('use the secret phase for committing')), 1341 ('s', 'secret', None, _('use the secret phase for committing')),
1342 ('e', 'edit', None, 1342 ('e', 'edit', None, _('invoke editor on commit messages')),
1343 _('further edit commit message already specified')),
1344 ] + walkopts + commitopts + commitopts2 + subrepoopts, 1343 ] + walkopts + commitopts + commitopts2 + subrepoopts,
1345 _('[OPTION]... [FILE]...'), 1344 _('[OPTION]... [FILE]...'),
1346 inferrepo=True) 1345 inferrepo=True)
1347 def commit(ui, repo, *pats, **opts): 1346 def commit(ui, repo, *pats, **opts):
1348 """commit the specified files or all outstanding changes 1347 """commit the specified files or all outstanding changes
5693 [('f', 'force', None, _('force tag')), 5692 [('f', 'force', None, _('force tag')),
5694 ('l', 'local', None, _('make the tag local')), 5693 ('l', 'local', None, _('make the tag local')),
5695 ('r', 'rev', '', _('revision to tag'), _('REV')), 5694 ('r', 'rev', '', _('revision to tag'), _('REV')),
5696 ('', 'remove', None, _('remove a tag')), 5695 ('', 'remove', None, _('remove a tag')),
5697 # -l/--local is already there, commitopts cannot be used 5696 # -l/--local is already there, commitopts cannot be used
5698 ('e', 'edit', None, _('edit commit message')), 5697 ('e', 'edit', None, _('invoke editor on commit messages')),
5699 ('m', 'message', '', _('use text as commit message'), _('TEXT')), 5698 ('m', 'message', '', _('use text as commit message'), _('TEXT')),
5700 ] + commitopts2, 5699 ] + commitopts2,
5701 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...')) 5700 _('[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...'))
5702 def tag(ui, repo, name1, *names, **opts): 5701 def tag(ui, repo, name1, *names, **opts):
5703 """add one or more tags for the current or given revision 5702 """add one or more tags for the current or given revision