comparison mercurial/help.py @ 39308:9b800601701c

help: inline minirst.format()

I'm going to make minirst.format() always returns a formatted text, not
text | (text, pruned).

39307:92e9aa38a578

    if textwidth <= 0 or termwidth < textwidth:
        textwidth = termwidth
    text = help_(ui, commands, name,
                 subtopic=subtopic, unknowncmd=unknowncmd, full=full, **opts)

    formatted, pruned = minirst.format(text, textwidth, keep=keep,
                                       section=section)

    # We could have been given a weird ".foo" section without a name
    # to look for, or we could have simply failed to found "foo.bar"
    # because bar isn't a section of foo
    if section and not (formatted and name):

    if 'verbose' in pruned:
        keep.append('omitted')
    else:
        keep.append('notomitted')
    formatted, pruned = minirst.format(text, textwidth, keep=keep,
                                       section=section)
    return formatted

39308:9b800601701c

    if textwidth <= 0 or termwidth < textwidth:
        textwidth = termwidth
    text = help_(ui, commands, name,
                 subtopic=subtopic, unknowncmd=unknowncmd, full=full, **opts)

    blocks, pruned = minirst.parse(text, keep=keep)
    if section:
        blocks = minirst.filtersections(blocks, section)
    formatted = minirst.formatplain(blocks, textwidth)

    # We could have been given a weird ".foo" section without a name
    # to look for, or we could have simply failed to found "foo.bar"
    # because bar isn't a section of foo
    if section and not (formatted and name):

    if 'verbose' in pruned:
        keep.append('omitted')
    else:
        keep.append('notomitted')
    blocks, pruned = minirst.parse(text, keep=keep)
    if section:
        blocks = minirst.filtersections(blocks, section)
    return minirst.formatplain(blocks, textwidth)