| hg-reviewers |
There are a few failures here, mostly around formatting lists. I'll
fix that in a subsequent change.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| from __future__ import absolute_import, print_function | from __future__ import absolute_import, print_function | ||||
| from mercurial import ( | from mercurial import ( | ||||
| minirst, | minirst, | ||||
| ) | ) | ||||
| from mercurial.utils import ( | from mercurial.utils import ( | ||||
| stringutil, | stringutil, | ||||
| ) | ) | ||||
| def debugformat(text, form, **kwargs): | def debugformat(text, form, **kwargs): | ||||
| if form == 'html': | if form == b'html': | ||||
| print("html format:") | print("html format:") | ||||
| out = minirst.format(text, style=form, **kwargs) | out = minirst.format(text, style=form, **kwargs) | ||||
| else: | else: | ||||
| print("%d column format:" % form) | print("%d column format:" % form) | ||||
| out = minirst.format(text, width=form, **kwargs) | out = minirst.format(text, width=form, **kwargs) | ||||
| print("-" * 70) | print("-" * 70) | ||||
| if type(out) == tuple: | if type(out) == tuple: | ||||
| print(out[0][:-1]) | print(out[0][:-1].decode('utf8')) | ||||
| print("-" * 70) | print("-" * 70) | ||||
| print(stringutil.pprint(out[1], bprefix=False)) | print(stringutil.pprint(out[1], bprefix=False).decode('utf8')) | ||||
| else: | else: | ||||
| print(out[:-1]) | print(out[:-1].decode('utf8')) | ||||
| print("-" * 70) | print("-" * 70) | ||||
| print() | print() | ||||
| def debugformats(title, text, **kwargs): | def debugformats(title, text, **kwargs): | ||||
| print("== %s ==" % title) | print("== %s ==" % title) | ||||
| debugformat(text, 60, **kwargs) | debugformat(text, 60, **kwargs) | ||||
| debugformat(text, 30, **kwargs) | debugformat(text, 30, **kwargs) | ||||
| debugformat(text, 'html', **kwargs) | debugformat(text, b'html', **kwargs) | ||||
| paragraphs = b""" | paragraphs = b""" | ||||
| This is some text in the first paragraph. | This is some text in the first paragraph. | ||||
| A small indented paragraph. | A small indented paragraph. | ||||
| It is followed by some lines | It is followed by some lines | ||||
| containing random whitespace. | containing random whitespace. | ||||
| \n \n \nThe third and final paragraph. | \n \n \nThe third and final paragraph. | ||||
| """ | """ | ||||
| debugformats(b'paragraphs', paragraphs) | debugformats('paragraphs', paragraphs) | ||||
| definitions = b""" | definitions = b""" | ||||
| A Term | A Term | ||||
| Definition. The indented | Definition. The indented | ||||
| lines make up the definition. | lines make up the definition. | ||||
| Another Term | Another Term | ||||
| Another definition. The final line in the | Another definition. The final line in the | ||||
| definition determines the indentation, so | definition determines the indentation, so | ||||
| this will be indented with four spaces. | this will be indented with four spaces. | ||||
| A Nested/Indented Term | A Nested/Indented Term | ||||
| Definition. | Definition. | ||||
| """ | """ | ||||
| debugformats(b'definitions', definitions) | debugformats('definitions', definitions) | ||||
| literals = br""" | literals = br""" | ||||
| The fully minimized form is the most | The fully minimized form is the most | ||||
| convenient form:: | convenient form:: | ||||
| Hello | Hello | ||||
| literal | literal | ||||
| world | world | ||||
| In the partially minimized form a paragraph | In the partially minimized form a paragraph | ||||
| simply ends with space-double-colon. :: | simply ends with space-double-colon. :: | ||||
| //////////////////////////////////////// | //////////////////////////////////////// | ||||
| long un-wrapped line in a literal block | long un-wrapped line in a literal block | ||||
| \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ | \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ | ||||
| :: | :: | ||||
| This literal block is started with '::', | This literal block is started with '::', | ||||
| the so-called expanded form. The paragraph | the so-called expanded form. The paragraph | ||||
| with '::' disappears in the final output. | with '::' disappears in the final output. | ||||
| """ | """ | ||||
| debugformats(b'literals', literals) | debugformats('literals', literals) | ||||
| lists = b""" | lists = b""" | ||||
| - This is the first list item. | - This is the first list item. | ||||
| Second paragraph in the first list item. | Second paragraph in the first list item. | ||||
| - List items need not be separated | - List items need not be separated | ||||
| by a blank line. | by a blank line. | ||||
| Bullet lists are also detected: | Bullet lists are also detected: | ||||
| * This is the first bullet | * This is the first bullet | ||||
| * This is the second bullet | * This is the second bullet | ||||
| It has 2 lines | It has 2 lines | ||||
| * This is the third bullet | * This is the third bullet | ||||
| """ | """ | ||||
| debugformats(b'lists', lists) | debugformats('lists', lists) | ||||
| options = b""" | options = b""" | ||||
| There is support for simple option lists, | There is support for simple option lists, | ||||
| but only with long options: | but only with long options: | ||||
| -X, --exclude filter an option with a short and long option with an argument | -X, --exclude filter an option with a short and long option with an argument | ||||
| -I, --include an option with both a short option and a long option | -I, --include an option with both a short option and a long option | ||||
| --all Output all. | --all Output all. | ||||
| The next paragraph looks like an option list, but lacks the two-space | The next paragraph looks like an option list, but lacks the two-space | ||||
| marker after the option. It is treated as a normal paragraph: | marker after the option. It is treated as a normal paragraph: | ||||
| --foo bar baz | --foo bar baz | ||||
| """ | """ | ||||
| debugformats(b'options', options) | debugformats('options', options) | ||||
| fields = b""" | fields = b""" | ||||
| :a: First item. | :a: First item. | ||||
| :ab: Second item. Indentation and wrapping | :ab: Second item. Indentation and wrapping | ||||
| is handled automatically. | is handled automatically. | ||||
| Next list: | Next list: | ||||
| :small: The larger key below triggers full indentation here. | :small: The larger key below triggers full indentation here. | ||||
| :much too large: This key is big enough to get its own line. | :much too large: This key is big enough to get its own line. | ||||
| """ | """ | ||||
| debugformats(b'fields', fields) | debugformats('fields', fields) | ||||
| containers = b""" | containers = b""" | ||||
| Normal output. | Normal output. | ||||
| .. container:: debug | .. container:: debug | ||||
| Initial debug output. | Initial debug output. | ||||
| .. container:: verbose | .. container:: verbose | ||||
| Verbose output. | Verbose output. | ||||
| .. container:: debug | .. container:: debug | ||||
| Debug output. | Debug output. | ||||
| """ | """ | ||||
| debugformats(b'containers (normal)', containers) | debugformats('containers (normal)', containers) | ||||
| debugformats(b'containers (verbose)', containers, keep=['verbose']) | debugformats('containers (verbose)', containers, keep=[b'verbose']) | ||||
| debugformats(b'containers (debug)', containers, keep=['debug']) | debugformats('containers (debug)', containers, keep=[b'debug']) | ||||
| debugformats(b'containers (verbose debug)', containers, | debugformats('containers (verbose debug)', containers, | ||||
| keep=['verbose', 'debug']) | keep=[b'verbose', b'debug']) | ||||
| roles = b"""Please see :hg:`add`.""" | roles = b"""Please see :hg:`add`.""" | ||||
| debugformats(b'roles', roles) | debugformats('roles', roles) | ||||
| sections = b""" | sections = b""" | ||||
| Title | Title | ||||
| ===== | ===== | ||||
| Section | Section | ||||
| ------- | ------- | ||||
| Subsection | Subsection | ||||
| '''''''''' | '''''''''' | ||||
| Markup: ``foo`` and :hg:`help` | Markup: ``foo`` and :hg:`help` | ||||
| ------------------------------ | ------------------------------ | ||||
| """ | """ | ||||
| debugformats(b'sections', sections) | debugformats('sections', sections) | ||||
| admonitions = b""" | admonitions = b""" | ||||
| .. note:: | .. note:: | ||||
| This is a note | This is a note | ||||
| - Bullet 1 | - Bullet 1 | ||||
| - Bullet 2 | - Bullet 2 | ||||
| .. warning:: This is a warning Second | .. warning:: This is a warning Second | ||||
| input line of warning | input line of warning | ||||
| .. danger:: | .. danger:: | ||||
| This is danger | This is danger | ||||
| """ | """ | ||||
| debugformats(b'admonitions', admonitions) | debugformats('admonitions', admonitions) | ||||
| comments = b""" | comments = b""" | ||||
| Some text. | Some text. | ||||
| .. A comment | .. A comment | ||||
| .. An indented comment | .. An indented comment | ||||
| Some indented text. | Some indented text. | ||||
| .. | .. | ||||
| Empty comment above | Empty comment above | ||||
| """ | """ | ||||
| debugformats(b'comments', comments) | debugformats('comments', comments) | ||||
| data = [[b'a', b'b', b'c'], | data = [[b'a', b'b', b'c'], | ||||
| [b'1', b'2', b'3'], | [b'1', b'2', b'3'], | ||||
| [b'foo', b'bar', b'baz this list is very very very long man']] | [b'foo', b'bar', b'baz this list is very very very long man']] | ||||
| rst = minirst.maketable(data, 2, True) | rst = minirst.maketable(data, 2, True) | ||||
| table = b''.join(rst) | table = b''.join(rst) | ||||
| print(table) | print(table.decode('utf8')) | ||||
| debugformats(b'table', table) | debugformats('table', table) | ||||
| data = [[b's', b'long', b'line\ngoes on here'], | data = [[b's', b'long', b'line\ngoes on here'], | ||||
| [b'', b'xy', b'tried to fix here\n by indenting']] | [b'', b'xy', b'tried to fix here\n by indenting']] | ||||
| rst = minirst.maketable(data, 1, False) | rst = minirst.maketable(data, 1, False) | ||||
| table = b''.join(rst) | table = b''.join(rst) | ||||
| print(table) | print(table.decode('utf8')) | ||||
| debugformats(b'table+nl', table) | debugformats('table+nl', table) | ||||