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

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.

Augie Fackler - - Load All Authors

File last commit:

r22947:c63a09b6 default


                r23524:a1a7c94d

default

Download file

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

      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"/..

        $ if hg identify -q > /dev/null 2>&1; then :

        > else

        >     echo "skipped: not a Mercurial working dir" >&2

        >     exit 80

        > fi

      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:  discovery, 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 -> 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

				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"/..
				$ if hg identify -q > /dev/null 2>&1; then :
				> else
				> echo "skipped: not a Mercurial working dir" >&2
				> exit 80
				> fi

				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: discovery, 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 -> mercurial.cmdutil