Mercurial > hg
comparison hgext/mq.py @ 21952:3838b910fa6b stable
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 | c85a0c3537b2 |
children | fd7839d1107d |
comparison
equal
deleted
inserted
replaced
21951:59af0b21ec31 | 21952:3838b910fa6b |
---|---|
2405 opts['user'] = ui.username() | 2405 opts['user'] = ui.username() |
2406 if not opts.get('date') and opts.get('currentdate'): | 2406 if not opts.get('date') and opts.get('currentdate'): |
2407 opts['date'] = "%d %d" % util.makedate() | 2407 opts['date'] = "%d %d" % util.makedate() |
2408 | 2408 |
2409 @command("^qnew", | 2409 @command("^qnew", |
2410 [('e', 'edit', None, _('edit commit message')), | 2410 [('e', 'edit', None, _('invoke editor on commit messages')), |
2411 ('f', 'force', None, _('import uncommitted changes (DEPRECATED)')), | 2411 ('f', 'force', None, _('import uncommitted changes (DEPRECATED)')), |
2412 ('g', 'git', None, _('use git extended diff format')), | 2412 ('g', 'git', None, _('use git extended diff format')), |
2413 ('U', 'currentuser', None, _('add "From: <current user>" to patch')), | 2413 ('U', 'currentuser', None, _('add "From: <current user>" to patch')), |
2414 ('u', 'user', '', | 2414 ('u', 'user', '', |
2415 _('add "From: <USER>" to patch'), _('USER')), | 2415 _('add "From: <USER>" to patch'), _('USER')), |
2451 q.new(repo, patch, *args, **opts) | 2451 q.new(repo, patch, *args, **opts) |
2452 q.savedirty() | 2452 q.savedirty() |
2453 return 0 | 2453 return 0 |
2454 | 2454 |
2455 @command("^qrefresh", | 2455 @command("^qrefresh", |
2456 [('e', 'edit', None, _('edit commit message')), | 2456 [('e', 'edit', None, _('invoke editor on commit messages')), |
2457 ('g', 'git', None, _('use git extended diff format')), | 2457 ('g', 'git', None, _('use git extended diff format')), |
2458 ('s', 'short', None, | 2458 ('s', 'short', None, |
2459 _('refresh only files already in the patch and specified files')), | 2459 _('refresh only files already in the patch and specified files')), |
2460 ('U', 'currentuser', None, | 2460 ('U', 'currentuser', None, |
2461 _('add/update author field in patch with current user')), | 2461 _('add/update author field in patch with current user')), |
2521 """ | 2521 """ |
2522 repo.mq.diff(repo, pats, opts) | 2522 repo.mq.diff(repo, pats, opts) |
2523 return 0 | 2523 return 0 |
2524 | 2524 |
2525 @command('qfold', | 2525 @command('qfold', |
2526 [('e', 'edit', None, _('edit patch header')), | 2526 [('e', 'edit', None, _('invoke editor on commit messages')), |
2527 ('k', 'keep', None, _('keep folded patch files')), | 2527 ('k', 'keep', None, _('keep folded patch files')), |
2528 ] + commands.commitopts, | 2528 ] + commands.commitopts, |
2529 _('hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH...')) | 2529 _('hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH...')) |
2530 def fold(ui, repo, *files, **opts): | 2530 def fold(ui, repo, *files, **opts): |
2531 """fold the named patches into the current patch | 2531 """fold the named patches into the current patch |