##// END OF EJS Templates
resolve: add option to warn/abort on -m with unresolved conflict markers...
resolve: add option to warn/abort on -m with unresolved conflict markers When a user is dropped out of Mercurial to a terminal to resolve files, we emit messages like: conflicts while merging file1! (edit, then use 'hg resolve --mark') conflicts while merging file2! (edit, then use 'hg resolve --mark') We don't mention a file name in the hint, so some users might do something like `$EDITOR file1; hg resolve --mark`, see that it says "(no more unresolved files)" and forget to deal with file2 before running the next command. Even if we did mention a file name in the hint, it's too easy to forget it (maybe the merge spans a couple days or something). This option lets us inform the user that they might have missed something. In the scenario above, the output would be something like: warning: the following files still have conflict markers: file2 (no more unresolved files) Differential Revision: https://phab.mercurial-scm.org/D4035

File last commit:

r33367:6029939f default
r38817:bb54db4a @96 default
Show More
filterpyflakes.py
37 lines | 890 B | text/x-python | PythonLexer
/ tests / filterpyflakes.py
timeless
tests: add pyflakes checking for unused imports
r14140 #!/usr/bin/env python
# Filter output by pyflakes to control which warnings we check
Robert Stanca
py3: use print_function in filterpyflakes.py
r28724 from __future__ import absolute_import, print_function
Gregory Szorc
tests/filterpyflakes: use absolute_import
r27285
import re
import sys
timeless
tests: add pyflakes checking for unused imports
r14140
timeless
test-pyflake: improve sorting algorithm
r14173 lines = []
timeless
tests: add pyflakes checking for unused imports
r14140 for line in sys.stdin:
Augie Fackler
filterpyflakes: dramatically simplify the entire thing by blacklisting...
r30421 # We blacklist tests that are too noisy for us
timeless
tests: add pyflakes checking for assigned to but never used
r14175 pats = [
Gregory Szorc
tests: remove special handling for undefined memoryview...
r32277 r"undefined name 'WindowsError'",
Augie Fackler
filterpyflakes: dramatically simplify the entire thing by blacklisting...
r30421 r"redefinition of unused '[^']+' from line",
Yuya Nishihara
filterpyflakes: allow reexporting pure symbols from cffi modules...
r32510 # for cffi, allow re-exports from pure.*
r"cffi/[^:]*:.*\bimport \*' used",
r"cffi/[^:]*:.*\*' imported but unused",
Augie Fackler
filterpyflakes: dramatically simplify the entire thing by blacklisting...
r30421 ]
Matt Mackall
filterpyflakes: make memoryview filtering unconditional
r21293
Augie Fackler
filterpyflakes: dramatically simplify the entire thing by blacklisting...
r30421 keep = True
for pat in pats:
if re.search(pat, line):
keep = False
Simon Heimberg
tests: simplify and document the sorting of pyflake messages...
r19335 break # pattern matches
Augie Fackler
filterpyflakes: dramatically simplify the entire thing by blacklisting...
r30421 if keep:
fn = line.split(':', 1)[0]
f = open(fn)
data = f.read()
f.close()
if 'no-' 'check-code' in data:
continue
lines.append(line)
timeless
test-pyflake: improve sorting algorithm
r14173
Augie Fackler
filterpyflakes: dramatically simplify the entire thing by blacklisting...
r30421 for line in lines:
timeless
tests: add pyflakes checking for unused imports
r14140 sys.stdout.write(line)
Robert Stanca
py3: use print_function in filterpyflakes.py
r28724 print()