Comments
Patch
@@ -50,9 +50,6 @@
allopts[-1] += " <%s[+]>" % optlabel
elif (default is not None) and not isinstance(default, bool):
allopts[-1] += " <%s>" % optlabel
- if '\n' in desc:
- # only remove line breaks and indentation
- desc = ' '.join(l.lstrip() for l in desc.split('\n'))
desc += default and _(" (default: %s)") % default or ""
yield (", ".join(allopts), desc)
@@ -91,7 +88,8 @@
desc for e
<BLANKLINE>
-s, --some
- a description on several lines (default: True)
+ a description
+ on several lines (default: True)
<BLANKLINE>
Commands
...
@@ -100,7 +98,14 @@
ui.write(minirst.section(_("Options")))
multioccur = False
for optstr, desc in get_opts(globalopts):
- ui.write("%s\n %s\n\n" % (optstr, desc))
+ if '\n' in desc: # desc may have multiple lines
+ lines = desc.split('\n')
+ ui.write("%s\n %s\n" % (optstr, lines[0]))
+ for line in lines[1:]:
+ ui.write(" %s\n" % line)
+ ui.write("\n")
+ else:
+ ui.write("%s\n %s\n\n" % (optstr, desc))
if optstr.endswith("[+]>"):
multioccur = True
if multioccur:
@@ -181,7 +186,8 @@
<BLANKLINE>
Options:
<BLANKLINE>
- -o, --opt <VALUE> this is a long description with several lines (default: 3)
+ -o, --opt <VALUE> this is a long description
+ with several lines (default: 3)
--p desc for p
<BLANKLINE>
"""
@@ -216,7 +222,12 @@
ui.write(_("Options:\n\n"))
multioccur = False
for optstr, desc in opt_output:
- if desc:
+ if '\n' in desc: # desc may have multiple lines
+ lines = desc.split('\n')
+ s = "%-*s %s" % (opts_len, optstr, lines[0] + '\n')
+ for line in lines[1:]:
+ s += "%s %s" % (' ' * opts_len, line.lstrip(' ') + '\n')
+ elif desc:
s = "%-*s %s" % (opts_len, optstr, desc)
else:
s = optstr