Show More
@@ -263,7 +263,7 b' def help_(ui, name, unknowncmd=False, fu' | |||||
263 |
|
263 | |||
264 | import commands # avoid cycle |
|
264 | import commands # avoid cycle | |
265 |
|
265 | |||
266 | def helpcmd(name): |
|
266 | def helpcmd(name, subtopic=None): | |
267 | try: |
|
267 | try: | |
268 | aliases, entry = cmdutil.findcmd(name, commands.table, |
|
268 | aliases, entry = cmdutil.findcmd(name, commands.table, | |
269 | strict=unknowncmd) |
|
269 | strict=unknowncmd) | |
@@ -432,7 +432,7 b' def help_(ui, name, unknowncmd=False, fu' | |||||
432 | % (name and " " + name or "")) |
|
432 | % (name and " " + name or "")) | |
433 | return rst |
|
433 | return rst | |
434 |
|
434 | |||
435 | def helptopic(name): |
|
435 | def helptopic(name, subtopic=None): | |
436 | for names, header, doc in helptable: |
|
436 | for names, header, doc in helptable: | |
437 | if name in names: |
|
437 | if name in names: | |
438 | break |
|
438 | break | |
@@ -460,7 +460,7 b' def help_(ui, name, unknowncmd=False, fu' | |||||
460 | pass |
|
460 | pass | |
461 | return rst |
|
461 | return rst | |
462 |
|
462 | |||
463 | def helpext(name): |
|
463 | def helpext(name, subtopic=None): | |
464 | try: |
|
464 | try: | |
465 | mod = extensions.find(name) |
|
465 | mod = extensions.find(name) | |
466 | doc = gettext(mod.__doc__) or _('no help text available') |
|
466 | doc = gettext(mod.__doc__) or _('no help text available') | |
@@ -496,7 +496,7 b' def help_(ui, name, unknowncmd=False, fu' | |||||
496 | ' extensions)\n')) |
|
496 | ' extensions)\n')) | |
497 | return rst |
|
497 | return rst | |
498 |
|
498 | |||
499 | def helpextcmd(name): |
|
499 | def helpextcmd(name, subtopic=None): | |
500 | cmd, ext, mod = extensions.disabledcmd(ui, name, |
|
500 | cmd, ext, mod = extensions.disabledcmd(ui, name, | |
501 | ui.configbool('ui', 'strict')) |
|
501 | ui.configbool('ui', 'strict')) | |
502 | doc = gettext(mod.__doc__).splitlines()[0] |
|
502 | doc = gettext(mod.__doc__).splitlines()[0] | |
@@ -545,7 +545,7 b' def help_(ui, name, unknowncmd=False, fu' | |||||
545 | queries = (helptopic, helpcmd, helpext, helpextcmd) |
|
545 | queries = (helptopic, helpcmd, helpext, helpextcmd) | |
546 | for f in queries: |
|
546 | for f in queries: | |
547 | try: |
|
547 | try: | |
548 | rst = f(name) |
|
548 | rst = f(name, subtopic) | |
549 | break |
|
549 | break | |
550 | except error.UnknownCommand: |
|
550 | except error.UnknownCommand: | |
551 | pass |
|
551 | pass |
General Comments 0
You need to be logged in to leave comments.
Login now