hgweb: make help verbose again (
issue3899)
Due to regression introduced in
f5db3092790f, help in hgweb
was rendered in non-verbose form (
issue3899)
--- a/mercurial/templater.py Sun Apr 21 17:33:51 2013 -0500
+++ b/mercurial/templater.py Mon Apr 22 12:27:56 2013 +0400
@@ -299,7 +299,7 @@
text = stringify(args[0][0](context, mapping, args[0][1]))
style = stringify(args[1][0](context, mapping, args[1][1]))
- return minirst.format(text, style=style)
+ return minirst.format(text, style=style, keep=['verbose'])
methods = {
"string": lambda e, c: (runstring, e[1]),
--- a/tests/test-help.t Sun Apr 21 17:33:51 2013 -0500
+++ b/tests/test-help.t Mon Apr 22 12:27:56 2013 +0400
@@ -1525,6 +1525,20 @@
If no names are given, add all files to the repository.
</p>
<p>
+ An example showing how new (unknown) files are added
+ automatically by "hg add":
+ </p>
+ <pre>
+ \$ ls (re)
+ foo.c
+ \$ hg status (re)
+ ? foo.c
+ \$ hg add (re)
+ adding foo.c
+ \$ hg status (re)
+ A foo.c
+ </pre>
+ <p>
Returns 0 if all files are successfully added.
</p>
<p>
@@ -1677,6 +1691,50 @@
files, see "hg forget".
</p>
<p>
+ -A/--after can be used to remove only files that have already
+ been deleted, -f/--force can be used to force deletion, and -Af
+ can be used to remove files from the next revision without
+ deleting them from the working directory.
+ </p>
+ <p>
+ The following table details the behavior of remove for different
+ file states (columns) and option combinations (rows). The file
+ states are Added [A], Clean [C], Modified [M] and Missing [!]
+ (as reported by "hg status"). The actions are Warn, Remove
+ (from branch) and Delete (from disk):
+ </p>
+ <table>
+ <tr><td></td>
+ <td>A</td>
+ <td>C</td>
+ <td>M</td>
+ <td>!</td></tr>
+ <tr><td>none</td>
+ <td>W</td>
+ <td>RD</td>
+ <td>W</td>
+ <td>R</td></tr>
+ <tr><td>-f</td>
+ <td>R</td>
+ <td>RD</td>
+ <td>RD</td>
+ <td>R</td></tr>
+ <tr><td>-A</td>
+ <td>W</td>
+ <td>W</td>
+ <td>W</td>
+ <td>R</td></tr>
+ <tr><td>-Af</td>
+ <td>R</td>
+ <td>R</td>
+ <td>R</td>
+ <td>R</td></tr>
+ </table>
+ <p>
+ Note that remove never deletes files in Added [A] state from the
+ working directory, not even if option --force is specified.
+ </p>
+ <p>
Returns 0 on success, 1 if any warnings encountered.
</p>
<p>