##// END OF EJS Templates
merge: don't report progress for dr/rd actions...
merge: don't report progress for dr/rd actions It is easier to reason about certain algorithms in terms of a file->action mapping than the current action->list-of-files. Bid merge is already written this way (but with a list of actions per file), and largefiles' overridecalculateupdates() will also benefit. However, that requires us to have at most one action per file. That requirement is currently violated by 'dr' (divergent rename) and 'rd' (rename and delete) actions, which can exist for the same file as some other action. These actions are only used for displaying warnings to the user; they don't change anything in the working copy or the dirstate. In this way, they are similar to the 'k' (keep) action. However, they are even less action-like than 'k' is: 'k' at least describes what to do with the file ("do nothing"), while 'dr' and 'rd' or only annotations for files for which there may exist other, "real" actions. As a first step towards separating these acitons out, stop including them in the progress output, just like we already exclude the 'k' action.

File last commit:

r21294:1ae3cd6f default
r23524:a1a7c94d default
Show More
filterpyflakes.py
58 lines | 1.8 KiB | 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
Augie Fackler
pyflakes: ignore files marked no-check-code
r14209 import sys, re, os
timeless
tests: add pyflakes checking for unused imports
r14140
Simon Heimberg
tests: simplify and document the sorting of pyflake messages...
r19335 def makekey(typeandline):
"""
for sorting lines by: msgtype, path/to/file, lineno, message
typeandline is a sequence of a message type and the entire message line
the message line format is path/to/file:line: message
>>> makekey((3, 'example.py:36: any message'))
(3, 'example.py', 36, ' any message')
>>> makekey((7, 'path/to/file.py:68: dummy message'))
(7, 'path/to/file.py', 68, ' dummy message')
>>> makekey((2, 'fn:88: m')) > makekey((2, 'fn:9: m'))
True
"""
msgtype, line = typeandline
fname, line, message = line.split(":", 2)
# line as int for ordering 9 before 88
return msgtype, fname, int(line), message
timeless
test-pyflake: improve sorting algorithm
r14173
lines = []
timeless
tests: add pyflakes checking for unused imports
r14140 for line in sys.stdin:
Simon Heimberg
tests: simplify and document the sorting of pyflake messages...
r19335 # We whitelist tests (see more messages in pyflakes.messages)
timeless
tests: add pyflakes checking for assigned to but never used
r14175 pats = [
FUJIWARA Katsunori
tests: ignore "undefined name 'memoryview'" pyflakes error on earlier Python...
r21271 (r"imported but unused", None),
(r"local variable '.*' is assigned to but never used", None),
(r"unable to detect undefined names", None),
Matt Mackall
filterpyflakes: make memoryview filtering unconditional
r21293 (r"undefined name '.*'",
Matt Mackall
filterpyflakes: filter WindowsError unconditionally
r21294 r"undefined name '(WindowsError|memoryview)'")
timeless
tests: add pyflakes checking for assigned to but never used
r14175 ]
Matt Mackall
filterpyflakes: make memoryview filtering unconditional
r21293
FUJIWARA Katsunori
tests: ignore "undefined name 'memoryview'" pyflakes error on earlier Python...
r21271 for msgtype, (pat, excl) in enumerate(pats):
if re.search(pat, line) and (not excl or not re.search(excl, line)):
Simon Heimberg
tests: simplify and document the sorting of pyflake messages...
r19335 break # pattern matches
else:
continue # no pattern matched, next line
Augie Fackler
pyflakes: ignore files marked no-check-code
r14209 fn = line.split(':', 1)[0]
f = open(os.path.join(os.path.dirname(os.path.dirname(__file__)), fn))
data = f.read()
f.close()
Simon Heimberg
tests: do not skip code-checking on some whole files...
r19381 if 'no-' 'check-code' in data:
Augie Fackler
pyflakes: ignore files marked no-check-code
r14209 continue
Simon Heimberg
tests: simplify and document the sorting of pyflake messages...
r19335 lines.append((msgtype, line))
timeless
test-pyflake: improve sorting algorithm
r14173
Mads Kiilerich
check-code: check for spaces around = for named parameters
r19872 for msgtype, line in sorted(lines, key=makekey):
timeless
tests: add pyflakes checking for unused imports
r14140 sys.stdout.write(line)
print
FUJIWARA Katsunori
tests: ignore "undefined name 'memoryview'" pyflakes error on earlier Python...
r21271
# self test of "undefined name" detection for other than 'memoryview'
if False:
print undefinedname