Mercurial > hg
view tests/test-minirst.py @ 9827:4fe9ca519637
mdiff: fix diff -b/B/w on mixed whitespace hunks (issue127)
Previous code was computing hunks then checking if these hunks could be ignored
when taking whitespace/blank-lines options in accounts. This approach is simple
but fails with hunks containing both whitespace and non-whitespace changes, the
whole hunk is emitted while it can be mostly made of whitespace. The new
version normalize the whitespaces before hunk generation, and test for
blank-lines afterwards.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Wed, 11 Nov 2009 18:31:42 +0100 |
parents | 75cff8f12910 |
children | a1ae0ed78d1a |
line wrap: on
line source
#!/usr/bin/env python from mercurial import minirst def debugformat(title, text, width): print "%s formatted to fit within %d characters:" % (title, width) print "-" * 70 print minirst.format(text, width) print "-" * 70 print paragraphs = """ This is some text in the first paragraph. A small indented paragraph. It is followed by some lines containing random whitespace. The third and final paragraph. """ debugformat('paragraphs', paragraphs, 60) debugformat('paragraphs', paragraphs, 30) definitions = """ A Term Definition. The indented lines make up the definition. Another Term Another definition. The final line in the definition determines the indentation, so this will be indented with four spaces. A Nested/Indented Term Definition. """ debugformat('definitions', definitions, 60) debugformat('definitions', definitions, 30) literals = r""" The fully minimized form is the most convenient form:: Hello literal world In the partially minimized form a paragraph simply ends with space-double-colon. :: //////////////////////////////////////// long un-wrapped line in a literal block \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\ :: This literal block is started with '::', the so-called expanded form. The paragraph with '::' disappears in the final output. """ debugformat('literals', literals, 60) debugformat('literals', literals, 30) lists = """ - This is the first list item. Second paragraph in the first list item. - List items need not be separated by a blank line. - And will be rendered without one in any case. We can have indented lists: - This is an indented list item - Another indented list item:: - A literal block in the middle of an indented list. (The above is not a list item since we are in the literal block.) :: Literal block with no indentation (apart from the two spaces added to all literal blocks). 1. This is an enumerated list (first item). 2. Continuing with the second item. (1) foo (2) bar 1) Another 2) List """ debugformat('lists', lists, 60) debugformat('lists', lists, 30) options = """ There is support for simple option lists, but only with long options: --all Output all. --both Output both (this description is quite long). --long Output all day long. --par This option has two paragraphs in its description. This is the first. This is the second. Blank lines may be omitted between options (as above) or left in (as here). The next paragraph looks like an option list, but lacks the two-space marker after the option. It is treated as a normal paragraph: --foo bar baz """ debugformat('options', options, 60) debugformat('options', options, 30) fields = """ Field lists give a simple two-column layout: :key: The whitespace following the key is significant for the wrapping of this text. :another key: More text. The indentation on the following lines is not significant. """ debugformat('fields', fields, 60) debugformat('fields', fields, 30)