Mercurial > hg-stable
view tests/test-module-imports.t @ 23970:8a544fb645bb stable
rebase: ensure rebase revision remains visible (issue4504)
Before this changeset rebase was getting very confused if any revision in the
rebase set became hidden. This was fairly easy to achieve if a rebased revision
was made visible by the working copy location. The rebase process would update
somewhere else and the revision would become hidden.
To work around this issue, we ensure rebased revisions remain visible for the
whole process.
This is a simple change suitable for stable. More subtle usage of unfiltered
repository in rebase may solve this issue more cleanly.
author | Pierre-Yves David <pierre-yves.david@fb.com> |
---|---|
date | Tue, 27 Jan 2015 12:33:56 +0000 |
parents | f388ceae2250 |
children | 01b39e821d00 |
line wrap: on
line source
#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: 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