Show More
@@ -269,9 +269,12 b' def show_version(ui):' | |||||
269 | "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" |
|
269 | "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" | |
270 | ) |
|
270 | ) | |
271 |
|
271 | |||
272 | def help_(ui, cmd=None): |
|
272 | def help_(ui, cmd=None, with_version=False): | |
273 | """show help for a given command or all commands""" |
|
273 | """show help for a given command or all commands""" | |
274 | if cmd and cmd != 'shortlist': |
|
274 | if cmd and cmd != 'shortlist': | |
|
275 | if with_version: | |||
|
276 | show_version(ui) | |||
|
277 | ui.write('\n') | |||
275 | key, i = find(cmd) |
|
278 | key, i = find(cmd) | |
276 | # synopsis |
|
279 | # synopsis | |
277 | ui.write("%s\n\n" % i[2]) |
|
280 | ui.write("%s\n\n" % i[2]) | |
@@ -305,7 +308,7 b' def help_(ui, cmd=None):' | |||||
305 |
|
308 | |||
306 | else: |
|
309 | else: | |
307 | # program name |
|
310 | # program name | |
308 | if ui.verbose: |
|
311 | if ui.verbose or with_version: | |
309 | show_version(ui) |
|
312 | show_version(ui) | |
310 | else: |
|
313 | else: | |
311 | ui.status("Mercurial Distributed SCM\n") |
|
314 | ui.status("Mercurial Distributed SCM\n") | |
@@ -1634,7 +1637,7 b' def dispatch(args):' | |||||
1634 | try: |
|
1637 | try: | |
1635 | try: |
|
1638 | try: | |
1636 | if options['help']: |
|
1639 | if options['help']: | |
1637 | help_(u, cmd) |
|
1640 | help_(u, cmd, options['version']) | |
1638 | sys.exit(0) |
|
1641 | sys.exit(0) | |
1639 | elif options['version']: |
|
1642 | elif options['version']: | |
1640 | show_version(u) |
|
1643 | show_version(u) |
General Comments 0
You need to be logged in to leave comments.
Login now