Mercurial > hg-stable
changeset 16783:bb446969efd4
help: inline helper function used once only
| author | Olav Reinert <seroton10@gmail.com> |
|---|---|
| date | Tue, 22 May 2012 22:08:41 +0200 |
| parents | ba512212dab1 |
| children | 12a852c7c763 |
| files | mercurial/commands.py |
| diffstat | 1 files changed, 18 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Tue May 22 22:08:41 2012 +0200 +++ b/mercurial/commands.py Tue May 22 22:08:41 2012 +0200 @@ -3089,26 +3089,6 @@ textwidth = min(ui.termwidth(), 80) - 2 - def addglobalopts(optlist): - if ui.quiet: - return [] - - if ui.verbose: - optlist.append((_("global options:"), globalopts)) - if name == 'shortlist': - optlist.append((_('use "hg help" for the full list ' - 'of commands'), ())) - else: - if name == 'shortlist': - msg = _('use "hg help" for the full list of commands ' - 'or "hg -v" for details') - elif name and not full: - msg = _('use "hg help %s" to show the full help text') % name - else: - msg = _('use "hg -v help%s" to show builtin aliases and ' - 'global options') % (name and " " + name or "") - optlist.append((msg, ())) - def helpcmd(name): try: aliases, entry = cmdutil.findcmd(name, table, strict=unknowncmd) @@ -3251,7 +3231,24 @@ ui.write(" %-*s %s\n" % (topics_len, t, desc)) optlist = [] - addglobalopts(optlist) + if not ui.quiet: + if ui.verbose: + optlist.append((_("global options:"), globalopts)) + if name == 'shortlist': + optlist.append((_('use "hg help" for the full list ' + 'of commands'), ())) + else: + if name == 'shortlist': + msg = _('use "hg help" for the full list of commands ' + 'or "hg -v" for details') + elif name and not full: + msg = _('use "hg help %s" to show the full help ' + 'text') % name + else: + msg = _('use "hg -v help%s" to show builtin aliases and ' + 'global options') % (name and " " + name or "") + optlist.append((msg, ())) + ui.write(help.opttext(optlist, textwidth, ui.verbose)) def helptopic(name):