##// 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:

r38476:e5916f12 default
r38817:bb54db4a @96 default
Show More
test-check-module-imports.t
46 lines | 1.5 KiB | text/troff | Tads3Lexer
/ tests / test-check-module-imports.t
Pierre-Yves David
tests: rename 'test-module-import.t' into 'test-check-module-import.t'...
r28275 #require test-repo
timeless
tests: silence test-repo obsolete warning...
r29219 $ . "$TESTDIR/helpers-testrepo.sh"
Pierre-Yves David
tests: rename 'test-module-import.t' into 'test-check-module-import.t'...
r28275 $ import_checker="$TESTDIR"/../contrib/import-checker.py
$ cd "$TESTDIR"/..
There are a handful of cases here that require renaming a module so it
doesn't overlap with a stdlib module name. There are also some cycles
here that we should still endeavor to fix, and some cycles will be
hidden by deduplication algorithm in the cycle detector, so fixing
these may expose other cycles.
Yuya Nishihara
tests: enable import checker for tests/**.py files...
r28844 Known-bad files are excluded by -X as some of them would produce unstable
outputs, which should be fixed later.
Yuya Nishihara
tests: alias syshg and syshgenv so they can be switched conditionally
r33199 $ testrepohg locate 'set:**.py or grep(r"^#!.*?python")' \
timeless
tests: run import-checker with tests .t files
r28923 > 'tests/**.t' \
Augie Fackler
tests: blacklist some more entries in module import checks
r33915 > -X hgweb.cgi \
> -X setup.py \
Yuya Nishihara
tests: enable import checker for all **.py files...
r29212 > -X contrib/debugshell.py \
Augie Fackler
tests: blacklist some more entries in module import checks
r33915 > -X contrib/hgweb.fcgi \
Gregory Szorc
packaging: replace dockerlib.sh with a Python script...
r38476 > -X contrib/packaging/hg-docker \
Gregory Szorc
zstd: vendor python-zstandard 0.5.0...
r30435 > -X contrib/python-zstandard/ \
Yuya Nishihara
tests: enable import checker for all **.py files...
r29212 > -X contrib/win32/hgwebdir_wsgi.py \
> -X doc/gendoc.py \
> -X doc/hgmanpage.py \
Yuya Nishihara
tests: enable import checker for all python files (including no .py files)...
r29234 > -X i18n/posplit \
Siddharth Agarwal
tests: disable lints on mercurial/thirdparty...
r34396 > -X mercurial/thirdparty \
Yuya Nishihara
tests: enable import checker for tests/**.py files...
r28844 > -X tests/hypothesishelpers.py \
Gregory Szorc
interfaceutil: module to stub out zope.interface...
r37828 > -X tests/test-check-interfaces.py \
timeless
tests: run import-checker with tests .t files
r28923 > -X tests/test-commit-interactive.t \
> -X tests/test-contrib-check-code.t \
Augie Fackler
tests: blacklist test-demandimport from test-check-module-imports...
r33918 > -X tests/test-demandimport.py \
timeless
tests: run import-checker with tests .t files
r28923 > -X tests/test-extension.t \
> -X tests/test-hghave.t \
Augie Fackler
tests: sort excluded test files in test-check-module-imports
r33917 > -X tests/test-hgweb-auth.py \
timeless
tests: run import-checker with tests .t files
r28923 > -X tests/test-hgweb-no-path-info.t \
> -X tests/test-hgweb-no-request-uri.t \
> -X tests/test-hgweb-non-interactive.t \
Augie Fackler
tests: sort excluded test files in test-check-module-imports
r33917 > -X tests/test-hook.t \
> -X tests/test-import.t \
> -X tests/test-imports-checker.t \
> -X tests/test-lock.py \
> -X tests/test-verify-repo-operations.py \
Augie Fackler
tests: replace yet more calls to `python` with $PYTHON...
r33262 > | sed 's-\\-/-g' | $PYTHON "$import_checker" -