Show More
@@ -3463,11 +3463,11 b' def debugrevspec(ui, repo, expr, **opts)' | |||||
3463 | ui.note(revset.prettyformat(tree), "\n") |
|
3463 | ui.note(revset.prettyformat(tree), "\n") | |
3464 | newtree = revset.findaliases(ui, tree) |
|
3464 | newtree = revset.findaliases(ui, tree) | |
3465 | if newtree != tree: |
|
3465 | if newtree != tree: | |
3466 | ui.note(revset.prettyformat(newtree), "\n") |
|
3466 | ui.note("* expanded:\n", revset.prettyformat(newtree), "\n") | |
3467 | tree = newtree |
|
3467 | tree = newtree | |
3468 | newtree = revset.foldconcat(tree) |
|
3468 | newtree = revset.foldconcat(tree) | |
3469 | if newtree != tree: |
|
3469 | if newtree != tree: | |
3470 | ui.note(revset.prettyformat(newtree), "\n") |
|
3470 | ui.note("* concatenated:\n", revset.prettyformat(newtree), "\n") | |
3471 | if opts["optimize"]: |
|
3471 | if opts["optimize"]: | |
3472 | weight, optimizedtree = revset.optimize(newtree, True) |
|
3472 | weight, optimizedtree = revset.optimize(newtree, True) | |
3473 | ui.note("* optimized:\n", revset.prettyformat(optimizedtree), "\n") |
|
3473 | ui.note("* optimized:\n", revset.prettyformat(optimizedtree), "\n") |
@@ -1590,6 +1590,7 b' aliases:' | |||||
1590 |
|
1590 | |||
1591 | $ try m |
|
1591 | $ try m | |
1592 | ('symbol', 'm') |
|
1592 | ('symbol', 'm') | |
|
1593 | * expanded: | |||
1593 | (func |
|
1594 | (func | |
1594 | ('symbol', 'merge') |
|
1595 | ('symbol', 'merge') | |
1595 | None) |
|
1596 | None) | |
@@ -1610,6 +1611,7 b' aliases:' | |||||
1610 | $ export HGPLAINEXCEPT |
|
1611 | $ export HGPLAINEXCEPT | |
1611 | $ try m |
|
1612 | $ try m | |
1612 | ('symbol', 'm') |
|
1613 | ('symbol', 'm') | |
|
1614 | * expanded: | |||
1613 | (func |
|
1615 | (func | |
1614 | ('symbol', 'merge') |
|
1616 | ('symbol', 'merge') | |
1615 | None) |
|
1617 | None) | |
@@ -1626,6 +1628,7 b' aliases:' | |||||
1626 | (func |
|
1628 | (func | |
1627 | ('symbol', 'p2') |
|
1629 | ('symbol', 'p2') | |
1628 | ('symbol', '.')) |
|
1630 | ('symbol', '.')) | |
|
1631 | * expanded: | |||
1629 | (func |
|
1632 | (func | |
1630 | ('symbol', 'p1') |
|
1633 | ('symbol', 'p1') | |
1631 | ('symbol', '.')) |
|
1634 | ('symbol', '.')) | |
@@ -1648,6 +1651,7 b' aliases:' | |||||
1648 | (func |
|
1651 | (func | |
1649 | ('symbol', 'p2') |
|
1652 | ('symbol', 'p2') | |
1650 | ('symbol', '.')) |
|
1653 | ('symbol', '.')) | |
|
1654 | * expanded: | |||
1651 | (func |
|
1655 | (func | |
1652 | ('symbol', 'p1') |
|
1656 | ('symbol', 'p1') | |
1653 | ('symbol', '.')) |
|
1657 | ('symbol', '.')) | |
@@ -1662,6 +1666,7 b' test alias recursion' | |||||
1662 |
|
1666 | |||
1663 | $ try sincem |
|
1667 | $ try sincem | |
1664 | ('symbol', 'sincem') |
|
1668 | ('symbol', 'sincem') | |
|
1669 | * expanded: | |||
1665 | (func |
|
1670 | (func | |
1666 | ('symbol', 'descendants') |
|
1671 | ('symbol', 'descendants') | |
1667 | (func |
|
1672 | (func | |
@@ -1697,6 +1702,7 b' test infinite recursion' | |||||
1697 | ('symbol', '1') |
|
1702 | ('symbol', '1') | |
1698 | ('symbol', '2'))) |
|
1703 | ('symbol', '2'))) | |
1699 | ('symbol', '3'))) |
|
1704 | ('symbol', '3'))) | |
|
1705 | * expanded: | |||
1700 | (or |
|
1706 | (or | |
1701 | ('symbol', '3') |
|
1707 | ('symbol', '3') | |
1702 | (or |
|
1708 | (or | |
@@ -1721,6 +1727,7 b' test nesting and variable passing' | |||||
1721 | (range |
|
1727 | (range | |
1722 | ('symbol', '2') |
|
1728 | ('symbol', '2') | |
1723 | ('symbol', '5'))) |
|
1729 | ('symbol', '5'))) | |
|
1730 | * expanded: | |||
1724 | (func |
|
1731 | (func | |
1725 | ('symbol', 'max') |
|
1732 | ('symbol', 'max') | |
1726 | (range |
|
1733 | (range | |
@@ -1749,6 +1756,7 b' test chained `or` operations are flatten' | |||||
1749 | (range |
|
1756 | (range | |
1750 | ('symbol', '2') |
|
1757 | ('symbol', '2') | |
1751 | ('symbol', '3')))) |
|
1758 | ('symbol', '3')))) | |
|
1759 | * expanded: | |||
1752 | (or |
|
1760 | (or | |
1753 | (range |
|
1761 | (range | |
1754 | ('symbol', '0') |
|
1762 | ('symbol', '0') | |
@@ -1782,6 +1790,7 b' far away.' | |||||
1782 | (range |
|
1790 | (range | |
1783 | ('symbol', '2') |
|
1791 | ('symbol', '2') | |
1784 | ('symbol', '5'))) |
|
1792 | ('symbol', '5'))) | |
|
1793 | * expanded: | |||
1785 | (func |
|
1794 | (func | |
1786 | ('symbol', 'descendants') |
|
1795 | ('symbol', 'descendants') | |
1787 | (func |
|
1796 | (func | |
@@ -1829,6 +1838,7 b' far away.' | |||||
1829 | (list |
|
1838 | (list | |
1830 | ('string', 'foo') |
|
1839 | ('string', 'foo') | |
1831 | ('symbol', 'tip'))) |
|
1840 | ('symbol', 'tip'))) | |
|
1841 | * expanded: | |||
1832 | (or |
|
1842 | (or | |
1833 | ('symbol', 'tip') |
|
1843 | ('symbol', 'tip') | |
1834 | (func |
|
1844 | (func | |
@@ -1848,6 +1858,7 b' far away.' | |||||
1848 | (range |
|
1858 | (range | |
1849 | ('symbol', '2') |
|
1859 | ('symbol', '2') | |
1850 | ('symbol', '5'))) |
|
1860 | ('symbol', '5'))) | |
|
1861 | * expanded: | |||
1851 | (func |
|
1862 | (func | |
1852 | ('symbol', 'reverse') |
|
1863 | ('symbol', 'reverse') | |
1853 | (func |
|
1864 | (func | |
@@ -1871,6 +1882,7 b' far away.' | |||||
1871 | ('symbol', '2') |
|
1882 | ('symbol', '2') | |
1872 | ('symbol', '3')) |
|
1883 | ('symbol', '3')) | |
1873 | ('symbol', 'date'))) |
|
1884 | ('symbol', 'date'))) | |
|
1885 | * expanded: | |||
1874 | (func |
|
1886 | (func | |
1875 | ('symbol', 'reverse') |
|
1887 | ('symbol', 'reverse') | |
1876 | (func |
|
1888 | (func | |
@@ -1915,6 +1927,7 b' far away.' | |||||
1915 | ('symbol', 'x') |
|
1927 | ('symbol', 'x') | |
1916 | ('symbol', 'x') |
|
1928 | ('symbol', 'x') | |
1917 | ('symbol', 'date'))) |
|
1929 | ('symbol', 'date'))) | |
|
1930 | * expanded: | |||
1918 | (func |
|
1931 | (func | |
1919 | ('symbol', 'reverse') |
|
1932 | ('symbol', 'reverse') | |
1920 | (func |
|
1933 | (func | |
@@ -2134,6 +2147,7 b' tests for concatenation of strings/symbo' | |||||
2134 | ('string', '5f5')) |
|
2147 | ('string', '5f5')) | |
2135 | ('symbol', '1ee')) |
|
2148 | ('symbol', '1ee')) | |
2136 | ('string', 'ce5')) |
|
2149 | ('string', 'ce5')) | |
|
2150 | * concatenated: | |||
2137 | ('string', '2785f51eece5') |
|
2151 | ('string', '2785f51eece5') | |
2138 | * set: |
|
2152 | * set: | |
2139 | <baseset [0]> |
|
2153 | <baseset [0]> | |
@@ -2148,6 +2162,7 b' tests for concatenation of strings/symbo' | |||||
2148 | ('string', '5f5') |
|
2162 | ('string', '5f5') | |
2149 | ('symbol', '1ee') |
|
2163 | ('symbol', '1ee') | |
2150 | ('string', 'ce5'))) |
|
2164 | ('string', 'ce5'))) | |
|
2165 | * expanded: | |||
2151 | (_concat |
|
2166 | (_concat | |
2152 | (_concat |
|
2167 | (_concat | |
2153 | (_concat |
|
2168 | (_concat | |
@@ -2155,6 +2170,7 b' tests for concatenation of strings/symbo' | |||||
2155 | ('string', '5f5')) |
|
2170 | ('string', '5f5')) | |
2156 | ('symbol', '1ee')) |
|
2171 | ('symbol', '1ee')) | |
2157 | ('string', 'ce5')) |
|
2172 | ('string', 'ce5')) | |
|
2173 | * concatenated: | |||
2158 | ('string', '2785f51eece5') |
|
2174 | ('string', '2785f51eece5') | |
2159 | * set: |
|
2175 | * set: | |
2160 | <baseset [0]> |
|
2176 | <baseset [0]> |
General Comments 0
You need to be logged in to leave comments.
Login now