##// END OF EJS Templates
doc: unify help text for "--edit" option...
FUJIWARA Katsunori -
r21952:3838b910 stable
parent child Browse files
Show More
@@ -19,7 +19,7 b" testedwith = 'internal'"
19 @command('fetch',
19 @command('fetch',
20 [('r', 'rev', [],
20 [('r', 'rev', [],
21 _('a specific revision you would like to pull'), _('REV')),
21 _('a specific revision you would like to pull'), _('REV')),
22 ('e', 'edit', None, _('edit commit message')),
22 ('e', 'edit', None, _('invoke editor on commit messages')),
23 ('', 'force-editor', None, _('edit commit message (DEPRECATED)')),
23 ('', 'force-editor', None, _('edit commit message (DEPRECATED)')),
24 ('', 'switch-parent', None, _('switch parents when merging')),
24 ('', 'switch-parent', None, _('switch parents when merging')),
25 ] + commands.commitopts + commands.commitopts2 + commands.remoteopts,
25 ] + commands.commitopts + commands.commitopts2 + commands.remoteopts,
@@ -2407,7 +2407,7 b' def setupheaderopts(ui, opts):'
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')),
@@ -2453,7 +2453,7 b' def new(ui, repo, patch, *args, **opts):'
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')),
@@ -2523,7 +2523,7 b' def diff(ui, 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...'))
@@ -1339,8 +1339,7 b' def clone(ui, source, dest=None, **opts)'
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)
@@ -5695,7 +5694,7 b' def summary(ui, repo, **opts):'
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...'))
@@ -31,7 +31,7 b' help qrefresh (no record)'
31
31
32 options:
32 options:
33
33
34 -e --edit edit commit message
34 -e --edit invoke editor on commit messages
35 -g --git use git extended diff format
35 -g --git use git extended diff format
36 -s --short refresh only files already in the patch and
36 -s --short refresh only files already in the patch and
37 specified files
37 specified files
@@ -75,7 +75,7 b' help qrefresh (record)'
75
75
76 options:
76 options:
77
77
78 -e --edit edit commit message
78 -e --edit invoke editor on commit messages
79 -g --git use git extended diff format
79 -g --git use git extended diff format
80 -s --short refresh only files already in the patch and
80 -s --short refresh only files already in the patch and
81 specified files
81 specified files
@@ -62,7 +62,7 b' help record (record)'
62 list
62 list
63 --amend amend the parent of the working dir
63 --amend amend the parent of the working dir
64 -s --secret use the secret phase for committing
64 -s --secret use the secret phase for committing
65 -e --edit further edit commit message already specified
65 -e --edit invoke editor on commit messages
66 -I --include PATTERN [+] include names matching the given patterns
66 -I --include PATTERN [+] include names matching the given patterns
67 -X --exclude PATTERN [+] exclude names matching the given patterns
67 -X --exclude PATTERN [+] exclude names matching the given patterns
68 -m --message TEXT use text as commit message
68 -m --message TEXT use text as commit message
@@ -135,7 +135,7 b' help (mq present)'
135
135
136 options:
136 options:
137
137
138 -e --edit edit commit message
138 -e --edit invoke editor on commit messages
139 -g --git use git extended diff format
139 -g --git use git extended diff format
140 -U --currentuser add "From: <current user>" to patch
140 -U --currentuser add "From: <current user>" to patch
141 -u --user USER add "From: <USER>" to patch
141 -u --user USER add "From: <USER>" to patch
General Comments 0
You need to be logged in to leave comments. Login now