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

tryimportone: use dirstateguard instead of beginparentchange/endparentchange...

tryimportone: use dirstateguard instead of beginparentchange/endparentchange To fix the issue that the recent (in memory) dirstate isn't visible to external process (e.g. "precommit" hook), a subsequent patch makes "localrepository.commit()" invoke "dirstate.write()" in it. This change will make "beginparentchange()" and "endparentchange()" on dirstate in "cmdutil.tryimportone()" meaningless, because: - "dirstate.write()" writes changed data into ".hg/dirstate", but - aborting between "beginparentchange()" and "endparentchange()" doesn't cause any restoring ".hg/dirstate" it just discards changes in memory. This patch uses "dirstateguard" instead of "beginparentchange()" and "endparentchange()" in "cmdutil.tryimportone()" to restore ".hg/dirstate" during a failure even if "dirstate.write()" is executed before a failure. This patch uses "lockmod.release(dsguard)" instead of "dsguard.release()", because processing may be aborted before assignment to "dsguard" , and the "if dsguard" examination for safety is redundant.

Matt Harbison - - Load All Authors

File last commit:

r24909:d71492ca default


                r24995:0579b0c2

default

Download file

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

      #require test-repo

      This code uses the ast module, which was new in 2.6, so we'll skip

      this test on anything earlier.

        $ $PYTHON -c 'import sys ; assert sys.version_info >= (2, 6)' || exit 80

        $ import_checker="$TESTDIR"/../contrib/import-checker.py

      Run the doctests from the import checker, and make sure

      it's working correctly.

        $ TERM=dumb

        $ export TERM

        $ python -m doctest $import_checker

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

        $ hg locate 'mercurial/**.py' | sed 's-\\-/-g' | xargs python "$import_checker"

        mercurial/dispatch.py mixed imports

           stdlib:    commands

           relative:  error, extensions, fancyopts, hg, hook, util

        mercurial/fileset.py mixed imports

           stdlib:    parser

           relative:  error, merge, util

        mercurial/revset.py mixed imports

           stdlib:    parser

           relative:  error, hbisect, phases, util

        mercurial/templater.py mixed imports

           stdlib:    parser

           relative:  config, error, templatefilters, templatekw, util

        mercurial/ui.py mixed imports

           stdlib:    formatter

           relative:  config, error, scmutil, util

        Import cycle: mercurial.cmdutil -> mercurial.context -> mercurial.subrepo -> mercurial.cmdutil

	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

				This code uses the ast module, which was new in 2.6, so we'll skip
				this test on anything earlier.
				$ $PYTHON -c 'import sys ; assert sys.version_info >= (2, 6)' \|\| exit 80

				$ import_checker="$TESTDIR"/../contrib/import-checker.py

				Run the doctests from the import checker, and make sure
				it's working correctly.
				$ TERM=dumb
				$ export TERM
				$ python -m doctest $import_checker

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

				$ hg locate 'mercurial/**.py' \| sed 's-\\-/-g' \| xargs python "$import_checker"
				mercurial/dispatch.py mixed imports
				stdlib: commands
				relative: error, extensions, fancyopts, hg, hook, util
				mercurial/fileset.py mixed imports
				stdlib: parser
				relative: error, merge, util
				mercurial/revset.py mixed imports
				stdlib: parser
				relative: error, hbisect, phases, util
				mercurial/templater.py mixed imports
				stdlib: parser
				relative: config, error, templatefilters, templatekw, util
				mercurial/ui.py mixed imports
				stdlib: formatter
				relative: config, error, scmutil, util
				Import cycle: mercurial.cmdutil -> mercurial.context -> mercurial.subrepo -> mercurial.cmdutil