| hg-reviewers |
If we start adding : in command names… we need minirst to not choke on them.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/minirst.py (4 lines) | |||
| M | tests/test-minirst.py (2 lines) | |||
| M | tests/test-minirst.py.out (9 lines) |
| i += 1 | i += 1 | ||||
| return blocks | return blocks | ||||
| _bulletre = re.compile(br'(\*|-|[0-9A-Za-z]+\.|\(?[0-9A-Za-z]+\)|\|) ') | _bulletre = re.compile(br'(\*|-|[0-9A-Za-z]+\.|\(?[0-9A-Za-z]+\)|\|) ') | ||||
| _optionre = re.compile( | _optionre = re.compile( | ||||
| br'^(-([a-zA-Z0-9]), )?(--[a-z0-9-]+)' br'((.*) +)(.*)$' | br'^(-([a-zA-Z0-9]), )?(--[a-z0-9-]+)' br'((.*) +)(.*)$' | ||||
| ) | ) | ||||
| _fieldre = re.compile(br':(?![: ])([^:]*)(?<! ):[ ]+(.*)') | _fieldre = re.compile(br':(?![: ])((?:\:|[^:])*)(?<! ):[ ]+(.*)') | ||||
| _definitionre = re.compile(br'[^ ]') | _definitionre = re.compile(br'[^ ]') | ||||
| _tablere = re.compile(br'(=+\s+)*=+') | _tablere = re.compile(br'(=+\s+)*=+') | ||||
| def splitparagraphs(blocks): | def splitparagraphs(blocks): | ||||
| """Split paragraphs into lists.""" | """Split paragraphs into lists.""" | ||||
| # Tuples with (list type, item regexp, single line items?). Order | # Tuples with (list type, item regexp, single line items?). Order | ||||
| # matters: definition lists has the least specific regexp and must | # matters: definition lists has the least specific regexp and must | ||||
| i += 1 | i += 1 | ||||
| continue | continue | ||||
| j = i | j = i | ||||
| while j < len(blocks) and blocks[j][b'type'] == b'field': | while j < len(blocks) and blocks[j][b'type'] == b'field': | ||||
| m = _fieldre.match(blocks[j][b'lines'][0]) | m = _fieldre.match(blocks[j][b'lines'][0]) | ||||
| key, rest = m.groups() | key, rest = m.groups() | ||||
| blocks[j][b'lines'][0] = rest | blocks[j][b'lines'][0] = rest | ||||
| blocks[j][b'key'] = key | blocks[j][b'key'] = key.replace(br'\:', b':') | ||||
| j += 1 | j += 1 | ||||
| i = j + 1 | i = j + 1 | ||||
| return blocks | return blocks | ||||
| def updateoptionlists(blocks): | def updateoptionlists(blocks): | ||||
| """ | """ | ||||
| debugformats('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. | ||||
| :c\:d: a key with colon | |||||
| :efg\:\:hh: a key with many colon | |||||
| 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('fields', fields) | debugformats('fields', fields) | ||||
| ---------------------------------------------------------------------- | ---------------------------------------------------------------------- | ||||
| == fields == | == fields == | ||||
| 60 column format: | 60 column format: | ||||
| ---------------------------------------------------------------------- | ---------------------------------------------------------------------- | ||||
| a First item. | a First item. | ||||
| ab Second item. Indentation and wrapping is | ab Second item. Indentation and wrapping is | ||||
| handled automatically. | handled automatically. | ||||
| c:d a key with colon | |||||
| efg::hh a key with many colon | |||||
| Next list: | Next list: | ||||
| small The larger key below triggers full indentation | small The larger key below triggers full indentation | ||||
| here. | here. | ||||
| much too large | much too large | ||||
| This key is big enough to get its own line. | This key is big enough to get its own line. | ||||
| ---------------------------------------------------------------------- | ---------------------------------------------------------------------- | ||||
| 30 column format: | 30 column format: | ||||
| ---------------------------------------------------------------------- | ---------------------------------------------------------------------- | ||||
| a First item. | a First item. | ||||
| ab Second item. | ab Second item. | ||||
| Indentation and | Indentation and | ||||
| wrapping is | wrapping is | ||||
| handled | handled | ||||
| automatically. | automatically. | ||||
| c:d a key with colon | |||||
| efg::hh a key with many | |||||
| colon | |||||
| Next list: | Next list: | ||||
| small The larger key | small The larger key | ||||
| below triggers | below triggers | ||||
| full indentation | full indentation | ||||
| here. | here. | ||||
| much too large | much too large | ||||
| This key is big | This key is big | ||||
| enough to get | enough to get | ||||
| its own line. | its own line. | ||||
| ---------------------------------------------------------------------- | ---------------------------------------------------------------------- | ||||
| html format: | html format: | ||||
| ---------------------------------------------------------------------- | ---------------------------------------------------------------------- | ||||
| <dl> | <dl> | ||||
| <dt>a | <dt>a | ||||
| <dd>First item. | <dd>First item. | ||||
| <dt>ab | <dt>ab | ||||
| <dd>Second item. Indentation and wrapping is handled automatically. | <dd>Second item. Indentation and wrapping is handled automatically. | ||||
| <dt>c:d | |||||
| <dd>a key with colon | |||||
| <dt>efg::hh | |||||
| <dd>a key with many colon | |||||
| </dl> | </dl> | ||||
| <p> | <p> | ||||
| Next list: | Next list: | ||||
| </p> | </p> | ||||
| <dl> | <dl> | ||||
| <dt>small | <dt>small | ||||
| <dd>The larger key below triggers full indentation here. | <dd>The larger key below triggers full indentation here. | ||||
| <dt>much too large | <dt>much too large | ||||