1722 Test --follow on a directory |
1722 Test --follow on a directory |
1723 |
1723 |
1724 $ hg up -q '.^' |
1724 $ hg up -q '.^' |
1725 $ testlog -f dir |
1725 $ testlog -f dir |
1726 [] |
1726 [] |
1727 (and |
1727 (func |
1728 (func |
1728 (symbol '_matchfiles') |
1729 (symbol 'ancestors') |
1729 (list |
1730 (symbol '.')) |
1730 (string 'r:') |
1731 (func |
1731 (string 'd:relpath') |
1732 (symbol '_matchfiles') |
1732 (string 'p:dir'))) |
1733 (list |
|
1734 (string 'r:') |
|
1735 (string 'd:relpath') |
|
1736 (string 'p:dir')))) |
|
1737 <filteredset |
1733 <filteredset |
1738 <filteredset |
1734 <generatorsetdesc->, |
1739 <spanset- 0:4>, |
|
1740 <generatorsetdesc+>>, |
|
1741 <matchfiles patterns=['dir'], include=[] exclude=[], default='relpath', rev=None>> |
1735 <matchfiles patterns=['dir'], include=[] exclude=[], default='relpath', rev=None>> |
1742 $ hg up -q tip |
1736 $ hg up -q tip |
1743 |
1737 |
1744 Test --follow on file not in parent revision |
1738 Test --follow on file not in parent revision |
1745 |
1739 |
1750 |
1744 |
1751 Test --follow and patterns |
1745 Test --follow and patterns |
1752 |
1746 |
1753 $ testlog -f 'glob:*' |
1747 $ testlog -f 'glob:*' |
1754 [] |
1748 [] |
1755 (and |
1749 (func |
1756 (func |
1750 (symbol '_matchfiles') |
1757 (symbol 'ancestors') |
1751 (list |
1758 (symbol '.')) |
1752 (string 'r:') |
1759 (func |
1753 (string 'd:relpath') |
1760 (symbol '_matchfiles') |
1754 (string 'p:glob:*'))) |
1761 (list |
|
1762 (string 'r:') |
|
1763 (string 'd:relpath') |
|
1764 (string 'p:glob:*')))) |
|
1765 <filteredset |
1755 <filteredset |
1766 <filteredset |
1756 <generatorsetdesc->, |
1767 <spanset- 0:5>, |
|
1768 <generatorsetdesc+>>, |
|
1769 <matchfiles patterns=['glob:*'], include=[] exclude=[], default='relpath', rev=None>> |
1757 <matchfiles patterns=['glob:*'], include=[] exclude=[], default='relpath', rev=None>> |
1770 |
1758 |
1771 Test --follow on a single rename |
1759 Test --follow on a single rename |
1772 |
1760 |
1773 $ hg up -q 2 |
1761 $ hg up -q 2 |
1774 $ testlog -f a |
1762 $ testlog -f a |
1775 [] |
1763 [] |
1776 (func |
1764 [] |
1777 (symbol 'follow') |
1765 <generatorsetdesc-> |
1778 (string 'a')) |
|
1779 <filteredset |
|
1780 <spanset- 0:3>, |
|
1781 <generatorsetdesc+>> |
|
1782 |
1766 |
1783 Test --follow and multiple renames |
1767 Test --follow and multiple renames |
1784 |
1768 |
1785 $ hg up -q tip |
1769 $ hg up -q tip |
1786 $ testlog -f e |
1770 $ testlog -f e |
1787 [] |
1771 [] |
1788 (func |
1772 [] |
1789 (symbol 'follow') |
1773 <generatorsetdesc-> |
1790 (string 'e')) |
|
1791 <filteredset |
|
1792 <spanset- 0:5>, |
|
1793 <generatorsetdesc+>> |
|
1794 |
1774 |
1795 Test --follow and multiple filelog heads |
1775 Test --follow and multiple filelog heads |
1796 |
1776 |
1797 $ hg up -q 2 |
1777 $ hg up -q 2 |
1798 $ testlog -f g |
1778 $ testlog -f g |
1799 [] |
1779 [] |
1800 (func |
1780 [] |
1801 (symbol 'follow') |
1781 <generatorsetdesc-> |
1802 (string 'g')) |
|
1803 <filteredset |
|
1804 <spanset- 0:3>, |
|
1805 <generatorsetdesc+>> |
|
1806 $ cat log.nodes |
1782 $ cat log.nodes |
1807 nodetag 2 |
1783 nodetag 2 |
1808 nodetag 1 |
1784 nodetag 1 |
1809 nodetag 0 |
1785 nodetag 0 |
1810 $ hg up -q tip |
1786 $ hg up -q tip |
1811 $ testlog -f g |
1787 $ testlog -f g |
1812 [] |
1788 [] |
1813 (func |
1789 [] |
1814 (symbol 'follow') |
1790 <generatorsetdesc-> |
1815 (string 'g')) |
|
1816 <filteredset |
|
1817 <spanset- 0:5>, |
|
1818 <generatorsetdesc+>> |
|
1819 $ cat log.nodes |
1791 $ cat log.nodes |
1820 nodetag 3 |
1792 nodetag 3 |
1821 nodetag 2 |
1793 nodetag 2 |
1822 nodetag 0 |
1794 nodetag 0 |
1823 |
1795 |
1824 Test --follow and multiple files |
1796 Test --follow and multiple files |
1825 |
1797 |
1826 $ testlog -f g e |
1798 $ testlog -f g e |
1827 [] |
1799 [] |
1828 (or |
1800 [] |
1829 (list |
1801 <generatorsetdesc-> |
1830 (func |
|
1831 (symbol 'follow') |
|
1832 (string 'g')) |
|
1833 (func |
|
1834 (symbol 'follow') |
|
1835 (string 'e')))) |
|
1836 <filteredset |
|
1837 <spanset- 0:5>, |
|
1838 <addset |
|
1839 <generatorsetdesc+>, |
|
1840 <generatorsetdesc+>>> |
|
1841 $ cat log.nodes |
1802 $ cat log.nodes |
1842 nodetag 4 |
1803 nodetag 4 |
1843 nodetag 3 |
1804 nodetag 3 |
1844 nodetag 2 |
1805 nodetag 2 |
1845 nodetag 1 |
1806 nodetag 1 |
1864 (branch merge, don't forget to commit) |
1825 (branch merge, don't forget to commit) |
1865 $ echo merge > e |
1826 $ echo merge > e |
1866 $ hg ci -m "merge 5 and 4" |
1827 $ hg ci -m "merge 5 and 4" |
1867 $ testlog --follow-first |
1828 $ testlog --follow-first |
1868 [] |
1829 [] |
1869 (func |
1830 [] |
1870 (symbol '_firstancestors') |
1831 <generatorsetdesc-> |
1871 (symbol '.')) |
|
1872 <filteredset |
|
1873 <spanset- 0:7>, |
|
1874 <generatorsetdesc+>> |
|
1875 |
1832 |
1876 Cannot compare with log --follow-first FILE as it never worked |
1833 Cannot compare with log --follow-first FILE as it never worked |
1877 |
1834 |
1878 $ hg log -G --print-revset --follow-first e |
1835 $ hg log -G --print-revset --follow-first e |
1879 [] |
1836 [] |
1880 (func |
1837 [] |
1881 (symbol '_followfirst') |
1838 <generatorsetdesc-> |
1882 (string 'e')) |
|
1883 <filteredset |
|
1884 <spanset- 0:7>, |
|
1885 <generatorsetdesc+>> |
|
1886 $ hg log -G --follow-first e --template '{rev} {desc|firstline}\n' |
1839 $ hg log -G --follow-first e --template '{rev} {desc|firstline}\n' |
1887 @ 6 merge 5 and 4 |
1840 @ 6 merge 5 and 4 |
1888 |\ |
1841 |\ |
1889 | ~ |
1842 | ~ |
1890 o 5 add another e |
1843 o 5 add another e |
1956 <filteredset |
1909 <filteredset |
1957 <spanset- 0:7>, |
1910 <spanset- 0:7>, |
1958 <matchfiles patterns=['a'], include=[] exclude=[], default='relpath', rev=None>> |
1911 <matchfiles patterns=['a'], include=[] exclude=[], default='relpath', rev=None>> |
1959 $ testlog --removed --follow a |
1912 $ testlog --removed --follow a |
1960 [] |
1913 [] |
1961 (and |
1914 (func |
1962 (func |
1915 (symbol '_matchfiles') |
1963 (symbol 'ancestors') |
1916 (list |
1964 (symbol '.')) |
1917 (string 'r:') |
1965 (func |
1918 (string 'd:relpath') |
1966 (symbol '_matchfiles') |
1919 (string 'p:a'))) |
1967 (list |
|
1968 (string 'r:') |
|
1969 (string 'd:relpath') |
|
1970 (string 'p:a')))) |
|
1971 <filteredset |
1920 <filteredset |
1972 <filteredset |
1921 <generatorsetdesc->, |
1973 <spanset- 0:5>, |
|
1974 <generatorsetdesc+>>, |
|
1975 <matchfiles patterns=['a'], include=[] exclude=[], default='relpath', rev=None>> |
1922 <matchfiles patterns=['a'], include=[] exclude=[], default='relpath', rev=None>> |
1976 |
1923 |
1977 Test --patch and --stat with --follow and --follow-first |
1924 Test --patch and --stat with --follow and --follow-first |
1978 |
1925 |
1979 $ hg up -q 3 |
1926 $ hg up -q 3 |