##// END OF EJS Templates
filemerge: add internal merge tool to dump files forcibly...
filemerge: add internal merge tool to dump files forcibly Internal merge tool :dump implies premerge. Therefore, files aren't dumped, if premerge runs successfully. This undocumented behavior might confuse users, if they want to always dump files. But just making :dump omit premerge might cause backward compatibility issue for existing automation. This patch adds new internal merge tool :forcedump, which works as same as :dump, but omits premerge always. Internal tools annotated with "nomerge" should merge "change and delete" correctly, but _forcedump() can't. Therefore, it is annotated with "mergeonly" to always omit premerge, even though it doesn't merge files actually. This patch also adds explanation about premerge to :dump, to clarify how :dump actually works. BTW, this patch specifies internal tools with "internal:" prefix in newly added test scenario in test-merge-tools.t, even though this prefix is already deprecated. This is only for similarity to other tests in test-merge-tools.t.

File last commit:

r30894:5b60464e default
r32255:7e35d31b default
Show More
test-check-pyflakes.t
14 lines | 497 B | text/troff | Tads3Lexer
/ tests / test-check-pyflakes.t
timeless
tests: mark test-check-pyflakes.t as requiring hg1.0+...
r29138 #require test-repo pyflakes hg10
Matt Mackall
tests: add repository check for pyflakes test...
r21208
timeless
tests: silence test-repo obsolete warning...
r29219 $ . "$TESTDIR/helpers-testrepo.sh"
Thomas Arendsen Hein
tests: make tests work if directory contains special characters...
r16350 $ cd "`dirname "$TESTDIR"`"
Simon Heimberg
tests: run pyflakes on files from manifest which could be python files...
r19377
run pyflakes on all tracked files ending in .py or without a file ending
(skipping binary file random-seed)
Matt Mackall
tests: add repository check for pyflakes test...
r21208
Zack Hricz
tests: exclude bundled pywatchman from test-check-pyflakes...
r30655 $ hg locate 'set:**.py or grep("^#!.*python")' -X hgext/fsmonitor/pywatchman \
Augie Fackler
tests: exclude python-zstandard from pyflakes analysis
r30894 > -X mercurial/pycompat.py -X contrib/python-zstandard \
Pulkit Goyal
pycompat: make pycompat demandimport friendly...
r29584 > 2>/dev/null \
Simon Heimberg
tests: run pyflakes on files from manifest which could be python files...
r19377 > | xargs pyflakes 2>/dev/null | "$TESTDIR/filterpyflakes.py"
Augie Fackler
filterpyflakes: dramatically simplify the entire thing by blacklisting...
r30421 tests/filterpyflakes.py:39: undefined name 'undefinedname'
Matt Mackall
tests: fix pyflakes test whitespace breakage
r22053