Mercurial > hg
view tests/test-run-tests.py @ 24133:79c2c29c71ae
largefiles: don't warn when reverting a forgotten largefile
Previously, when a largefile is forgotten and then reverted, a warning was
issued:
$ hg revert -R subrepo subrepo/large.txt
file not managed: subrepo/large.txt (glob)
This was purely cosmetic as the file itself actually was reverted.
The problem was even with all of the matcher patching, the largefile pattern
given on the command line wasn't converted to a standin because the standin was
neither in ctx nor wctx. This causes the named largefile to be added to the
'names' dict in cmdutil.revert() in the repo walk at line 2550. The warning was
printed out when the 'names' dict is iterated, because the file was specified
exactly.
Since core revert recurses into subrepos and largefiles only overrides the
revert method in commands.py, it doesn't work properly when reverting a subrepo.
However, it still will recurse into the subrepo and call the installed matcher
method, so lfdirstate is reopened for the current repo level to prevent any new
problems.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Sat, 07 Feb 2015 19:40:02 -0500 |
parents | 56610da39b48 |
children | 625dd917f04f |
line wrap: on
line source
"""test line matching with some failing examples and some which warn run-test.t only checks positive matches and can not see warnings (both by design) """ import os, re # this is hack to make sure no escape characters are inserted into the output if 'TERM' in os.environ: del os.environ['TERM'] import doctest run_tests = __import__('run-tests') def lm(expected, output): r"""check if output matches expected does it generally work? >>> lm('H*e (glob)\n', 'Here\n') True fail on bad test data >>> try: lm('a\n','a') ... except AssertionError, ex: print ex missing newline >>> try: lm('single backslash\n', 'single \backslash\n') ... except AssertionError, ex: print ex single backslash or unknown char """ assert expected.endswith('\n') and output.endswith('\n'), 'missing newline' assert not re.search(r'[^ \w\\/\r\n()*?]', expected + output), \ 'single backslash or unknown char' match = run_tests.TTest.linematch(expected, output) if isinstance(match, str): return 'special: ' + match else: return bool(match) # do not return match object def wintests(): r"""test matching like running on windows enable windows matching on any os >>> _osaltsep = os.altsep >>> os.altsep = True valid match on windows >>> lm('g/a*/d (glob)\n', 'g\\abc/d\n') True direct matching, glob unnecessary >>> lm('g/b (glob)\n', 'g/b\n') 'special: -glob' missing glob >>> lm('/g/c/d/fg\n', '\\g\\c\\d/fg\n') 'special: +glob' restore os.altsep >>> os.altsep = _osaltsep """ pass def otherostests(): r"""test matching like running on non-windows os disable windows matching on any os >>> _osaltsep = os.altsep >>> os.altsep = False backslash does not match slash >>> lm('h/a* (glob)\n', 'h\\ab\n') False direct matching glob can not be recognized >>> lm('h/b (glob)\n', 'h/b\n') True missing glob can not not be recognized >>> lm('/h/c/df/g/\n', '\\h/c\\df/g\\\n') False restore os.altsep >>> os.altsep = _osaltsep """ pass if __name__ == '__main__': doctest.testmod()