minirst: indent literal blocks with two spaces

The vast majority* of them are formatted like this in the source, so
this basically reverts the output to how it looked before we got the
minirst parser.

*: the help on templating use four spaces for some examples and will
   now shown with an indentation of just two spaces.

mercurial/minirst.py

@@ -243,7 +243,10 b' def formatblock(block, width):'
     indent = ' ' * block['indent']
     if block['type'] == 'margin':
         return ''
-    elif block['type'] in ('literal', 'section'):
+    elif block['type'] == 'literal':
+        indent += '  '
+        return indent + ('\n' + indent).join(block['lines'])
+    elif block['type'] == 'section':
         return indent + ('\n' + indent).join(block['lines'])
     elif block['type'] == 'definition':
         term = indent + block['lines'][0]

tests/test-minirst.py

@@ -106,7 +106,8 b' We can have indented lists:'
 
 ::
 
-  Literal block with no indentation.
+  Literal block with no indentation (apart from
+  the two spaces added to all literal blocks).
 """
 
 debugformat('lists', lists, 60)

tests/test-minirst.py.out

@@ -123,7 +123,8 b' We can have indented lists:'
 
     (The above is not a list item since we are in the literal block.)
 
-Literal block with no indentation.
+  Literal block with no indentation (apart from
+  the two spaces added to all literal blocks).
 ----------------------------------------------------------------------
 
 lists formatted to fit within 30 characters:
@@ -150,7 +151,8 b' We can have indented lists:'
 
     (The above is not a list item since we are in the literal block.)
 
-Literal block with no indentation.
+  Literal block with no indentation (apart from
+  the two spaces added to all literal blocks).
 ----------------------------------------------------------------------
 
 options formatted to fit within 60 characters: