Show More
@@ -1696,7 +1696,7 b' def debugdag(ui, repo, file_=None, *revs' | |||
|
1696 | 1696 | """format the changelog or an index DAG as a concise textual description |
|
1697 | 1697 | |
|
1698 | 1698 | If you pass a revlog index, the revlog's DAG is emitted. If you list |
|
1699 |
revision numbers, they get label |
|
|
1699 | revision numbers, they get labeled in the output as rN. | |
|
1700 | 1700 | |
|
1701 | 1701 | Otherwise, the changelog DAG of the current repo is emitted. |
|
1702 | 1702 | """ |
@@ -56,13 +56,13 b' def parsedag(desc):' | |||
|
56 | 56 | ... :forkhere # a label for the last of the 3 nodes from above |
|
57 | 57 | ... +5 # 5 more nodes on one branch |
|
58 | 58 | ... :mergethis # label again |
|
59 |
... <forkhere # set default parent to label |
|
|
59 | ... <forkhere # set default parent to labeled fork node | |
|
60 | 60 | ... +10 # 10 more nodes on a parallel branch |
|
61 | 61 | ... @stable # following nodes will be annotated as "stable" |
|
62 | 62 | ... +5 # 5 nodes in stable |
|
63 | 63 | ... !addfile # custom command; could trigger new file in next node |
|
64 | 64 | ... +2 # two more nodes |
|
65 |
... /mergethis # merge last node with label |
|
|
65 | ... /mergethis # merge last node with labeled node | |
|
66 | 66 | ... +4 # 4 more nodes descending from merge node |
|
67 | 67 | ... |
|
68 | 68 | ... """))) |
@@ -13,7 +13,7 b'' | |||
|
13 | 13 | # tokenizer is an iterator that returns type, value pairs |
|
14 | 14 | # elements is a mapping of types to binding strength, prefix and infix actions |
|
15 | 15 | # an action is a tree node name, a tree label, and an optional match |
|
16 |
# __call__(program) parses program into a label |
|
|
16 | # __call__(program) parses program into a labeled tree | |
|
17 | 17 | |
|
18 | 18 | import error |
|
19 | 19 | from i18n import _ |
General Comments 0
You need to be logged in to leave comments.
Login now