upstream/mercurial-mirror Files · tests/test-check-module-imports.t

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.

Pierre-Yves David - - Load All Authors

File last commit:

r31442:d3a56bb2 default


                r32255:7e35d31b

default

Download file

             test-check-module-imports.t
        
                    40 lines
            
             | 1.4 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-check-module-imports.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #require test-repo

        $ . "$TESTDIR/helpers-testrepo.sh"

        $ 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.

      Known-bad files are excluded by -X as some of them would produce unstable

      outputs, which should be fixed later.

        $ hg locate 'set:**.py or grep(r"^#!.*?python")' \

        > 'tests/**.t' \

        > -X contrib/debugshell.py \

        > -X contrib/python-zstandard/ \

        > -X contrib/win32/hgwebdir_wsgi.py \

        > -X doc/gendoc.py \

        > -X doc/hgmanpage.py \

        > -X i18n/posplit \

        > -X tests/test-hgweb-auth.py \

        > -X tests/hypothesishelpers.py \

        > -X tests/test-ctxmanager.py \

        > -X tests/test-lock.py \

        > -X tests/test-verify-repo-operations.py \

        > -X tests/test-hook.t \

        > -X tests/test-import.t \

        > -X tests/test-imports-checker.t \

        > -X tests/test-commit-interactive.t \

        > -X tests/test-contrib-check-code.t \

        > -X tests/test-extension.t \

        > -X tests/test-hghave.t \

        > -X tests/test-hgweb-no-path-info.t \

        > -X tests/test-hgweb-no-request-uri.t \

        > -X tests/test-hgweb-non-interactive.t \

        > | sed 's-\\-/-g' | python "$import_checker" -

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				#require test-repo

				$ . "$TESTDIR/helpers-testrepo.sh"
				$ 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.

				Known-bad files are excluded by -X as some of them would produce unstable
				outputs, which should be fixed later.

				$ hg locate 'set:*.py or grep(r"^#!.?python")' \
				> 'tests/**.t' \
				> -X contrib/debugshell.py \
				> -X contrib/python-zstandard/ \
				> -X contrib/win32/hgwebdir_wsgi.py \
				> -X doc/gendoc.py \
				> -X doc/hgmanpage.py \
				> -X i18n/posplit \
				> -X tests/test-hgweb-auth.py \
				> -X tests/hypothesishelpers.py \
				> -X tests/test-ctxmanager.py \
				> -X tests/test-lock.py \
				> -X tests/test-verify-repo-operations.py \
				> -X tests/test-hook.t \
				> -X tests/test-import.t \
				> -X tests/test-imports-checker.t \
				> -X tests/test-commit-interactive.t \
				> -X tests/test-contrib-check-code.t \
				> -X tests/test-extension.t \
				> -X tests/test-hghave.t \
				> -X tests/test-hgweb-no-path-info.t \
				> -X tests/test-hgweb-no-request-uri.t \
				> -X tests/test-hgweb-non-interactive.t \
				> \| sed 's-\\-/-g' \| python "$import_checker" -