##// END OF EJS Templates
hgweb: make help verbose again (issue3899)...
Alexander Plavin -
r19079:1e433b54 stable
parent child Browse files
Show More
@@ -299,7 +299,7 b' def rstdoc(context, mapping, args):'
299 text = stringify(args[0][0](context, mapping, args[0][1]))
299 text = stringify(args[0][0](context, mapping, args[0][1]))
300 style = stringify(args[1][0](context, mapping, args[1][1]))
300 style = stringify(args[1][0](context, mapping, args[1][1]))
301
301
302 return minirst.format(text, style=style)
302 return minirst.format(text, style=style, keep=['verbose'])
303
303
304 methods = {
304 methods = {
305 "string": lambda e, c: (runstring, e[1]),
305 "string": lambda e, c: (runstring, e[1]),
@@ -1525,6 +1525,20 b' Dish up an empty repo; serve it cold.'
1525 If no names are given, add all files to the repository.
1525 If no names are given, add all files to the repository.
1526 </p>
1526 </p>
1527 <p>
1527 <p>
1528 An example showing how new (unknown) files are added
1529 automatically by &quot;hg add&quot;:
1530 </p>
1531 <pre>
1532 \$ ls (re)
1533 foo.c
1534 \$ hg status (re)
1535 ? foo.c
1536 \$ hg add (re)
1537 adding foo.c
1538 \$ hg status (re)
1539 A foo.c
1540 </pre>
1541 <p>
1528 Returns 0 if all files are successfully added.
1542 Returns 0 if all files are successfully added.
1529 </p>
1543 </p>
1530 <p>
1544 <p>
@@ -1677,6 +1691,50 b' Dish up an empty repo; serve it cold.'
1677 files, see &quot;hg forget&quot;.
1691 files, see &quot;hg forget&quot;.
1678 </p>
1692 </p>
1679 <p>
1693 <p>
1694 -A/--after can be used to remove only files that have already
1695 been deleted, -f/--force can be used to force deletion, and -Af
1696 can be used to remove files from the next revision without
1697 deleting them from the working directory.
1698 </p>
1699 <p>
1700 The following table details the behavior of remove for different
1701 file states (columns) and option combinations (rows). The file
1702 states are Added [A], Clean [C], Modified [M] and Missing [!]
1703 (as reported by &quot;hg status&quot;). The actions are Warn, Remove
1704 (from branch) and Delete (from disk):
1705 </p>
1706 <table>
1707 <tr><td></td>
1708 <td>A</td>
1709 <td>C</td>
1710 <td>M</td>
1711 <td>!</td></tr>
1712 <tr><td>none</td>
1713 <td>W</td>
1714 <td>RD</td>
1715 <td>W</td>
1716 <td>R</td></tr>
1717 <tr><td>-f</td>
1718 <td>R</td>
1719 <td>RD</td>
1720 <td>RD</td>
1721 <td>R</td></tr>
1722 <tr><td>-A</td>
1723 <td>W</td>
1724 <td>W</td>
1725 <td>W</td>
1726 <td>R</td></tr>
1727 <tr><td>-Af</td>
1728 <td>R</td>
1729 <td>R</td>
1730 <td>R</td>
1731 <td>R</td></tr>
1732 </table>
1733 <p>
1734 Note that remove never deletes files in Added [A] state from the
1735 working directory, not even if option --force is specified.
1736 </p>
1737 <p>
1680 Returns 0 on success, 1 if any warnings encountered.
1738 Returns 0 on success, 1 if any warnings encountered.
1681 </p>
1739 </p>
1682 <p>
1740 <p>
General Comments 0
You need to be logged in to leave comments. Login now