diff --git a/mercurial/minirst.py b/mercurial/minirst.py --- a/mercurial/minirst.py +++ b/mercurial/minirst.py @@ -564,7 +564,7 @@ def formathtml(blocks): l = [] for v in row: l.append('%s' % escape(v)) - t.append(' %s\n' % ''.join(l)) + t.append('%s\n' % '\n'.join(l)) out.append('\n%s
\n' % ''.join(t)) elif btype == 'definition': openlist('dl', level) diff --git a/tests/test-help.t b/tests/test-help.t --- a/tests/test-help.t +++ b/tests/test-help.t @@ -1531,10 +1531,18 @@ Dish up an empty repo; serve it cold. options:

- - - - + + + + + + + + + + + +
-I--include PATTERN [+]include names matching the given patterns
-X--exclude PATTERN [+]exclude names matching the given patterns
-S--subreposrecurse into subrepositories
-n--dry-rundo not perform actions, just print output
-I--include PATTERN [+]include names matching the given patterns
-X--exclude PATTERN [+]exclude names matching the given patterns
-S--subreposrecurse into subrepositories
-n--dry-rundo not perform actions, just print output

[+] marked option can be specified multiple times @@ -1543,22 +1551,54 @@ Dish up an empty repo; serve it cold. global options:

- - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
-R--repository REPOrepository root directory or name of overlay bundle file
--cwd DIRchange working directory
-y--noninteractivedo not prompt, automatically pick the first choice for all prompts
-q--quietsuppress output
-v--verboseenable additional output
--config CONFIG [+]set/override config option (use 'section.name=value')
--debugenable debugging output
--debuggerstart debugger
--encoding ENCODEset the charset encoding (default: ascii)
--encodingmode MODEset the charset encoding mode (default: strict)
--tracebackalways print a traceback on exception
--timetime how long the command takes
--profileprint command execution profile
--versionoutput version information and exit
-h--helpdisplay help and exit
--hiddenconsider hidden changesets
-R--repository REPOrepository root directory or name of overlay bundle file
--cwd DIRchange working directory
-y--noninteractivedo not prompt, automatically pick the first choice for all prompts
-q--quietsuppress output
-v--verboseenable additional output
--config CONFIG [+]set/override config option (use 'section.name=value')
--debugenable debugging output
--debuggerstart debugger
--encoding ENCODEset the charset encoding (default: ascii)
--encodingmode MODEset the charset encoding mode (default: strict)
--tracebackalways print a traceback on exception
--timetime how long the command takes
--profileprint command execution profile
--versionoutput version information and exit
-h--helpdisplay help and exit
--hiddenconsider hidden changesets

[+] marked option can be specified multiple times @@ -1643,10 +1683,18 @@ Dish up an empty repo; serve it cold. options:

- - - - + + + + + + + + + + + +
-A--afterrecord delete for missing files
-f--forceremove (and delete) file even if added or modified
-I--include PATTERN [+]include names matching the given patterns
-X--exclude PATTERN [+]exclude names matching the given patterns
-A--afterrecord delete for missing files
-f--forceremove (and delete) file even if added or modified
-I--include PATTERN [+]include names matching the given patterns
-X--exclude PATTERN [+]exclude names matching the given patterns

[+] marked option can be specified multiple times @@ -1655,22 +1703,54 @@ Dish up an empty repo; serve it cold. global options:

- - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
-R--repository REPOrepository root directory or name of overlay bundle file
--cwd DIRchange working directory
-y--noninteractivedo not prompt, automatically pick the first choice for all prompts
-q--quietsuppress output
-v--verboseenable additional output
--config CONFIG [+]set/override config option (use 'section.name=value')
--debugenable debugging output
--debuggerstart debugger
--encoding ENCODEset the charset encoding (default: ascii)
--encodingmode MODEset the charset encoding mode (default: strict)
--tracebackalways print a traceback on exception
--timetime how long the command takes
--profileprint command execution profile
--versionoutput version information and exit
-h--helpdisplay help and exit
--hiddenconsider hidden changesets
-R--repository REPOrepository root directory or name of overlay bundle file
--cwd DIRchange working directory
-y--noninteractivedo not prompt, automatically pick the first choice for all prompts
-q--quietsuppress output
-v--verboseenable additional output
--config CONFIG [+]set/override config option (use 'section.name=value')
--debugenable debugging output
--debuggerstart debugger
--encoding ENCODEset the charset encoding (default: ascii)
--encodingmode MODEset the charset encoding mode (default: strict)
--tracebackalways print a traceback on exception
--timetime how long the command takes
--profileprint command execution profile
--versionoutput version information and exit
-h--helpdisplay help and exit
--hiddenconsider hidden changesets

[+] marked option can be specified multiple times diff --git a/tests/test-minirst.py.out b/tests/test-minirst.py.out --- a/tests/test-minirst.py.out +++ b/tests/test-minirst.py.out @@ -758,9 +758,15 @@ 30 column format: html format: ---------------------------------------------------------------------- - - - + + + + + + + + +
abc
123
foobarbaz this list is very very very long man
abc
123
foobarbaz this list is very very very long man
----------------------------------------------------------------------