import-checker: make imported_modules yield absolute dotted_name_of_path This patch makes `imported_modules()` always yield absolute `dotted_name_of_path()`-ed name by strict detection with `fromlocal()`. This change improves circular detection in some points: - locally defined modules, of which name collides against one of standard library, can be examined correctly For example, circular import related to `commands` is overlooked before this patch. - names not useful for circular detection are ignored Names below are also yielded before this patch: - module names of standard library (= not locally defined one) - non-module names (e.g. `node.nullid` of `from node import nullid`) These redundant names decrease performance of circular detection. For example, with files at 1ef96a3b8b89, average loops per file in `checkmod()` is reduced from 165 to 109. - `__init__` can be handled correctly in `checkmod()` For example, current implementation has problems below: - `from xxx import yyy` doesn't recognize `xxx.__init__` as imported - `xxx.__init__` imported via `import xxx` is treated as `xxx`, and circular detection is aborted, because `key` of such module name is not `xxx` but `xxx.__init__` - it is easy to enhance for `from . import xxx` style or so (in the future) Module name detection in `imported_modules()` can use information in `ast.ImportFrom` fully. It is assumed that all locally defined modules are correctly specified to `import-checker.py` at once. Strictly speaking, when `from foo.bar.baz import module1` imports `foo.bar.baz.module1` module, current `imported_modules()` yields only `foo.bar.baz.__init__`, even though also `foo.__init__` and `foo.bar.__init__` should be yielded to detect circular import exactly. But this limitation is reasonable one for improvement in this patch, because current `__init__` files in Mercurial seems to be implemented carefully.

     1

#require test-repo

     2

     3

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

     4

this test on anything earlier.

     5

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

     6

     7

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

     8

     9

Run the doctests from the import checker, and make sure

    10

it's working correctly.

    11

  $ TERM=dumb

    12

  $ export TERM

    13

  $ python -m doctest $import_checker

    14

    15

  $ cd "$TESTDIR"/..

    16

    17

There are a handful of cases here that require renaming a module so it

    18

doesn't overlap with a stdlib module name. There are also some cycles

    19

here that we should still endeavor to fix, and some cycles will be

    20

hidden by deduplication algorithm in the cycle detector, so fixing

    21

these may expose other cycles.

    22

    23

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

    24

  mercurial/dispatch.py mixed imports

    25

     stdlib:    commands

    26

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

    27

  mercurial/fileset.py mixed imports

    28

     stdlib:    parser

    29

     relative:  error, merge, util

    30

  mercurial/revset.py mixed imports

    31

     stdlib:    parser

    32

     relative:  error, hbisect, phases, util

    33

  mercurial/templater.py mixed imports

    34

     stdlib:    parser

    35

     relative:  config, error, templatefilters, templatekw, util

    36

  mercurial/ui.py mixed imports

    37

     stdlib:    formatter

    38

     relative:  config, error, scmutil, util

    39

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

    40

  Import cycle: mercurial.commands -> mercurial.commandserver -> mercurial.dispatch -> mercurial.commands