##// END OF EJS Templates
log: fix log revset instability...
Durham Goode -
r23501:424d6691 stable
parent child Browse files
Show More
@@ -1795,7 +1795,7 b' def _makelogrevset(repo, pats, opts, rev'
1795 filematcher = lambda rev: match
1795 filematcher = lambda rev: match
1796
1796
1797 expr = []
1797 expr = []
1798 for op, val in opts.iteritems():
1798 for op, val in sorted(opts.iteritems()):
1799 if not val:
1799 if not val:
1800 continue
1800 continue
1801 if op not in opt2revset:
1801 if op not in opt2revset:
@@ -1660,15 +1660,15 b' Test --follow on a directory'
1660 (group
1660 (group
1661 (and
1661 (and
1662 (func
1662 (func
1663 ('symbol', 'ancestors')
1664 ('symbol', '.'))
1665 (func
1663 ('symbol', '_matchfiles')
1666 ('symbol', '_matchfiles')
1664 (list
1667 (list
1665 (list
1668 (list
1666 ('string', 'r:')
1669 ('string', 'r:')
1667 ('string', 'd:relpath'))
1670 ('string', 'd:relpath'))
1668 ('string', 'p:dir')))
1671 ('string', 'p:dir')))))
1669 (func
1670 ('symbol', 'ancestors')
1671 ('symbol', '.'))))
1672 $ hg up -q tip
1672 $ hg up -q tip
1673
1673
1674 Test --follow on file not in parent revision
1674 Test --follow on file not in parent revision
@@ -1685,15 +1685,15 b' Test --follow and patterns'
1685 (group
1685 (group
1686 (and
1686 (and
1687 (func
1687 (func
1688 ('symbol', 'ancestors')
1689 ('symbol', '.'))
1690 (func
1688 ('symbol', '_matchfiles')
1691 ('symbol', '_matchfiles')
1689 (list
1692 (list
1690 (list
1693 (list
1691 ('string', 'r:')
1694 ('string', 'r:')
1692 ('string', 'd:relpath'))
1695 ('string', 'd:relpath'))
1693 ('string', 'p:glob:*')))
1696 ('string', 'p:glob:*')))))
1694 (func
1695 ('symbol', 'ancestors')
1696 ('symbol', '.'))))
1697
1697
1698 Test --follow on a single rename
1698 Test --follow on a single rename
1699
1699
@@ -1862,15 +1862,15 b' Test --removed'
1862 (group
1862 (group
1863 (and
1863 (and
1864 (func
1864 (func
1865 ('symbol', 'ancestors')
1866 ('symbol', '.'))
1867 (func
1865 ('symbol', '_matchfiles')
1868 ('symbol', '_matchfiles')
1866 (list
1869 (list
1867 (list
1870 (list
1868 ('string', 'r:')
1871 ('string', 'r:')
1869 ('string', 'd:relpath'))
1872 ('string', 'd:relpath'))
1870 ('string', 'p:a')))
1873 ('string', 'p:a')))))
1871 (func
1872 ('symbol', 'ancestors')
1873 ('symbol', '.'))))
1874
1874
1875 Test --patch and --stat with --follow and --follow-first
1875 Test --patch and --stat with --follow and --follow-first
1876
1876
General Comments 0
You need to be logged in to leave comments. Login now