--- c:/hgdev/src/tests/test-check-code.t
+++ c:/hgdev/src/tests/test-check-code.t.err
@@ -21,11 +21,11 @@
Skipping contrib/automation/hgautomation/try_server.py it has no-che?k-code (glob)
Skipping contrib/automation/hgautomation/windows.py it has no-che?k-code (glob)
Skipping contrib/automation/hgautomation/winrm.py it has no-che?k-code (glob)
+ Skipping contrib/ci/lambda_functions/ci.py it has no-che?k-code (glob)
+ Skipping contrib/ci/lambda_functions/web.py it has no-che?k-code (glob)
Skipping contrib/fuzz/FuzzedDataProvider.h it has no-che?k-code (glob)
Skipping contrib/fuzz/standalone_fuzz_target_runner.cc it has no-che?k-code (glob)
Skipping contrib/packaging/hgpackaging/cli.py it has no-che?k-code (glob)
- Skipping contrib/ci/lambda_functions/ci.py it has no-che?k-code (glob)
- Skipping contrib/ci/lambda_functions/web.py it has no-che?k-code (glob)
Skipping contrib/packaging/hgpackaging/downloads.py it has no-che?k-code (glob)
Skipping contrib/packaging/hgpackaging/inno.py it has no-che?k-code (glob)
Skipping contrib/packaging/hgpackaging/py2exe.py it has no-che?k-code (glob)
@@ -55,24 +55,24 @@
Prevent adding new files in the root directory accidentally.
$ testrepohg files 'glob:*'
- .arcconfig
- .clang-format
- .editorconfig
- .hgignore
- .hgsigs
- .hgtags
- .jshintrc
- CONTRIBUTING
- CONTRIBUTORS
- COPYING
- Makefile
- README.rst
- black.toml
- hg
- hgeditor
- hgweb.cgi
- rustfmt.toml
- setup.py
+ C:/hgdev/src/.arcconfig
+ C:/hgdev/src/.clang-format
+ C:/hgdev/src/.editorconfig
+ C:/hgdev/src/.hgignore
+ C:/hgdev/src/.hgsigs
+ C:/hgdev/src/.hgtags
+ C:/hgdev/src/.jshintrc
+ C:/hgdev/src/CONTRIBUTING
+ C:/hgdev/src/CONTRIBUTORS
+ C:/hgdev/src/COPYING
+ C:/hgdev/src/Makefile
+ C:/hgdev/src/README.rst
+ C:/hgdev/src/black.toml
+ C:/hgdev/src/hg
+ C:/hgdev/src/hgeditor
+ C:/hgdev/src/hgweb.cgi
+ C:/hgdev/src/rustfmt.toml
+ C:/hgdev/src/setup.py
Prevent adding modules which could be shadowed by ancient .so/.dylib.
@@ -93,5 +93,5 @@
Keep Windows line endings in check
$ hg files 'set:eol(dos)'
- contrib/win32/hg.bat
- contrib/win32/mercurial.ini
+ C:/hgdev/src/contrib/win32/hg.bat
+ C:/hgdev/src/contrib/win32/mercurial.ini
test-check-module-imports.t
--- c:/hgdev/src/tests/test-check-module-imports.t
+++ c:/hgdev/src/tests/test-check-module-imports.t.err
@@ -38,3 +38,447 @@
> -X tests/test-imports-checker.t > -X tests/test-verify-repo-operations.py > | sed 's-\-/-g' | "$PYTHON" "$import_checker" -
+ C:/hgdev/src/contrib/ci/lambda_functions/ci.py:20: direct symbol import Key from boto3.dynamodb.conditions
(esc)
+ C:/hgdev/src/contrib/ci/lambda_functions/web.py:16: direct symbol import Key from boto3.dynamodb.conditions
(esc)
+ C:/hgdev/src/contrib/dumprevlog:14: direct symbol import procutil from mercurial.utils
(esc)
+ C:/hgdev/src/contrib/simplemerge:20: direct symbol import procutil, stringutil from mercurial.utils
(esc)
+ C:/hgdev/src/contrib/synthrepo.py:65: direct symbol import dateutil from mercurial.utils
(esc)
+ C:/hgdev/src/contrib/undumprevlog:16: direct symbol import procutil from mercurial.utils
(esc)
+ C:/hgdev/src/doc/check-seclevel.py:17: symbol import follows non-symbol import: mercurial
(esc)
+ C:/hgdev/src/hgext/absorb.py:57: direct symbol import stringutil from mercurial.utils
(esc)
+ C:/hgdev/src/hgext/acl.py:227: direct symbol import procutil from mercurial.utils
(esc)
+ C:/hgdev/src/hgext/blackbox.py:57: direct symbol import dateutil, procutil from mercurial.utils
(esc)
+ C:/hgdev/src/hgext/bugzilla.py:311: direct symbol import procutil, stringutil from mercurial.utils
(esc)
+ C:/hgdev/src/hgext/convert/common.py:26: direct symbol import procutil from mercurial.utils
(esc)
+ C:/hgdev/src/hgext/convert/convcmd.py:23: direct symbol import dateutil from mercurial.utils
(esc)
+ C:/hgdev/src/hgext/convert/cvs.py:25: direct symbol import dateutil, procutil from mercurial.utils
(esc)
+ C:/hgdev/src/hgext/convert/cvsps.py:22: direct symbol import dateutil, procutil, stringutil from mercurial.utils
(esc)
+ C:/hgdev/src/hgext/convert/darcs.py:20: direct symbol import dateutil from mercurial.utils
(esc)
+ C:/hgdev/src/hgext/convert/gnuarch.py:23: direct symbol import dateutil, procutil from mercurial.utils
(esc)
+ C:/hgdev/src/hgext/convert/hg.py:41: direct symbol import dateutil from mercurial.utils
(esc)
+ C:/hgdev/src/hgext/convert/monotone.py:19: direct symbol import dateutil from mercurial.utils
(esc)
+ C:/hgdev/src/hgext/convert/p4.py:17: direct symbol import dateutil, procutil, stringutil from mercurial.utils
(esc)
+ C:/hgdev/src/hgext/convert/subversion.py:21: direct symbol import dateutil, procutil, stringutil from mercurial.utils
(esc)
+ C:/hgdev/src/hgext/eol.py:109: direct symbol import stringutil from mercurial.utils
(esc)
+ C:/hgdev/src/hgext/extdiff.py:109: direct symbol import procutil, stringutil from mercurial.utils
(esc)
+ C:/hgdev/src/hgext/factotum.py:53: direct symbol import procutil from mercurial.utils
(esc)
+ C:/hgdev/src/hgext/fastannotate/context.py:30: direct symbol import hashutil, stringutil from mercurial.utils
(esc)
+ C:/hgdev/src/hgext/fastannotate/formatter.py:16: direct symbol import dateutil from mercurial.utils
(esc)
+ C:/hgdev/src/hgext/fastexport.py:15: direct symbol import stringutil from mercurial.utils
(esc)
+ C:/hgdev/src/hgext/fetch.py:24: direct symbol import dateutil from mercurial.utils
(esc)
+ C:/hgdev/src/hgext/fix.py:137: direct symbol import procutil from mercurial.utils
(esc)
+ C:/hgdev/src/hgext/fsmonitor/__init__.py:136: direct symbol import hashutil, stringutil from mercurial.utils
(esc)
+ C:/hgdev/src/hgext/fsmonitor/watchmanclient.py:16: direct symbol import procutil, stringutil from mercurial.utils
(esc)
+ C:/hgdev/src/hgext/git/gitlog.py:19: direct symbol import stringutil from mercurial.utils
(esc)
+ C:/hgdev/src/hgext/githelp.py:32: direct symbol import procutil from mercurial.utils
(esc)
+ C:/hgdev/src/hgext/gpg.py:23: direct symbol import dateutil, procutil from mercurial.utils
(esc)
+ C:/hgdev/src/hgext/highlight/__init__.py:32: direct symbol import webcommands, webutil from mercurial.hgweb
(esc)
+ C:/hgdev/src/hgext/highlight/__init__.py:32: symbol import follows non-symbol import: mercurial.hgweb
(esc)
+ C:/hgdev/src/hgext/highlight/__init__.py:37: symbol import follows non-symbol import: mercurial
(esc)
+ C:/hgdev/src/hgext/highlight/highlight.py:17: symbol import follows non-symbol import: mercurial
(esc)
+ C:/hgdev/src/hgext/highlight/highlight.py:22: direct symbol import stringutil from mercurial.utils
(esc)
+ C:/hgdev/src/hgext/highlight/highlight.py:22: symbol import follows non-symbol import: mercurial.utils
(esc)
+ C:/hgdev/src/hgext/histedit.py:238: direct symbol import dateutil, stringutil from mercurial.utils
(esc)
+ C:/hgdev/src/hgext/hooklib/changeset_obsoleted.py:36: direct symbol import dateutil from mercurial.utils
(esc)
+ C:/hgdev/src/hgext/hooklib/changeset_published.py:35: direct symbol import dateutil from mercurial.utils
(esc)
+ C:/hgdev/src/hgext/infinitepush/__init__.py:116: direct symbol import procutil, stringutil from mercurial.utils
(esc)
+ C:/hgdev/src/hgext/infinitepush/fileindexapi.py:20: direct symbol import stringutil from mercurial.utils
(esc)
+ C:/hgdev/src/hgext/infinitepush/store.py:17: direct symbol import hashutil, procutil from mercurial.utils
(esc)
+ C:/hgdev/src/hgext/journal.py:39: direct symbol import dateutil, procutil, stringutil from mercurial.utils
(esc)
+ C:/hgdev/src/hgext/keyword.py:94: direct symbol import webcommands from mercurial.hgweb
(esc)
+ C:/hgdev/src/hgext/keyword.py:115: direct symbol import dateutil, stringutil from mercurial.utils
(esc)
+ C:/hgdev/src/hgext/largefiles/lfcommands.py:31: direct symbol import hashutil from mercurial.utils
(esc)
+ C:/hgdev/src/hgext/largefiles/lfutil.py:34: direct symbol import hashutil from mercurial.utils
(esc)
+ C:/hgdev/src/hgext/largefiles/overrides.py:19: direct symbol import webcommands from mercurial.hgweb
(esc)
+ C:/hgdev/src/hgext/largefiles/remotestore.py:18: direct symbol import stringutil from mercurial.utils
(esc)
+ C:/hgdev/src/hgext/lfs/blobstore.py:34: direct symbol import stringutil from mercurial.utils
(esc)
+ C:/hgdev/src/hgext/lfs/pointer.py:18: direct symbol import stringutil from mercurial.utils
(esc)
+ C:/hgdev/src/hgext/lfs/wireprotolfsserver.py:15: direct symbol import common from mercurial.hgweb
(esc)
+ C:/hgdev/src/hgext/lfs/wrapper.py:39: direct symbol import storageutil, stringutil from mercurial.utils
(esc)
+ C:/hgdev/src/hgext/logtoprocess.py:39: direct symbol import procutil from mercurial.utils
(esc)
+ C:/hgdev/src/hgext/mq.py:107: direct symbol import dateutil, stringutil from mercurial.utils
(esc)
+ C:/hgdev/src/hgext/narrow/narrowbundle2.py:28: direct symbol import stringutil from mercurial.utils
(esc)
+ C:/hgdev/src/hgext/notify.py:178: direct symbol import dateutil, stringutil from mercurial.utils
(esc)
+ C:/hgdev/src/hgext/patchbomb.py:102: direct symbol import dateutil from mercurial.utils
(esc)
+ C:/hgdev/src/hgext/phabricator.py:88: direct symbol import procutil, stringutil from mercurial.utils
(esc)
+ C:/hgdev/src/hgext/releasenotes.py:33: direct symbol import procutil, stringutil from mercurial.utils
(esc)
+ C:/hgdev/src/hgext/relink.py:22: direct symbol import stringutil from mercurial.utils
(esc)
+ C:/hgdev/src/hgext/remotefilelog/basepack.py:22: direct symbol import hashutil from mercurial.utils
(esc)
+ C:/hgdev/src/hgext/remotefilelog/basestore.py:17: direct symbol import hashutil from mercurial.utils
(esc)
+ C:/hgdev/src/hgext/remotefilelog/debugcommands.py:23: direct symbol import hashutil from mercurial.utils
(esc)
+ C:/hgdev/src/hgext/remotefilelog/fileserverclient.py:27: direct symbol import hashutil, procutil from mercurial.utils
(esc)
+ C:/hgdev/src/hgext/remotefilelog/historypack.py:10: direct symbol import hashutil from mercurial.utils
(esc)
+ C:/hgdev/src/hgext/remotefilelog/remotefilelog.py:28: direct symbol import storageutil from mercurial.utils
(esc)
+ C:/hgdev/src/hgext/remotefilelog/remotefilelog.py:29: direct symbol import flagutil from mercurial.revlogutils
(esc)
+ C:/hgdev/src/hgext/remotefilelog/repack.py:22: direct symbol import procutil from mercurial.utils
(esc)
+ C:/hgdev/src/hgext/remotefilelog/shallowrepo.py:23: direct symbol import procutil from mercurial.utils
(esc)
+ C:/hgdev/src/hgext/remotefilelog/shallowutil.py:25: direct symbol import hashutil, storageutil, stringutil from mercurial.utils
(esc)
+ C:/hgdev/src/hgext/remotenames.py:46: direct symbol import stringutil from mercurial.utils
(esc)
+ C:/hgdev/src/hgext/sqlitestore.py:78: direct symbol import hashutil, storageutil from mercurial.utils
(esc)
+ C:/hgdev/src/hgext/transplant.py:43: direct symbol import procutil, stringutil from mercurial.utils
(esc)
+ C:/hgdev/src/hgext/win32text.py:53: direct symbol import stringutil from mercurial.utils
(esc)
+ C:/hgdev/src/hgext/zeroconf/__init__.py:32: symbol import follows non-symbol import: mercurial
(esc)
+ C:/hgdev/src/hgext/zeroconf/__init__.py:41: direct symbol import server from mercurial.hgweb
(esc)
+ C:/hgdev/src/hgext/zeroconf/__init__.py:41: symbol import follows non-symbol import: mercurial.hgweb
(esc)
+ C:/hgdev/src/mercurial/ancestor.py:12: direct symbol import nullrev from C:.hgdev.src.mercurial.node
(esc)
+ C:/hgdev/src/mercurial/archival.py:18: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/archival.py:19: direct symbol import nullrev from C:.hgdev.src.mercurial.node
(esc)
+ C:/hgdev/src/mercurial/archival.py:20: direct symbol import open from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/bookmarks.py:13: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/bookmarks.py:14: direct symbol import bin, hex, short, wdirid from C:.hgdev.src.mercurial.node
(esc)
+ C:/hgdev/src/mercurial/bookmarks.py:20: direct symbol import getattr from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/branchmap.py:12: direct symbol import bin, hex, nullid, nullrev from C:.hgdev.src.mercurial.node
(esc)
+ C:/hgdev/src/mercurial/bundle2.py:158: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/bundlerepo.py:19: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/bundlerepo.py:20: direct symbol import nullid, nullrev from C:.hgdev.src.mercurial.node
(esc)
+ C:/hgdev/src/mercurial/cffi/bdiff.py:12: direct symbol import * from C:.hgdev.src.mercurial.pure.bdiff
(esc)
+ C:/hgdev/src/mercurial/cffi/mpatch.py:10: direct symbol import * from C:.hgdev.src.mercurial.pure.mpatch
(esc)
+ C:/hgdev/src/mercurial/cffi/mpatch.py:11: direct symbol import mpatchError from C:.hgdev.src.mercurial.pure.mpatch
(esc)
+ C:/hgdev/src/mercurial/cffi/osutil.py:13: direct symbol import * from C:.hgdev.src.mercurial.pure.osutil
(esc)
+ C:/hgdev/src/mercurial/changegroup.py:14: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/changegroup.py:15: direct symbol import hex, nullid, nullrev, short from C:.hgdev.src.mercurial.node
(esc)
+ C:/hgdev/src/mercurial/changegroup.py:21: direct symbol import open from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/changelog.py:10: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/changelog.py:11: direct symbol import bin, hex, nullid from C:.hgdev.src.mercurial.node
(esc)
+ C:/hgdev/src/mercurial/changelog.py:16: direct symbol import attr from C:.hgdev.src.mercurial.thirdparty
(esc)
+ C:/hgdev/src/mercurial/chgserver.py:52: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/chgserver.py:53: direct symbol import getattr, setattr from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/cmdutil.py:15: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/cmdutil.py:16: direct symbol import hex, nullid, short from C:.hgdev.src.mercurial.node
(esc)
+ C:/hgdev/src/mercurial/cmdutil.py:21: direct symbol import getattr, open, setattr from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/cmdutil.py:26: direct symbol import attr from C:.hgdev.src.mercurial.thirdparty
(esc)
+ C:/hgdev/src/mercurial/color.py:12: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/color.py:13: direct symbol import getattr from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/commands.py:16: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/commands.py:17: direct symbol import hex, nullid, nullrev, short, wdirhex, wdirrev from C:.hgdev.src.mercurial.node
(esc)
+ C:/hgdev/src/mercurial/commands.py:25: direct symbol import open from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/commandserver.py:26: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/commandserver.py:27: direct symbol import getattr from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/commit.py:10: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/commit.py:11: direct symbol import hex, nullid, nullrev from C:.hgdev.src.mercurial.node
(esc)
+ C:/hgdev/src/mercurial/config.py:13: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/config.py:14: direct symbol import getattr from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/context.py:15: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/context.py:16: direct symbol import addednodeid, hex, modifiednodeid, nullid, nullrev, short, wdirfilenodeids, wdirhex from C:.hgdev.src.mercurial.node
(esc)
+ C:/hgdev/src/mercurial/context.py:26: direct symbol import getattr, open from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/copies.py:13: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/crecord.py:17: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/crecord.py:18: direct symbol import getattr, open from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/dagop.py:12: direct symbol import nullrev from C:.hgdev.src.mercurial.node
(esc)
+ C:/hgdev/src/mercurial/dagop.py:13: direct symbol import attr from C:.hgdev.src.mercurial.thirdparty
(esc)
+ C:/hgdev/src/mercurial/dagparser.py:13: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/debugcommands.py:28: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/debugcommands.py:29: direct symbol import bin, hex, nullid, nullrev, short from C:.hgdev.src.mercurial.node
(esc)
+ C:/hgdev/src/mercurial/debugcommands.py:36: direct symbol import getattr, open from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/destutil.py:10: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/diffhelper.py:10: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/diffutil.py:12: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/dirstate.py:16: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/dirstate.py:17: direct symbol import nullid from C:.hgdev.src.mercurial.node
(esc)
+ C:/hgdev/src/mercurial/dirstate.py:18: direct symbol import delattr from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/dirstate.py:20: direct symbol import tracing from hgdemandimport
(esc)
+ C:/hgdev/src/mercurial/dirstateguard.py:10: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/discovery.py:12: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/discovery.py:13: direct symbol import hex, nullid, short from C:.hgdev.src.mercurial.node
(esc)
+ C:/hgdev/src/mercurial/dispatch.py:22: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/dispatch.py:23: direct symbol import getattr from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/dispatch.py:25: direct symbol import tracing from hgdemandimport
(esc)
+ C:/hgdev/src/mercurial/encoding.py:14: direct symbol import getattr from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/error.py:143: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/error.py:213: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/error.py:238: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/error.py:276: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/error.py:424: direct symbol import short from C:.hgdev.src.mercurial.node
(esc)
+ C:/hgdev/src/mercurial/exchange.py:13: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/exchange.py:14: direct symbol import hex, nullid, nullrev from C:.hgdev.src.mercurial.node
(esc)
+ C:/hgdev/src/mercurial/exchange.py:19: direct symbol import attr from C:.hgdev.src.mercurial.thirdparty
(esc)
+ C:/hgdev/src/mercurial/exchangev2.py:13: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/exchangev2.py:14: direct symbol import nullid, short from C:.hgdev.src.mercurial.node
(esc)
+ C:/hgdev/src/mercurial/extensions.py:17: direct symbol import _, gettext from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/extensions.py:21: direct symbol import getattr, open, setattr from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/exthelper.py:22: direct symbol import tracing from hgdemandimport
(esc)
+ C:/hgdev/src/mercurial/exthelper.py:22: symbol import follows non-symbol import: hgdemandimport
(esc)
+ C:/hgdev/src/mercurial/fancyopts.py:13: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/filelog.py:10: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/filelog.py:11: direct symbol import nullid, nullrev from C:.hgdev.src.mercurial.node
(esc)
+ C:/hgdev/src/mercurial/filemerge.py:15: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/filemerge.py:16: direct symbol import hex, nullid, short from C:.hgdev.src.mercurial.node
(esc)
+ C:/hgdev/src/mercurial/filemerge.py:21: direct symbol import getattr, open from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/fileset.py:13: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/fileset.py:14: direct symbol import getattr from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/filesetlang.py:10: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/filesetlang.py:11: direct symbol import getattr from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/formatter.py:114: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/formatter.py:115: direct symbol import hex, short from C:.hgdev.src.mercurial.node
(esc)
+ C:/hgdev/src/mercurial/formatter.py:119: direct symbol import attr from C:.hgdev.src.mercurial.thirdparty
(esc)
+ C:/hgdev/src/mercurial/graphmod.py:22: direct symbol import nullrev from C:.hgdev.src.mercurial.node
(esc)
+ C:/hgdev/src/mercurial/graphmod.py:23: direct symbol import attr from C:.hgdev.src.mercurial.thirdparty
(esc)
+ C:/hgdev/src/mercurial/hbisect.py:16: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/hbisect.py:17: direct symbol import hex, short from C:.hgdev.src.mercurial.node
(esc)
+ C:/hgdev/src/mercurial/help.py:14: direct symbol import _, gettext from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/help.py:18: direct symbol import getattr from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/hg.py:16: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/hg.py:17: direct symbol import nullid from C:.hgdev.src.mercurial.node
(esc)
+ C:/hgdev/src/mercurial/hg.py:18: direct symbol import getattr from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/hgweb/__init__.py:13: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/hgweb/common.py:17: direct symbol import getattr, open from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/hgweb/hgweb_mod.py:14: direct symbol import ErrorResponse, HTTP_BAD_REQUEST, cspvalues, permhooks, statusmessage from C:.hgdev.src.mercurial.hgweb.common
(esc)
+ C:/hgdev/src/mercurial/hgweb/hgweb_mod.py:21: direct symbol import getattr from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/hgweb/hgwebdir_mod.py:15: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/hgweb/hgwebdir_mod.py:17: direct symbol import ErrorResponse, HTTP_SERVER_ERROR, cspvalues, get_contact, get_mtime, ismember, paritygen, staticfile, statusmessage from C:.hgdev.src.mercurial.hgweb.common
(esc)
+ C:/hgdev/src/mercurial/hgweb/request.py:13: direct symbol import attr from C:.hgdev.src.mercurial.thirdparty
(esc)
+ C:/hgdev/src/mercurial/hgweb/server.py:19: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/hgweb/server.py:20: direct symbol import getattr, open from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/hgweb/webcommands.py:15: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/hgweb/webcommands.py:16: direct symbol import hex, short from C:.hgdev.src.mercurial.node
(esc)
+ C:/hgdev/src/mercurial/hgweb/webcommands.py:17: direct symbol import getattr from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/hgweb/webcommands.py:19: direct symbol import ErrorResponse, HTTP_FORBIDDEN, HTTP_NOT_FOUND, get_contact, paritygen, staticfile from C:.hgdev.src.mercurial.hgweb.common
(esc)
+ C:/hgdev/src/mercurial/hgweb/webutil.py:16: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/hgweb/webutil.py:17: direct symbol import hex, nullid, short from C:.hgdev.src.mercurial.node
(esc)
+ C:/hgdev/src/mercurial/hgweb/webutil.py:18: direct symbol import setattr from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/hgweb/webutil.py:20: direct symbol import ErrorResponse, HTTP_BAD_REQUEST, HTTP_NOT_FOUND, paritygen from C:.hgdev.src.mercurial.hgweb.common
(esc)
+ C:/hgdev/src/mercurial/hgweb/wsgicgi.py:15: direct symbol import getattr from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/hook.py:14: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/hook.py:15: direct symbol import getattr from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/httpconnection.py:15: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/httpconnection.py:16: direct symbol import open from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/httppeer.py:18: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/httppeer.py:19: direct symbol import getattr from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/i18n.py:15: direct symbol import getattr from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/interfaces/repository.py:10: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/keepalive.py:94: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/keepalive.py:95: direct symbol import getattr from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/linelog.py:26: direct symbol import attr from C:.hgdev.src.mercurial.thirdparty
(esc)
+ C:/hgdev/src/mercurial/localrepo.py:18: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/localrepo.py:19: direct symbol import bin, hex, nullid, nullrev, short from C:.hgdev.src.mercurial.node
(esc)
+ C:/hgdev/src/mercurial/localrepo.py:26: direct symbol import delattr, getattr from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/lock.py:18: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/lock.py:19: direct symbol import getattr from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/logcmdutil.py:14: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/logcmdutil.py:15: direct symbol import nullid, wdirid, wdirrev from C:.hgdev.src.mercurial.node
(esc)
+ C:/hgdev/src/mercurial/logcmdutil.py:21: direct symbol import attr from C:.hgdev.src.mercurial.thirdparty
(esc)
+ C:/hgdev/src/mercurial/logexchange.py:11: direct symbol import hex from C:.hgdev.src.mercurial.node
(esc)
+ C:/hgdev/src/mercurial/lsprof.py:6: direct symbol import getattr from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/mail.py:22: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/mail.py:23: direct symbol import getattr, open from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/manifest.py:15: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/manifest.py:16: direct symbol import bin, hex, nullid, nullrev from C:.hgdev.src.mercurial.node
(esc)
+ C:/hgdev/src/mercurial/manifest.py:22: direct symbol import getattr from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/match.py:15: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/match.py:16: direct symbol import open from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/mdiff.py:14: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/mdiff.py:15: direct symbol import getattr, setattr from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/merge.py:15: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/merge.py:16: direct symbol import addednodeid, modifiednodeid, nullid, nullrev from C:.hgdev.src.mercurial.node
(esc)
+ C:/hgdev/src/mercurial/merge.py:22: direct symbol import attr from C:.hgdev.src.mercurial.thirdparty
(esc)
+ C:/hgdev/src/mercurial/mergestate.py:8: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/mergestate.py:9: direct symbol import bin, hex, nullhex, nullid from C:.hgdev.src.mercurial.node
(esc)
+ C:/hgdev/src/mercurial/mergeutil.py:10: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/minifileset.py:10: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/minirst.py:25: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/namespaces.py:3: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/narrowspec.py:10: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/narrowspec.py:11: direct symbol import getattr from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/obsolete.py:75: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/obsolete.py:76: direct symbol import getattr from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/obsutil.py:12: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/parser.py:21: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/patch.py:20: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/patch.py:21: direct symbol import hex, short from C:.hgdev.src.mercurial.node
(esc)
+ C:/hgdev/src/mercurial/patch.py:25: direct symbol import open from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/pathutil.py:9: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/phases.py:108: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/phases.py:109: direct symbol import bin, hex, nullid, nullrev, short, wdirrev from C:.hgdev.src.mercurial.node
(esc)
+ C:/hgdev/src/mercurial/phases.py:117: direct symbol import getattr, setattr from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/policy.py:13: direct symbol import getattr from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/posix.py:23: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/posix.py:24: direct symbol import getattr, open from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/profiling.py:12: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/profiling.py:13: direct symbol import getattr, open from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/progress.py:14: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/pure/osutil.py:16: direct symbol import getattr from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/pure/parsers.py:13: direct symbol import nullid, nullrev from C:.hgdev.src.mercurial.node
(esc)
+ C:/hgdev/src/mercurial/pvec.py:53: direct symbol import nullrev from C:.hgdev.src.mercurial.node
(esc)
+ C:/hgdev/src/mercurial/repair.py:13: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/repair.py:14: direct symbol import hex, short from C:.hgdev.src.mercurial.node
(esc)
+ C:/hgdev/src/mercurial/repoview.py:14: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/repoview.py:15: direct symbol import hex, nullrev from C:.hgdev.src.mercurial.node
(esc)
+ C:/hgdev/src/mercurial/repoview.py:19: direct symbol import delattr, getattr, setattr from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/revlog.py:25: direct symbol import bin, hex, nullhex, nullid, nullrev, short, wdirfilenodeids, wdirhex, wdirid, wdirrev from C:.hgdev.src.mercurial.node
(esc)
+ C:/hgdev/src/mercurial/revlog.py:37: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/revlog.py:38: direct symbol import getattr from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/revlog.py:39: direct symbol import FLAG_GENERALDELTA, FLAG_INLINE_DATA, REVLOGV0, REVLOGV1, REVLOGV1_FLAGS, REVLOGV2, REVLOGV2_FLAGS, REVLOG_DEFAULT_FLAGS, REVLOG_DEFAULT_FORMAT, REVLOG_DEFAULT_VERSION from C:.hgdev.src.mercurial.revlogutils.constants
(esc)
+ C:/hgdev/src/mercurial/revlog.py:51: direct symbol import REVIDX_DEFAULT_FLAGS, REVIDX_ELLIPSIS, REVIDX_EXTSTORED, REVIDX_FLAGS_ORDER, REVIDX_HASCOPIESINFO, REVIDX_ISCENSORED, REVIDX_RAWTEXT_CHANGING_FLAGS, REVIDX_SIDEDATA from C:.hgdev.src.mercurial.revlogutils.flagutil
(esc)
+ C:/hgdev/src/mercurial/revlog.py:61: direct symbol import attr from C:.hgdev.src.mercurial.thirdparty
(esc)
+ C:/hgdev/src/mercurial/revlogutils/deltas.py:16: direct symbol import nullrev from C:.hgdev.src.mercurial.node
(esc)
+ C:/hgdev/src/mercurial/revlogutils/deltas.py:17: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/revlogutils/deltas.py:18: direct symbol import getattr from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/revlogutils/deltas.py:20: direct symbol import REVIDX_ISCENSORED, REVIDX_RAWTEXT_CHANGING_FLAGS from C:.hgdev.src.mercurial.revlogutils.constants
(esc)
+ C:/hgdev/src/mercurial/revlogutils/deltas.py:25: direct symbol import attr from C:.hgdev.src.mercurial.thirdparty
(esc)
+ C:/hgdev/src/mercurial/revlogutils/flagutil.py:11: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/revlogutils/flagutil.py:13: direct symbol import REVIDX_DEFAULT_FLAGS, REVIDX_ELLIPSIS, REVIDX_EXTSTORED, REVIDX_FLAGS_ORDER, REVIDX_HASCOPIESINFO, REVIDX_ISCENSORED, REVIDX_RAWTEXT_CHANGING_FLAGS, REVIDX_SIDEDATA from C:.hgdev.src.mercurial.revlogutils.constants
(esc)
+ C:/hgdev/src/mercurial/revlogutils/nodemap.py:16: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/revset.py:12: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/revset.py:13: direct symbol import getattr from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/revsetlang.py:12: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/revsetlang.py:13: direct symbol import getattr from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/rewriteutil.py:12: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/scmposix.py:9: direct symbol import getattr from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/scmutil.py:18: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/scmutil.py:19: direct symbol import bin, hex, nullid, nullrev, short, wdirid, wdirrev from C:.hgdev.src.mercurial.node
(esc)
+ C:/hgdev/src/mercurial/scmutil.py:28: direct symbol import getattr from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/scmutil.py:29: direct symbol import attr from C:.hgdev.src.mercurial.thirdparty
(esc)
+ C:/hgdev/src/mercurial/server.py:12: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/server.py:13: direct symbol import open from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/setdiscovery.py:48: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/setdiscovery.py:49: direct symbol import nullid, nullrev from C:.hgdev.src.mercurial.node
(esc)
+ C:/hgdev/src/mercurial/shelve.py:30: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/shelve.py:31: direct symbol import open from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/similar.py:10: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/simplemerge.py:21: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/smartset.py:10: direct symbol import getattr from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/sparse.py:12: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/sparse.py:13: direct symbol import hex, nullid from C:.hgdev.src.mercurial.node
(esc)
+ C:/hgdev/src/mercurial/sshpeer.py:13: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/sshpeer.py:14: direct symbol import getattr from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/sslutil.py:17: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/sslutil.py:18: direct symbol import getattr from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/state.py:24: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/statichttprepo.py:14: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/statprof.py:117: direct symbol import open from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/store.py:15: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/store.py:16: direct symbol import getattr from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/streamclone.py:14: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/streamclone.py:15: direct symbol import open from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/subrepo.py:20: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/subrepoutil.py:15: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/subrepoutil.py:16: direct symbol import getattr from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/tagmerge.py:76: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/tagmerge.py:77: direct symbol import hex, nullid from C:.hgdev.src.mercurial.node
(esc)
+ C:/hgdev/src/mercurial/tags.py:18: direct symbol import bin, hex, nullid, nullrev, short from C:.hgdev.src.mercurial.node
(esc)
+ C:/hgdev/src/mercurial/tags.py:25: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/templatefilters.py:14: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/templatefuncs.py:12: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/templatefuncs.py:13: direct symbol import bin, wdirid from C:.hgdev.src.mercurial.node
(esc)
+ C:/hgdev/src/mercurial/templatekw.py:10: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/templatekw.py:11: direct symbol import hex, nullid, wdirid, wdirrev from C:.hgdev.src.mercurial.node
(esc)
+ C:/hgdev/src/mercurial/templater.py:73: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/templater.py:74: direct symbol import getattr from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/templateutil.py:13: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/templateutil.py:14: direct symbol import getattr from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/testing/storage.py:12: direct symbol import hex, nullid, nullrev from C:.hgdev.src.mercurial.node
(esc)
+ C:/hgdev/src/mercurial/testing/storage.py:17: direct symbol import getattr from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/transaction.py:18: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/treediscovery.py:12: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/treediscovery.py:13: direct symbol import nullid, short from C:.hgdev.src.mercurial.node
(esc)
+ C:/hgdev/src/mercurial/ui.py:24: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/ui.py:25: direct symbol import hex from C:.hgdev.src.mercurial.node
(esc)
+ C:/hgdev/src/mercurial/ui.py:26: direct symbol import getattr, open, setattr from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/unionrepo.py:16: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/unionrepo.py:17: direct symbol import getattr from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/upgrade.py:12: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/upgrade.py:13: direct symbol import getattr from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/url.py:17: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/url.py:18: direct symbol import getattr from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/urllibcompat.py:9: direct symbol import getattr from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/util.py:38: direct symbol import attr from C:.hgdev.src.mercurial.thirdparty
(esc)
+ C:/hgdev/src/mercurial/util.py:39: direct symbol import delattr, getattr, open, setattr from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/util.py:45: direct symbol import tracing from hgdemandimport
(esc)
+ C:/hgdev/src/mercurial/utils/compression.py:13: direct symbol import getattr from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/utils/dateutil.py:14: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/utils/procutil.py:22: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/utils/procutil.py:23: direct symbol import getattr, open from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/utils/storageutil.py:13: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/utils/storageutil.py:14: direct symbol import bin, nullid, nullrev from C:.hgdev.src.mercurial.node
(esc)
+ C:/hgdev/src/mercurial/utils/stringutil.py:18: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/utils/stringutil.py:19: direct symbol import attr from C:.hgdev.src.mercurial.thirdparty
(esc)
+ C:/hgdev/src/mercurial/verify.py:12: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/verify.py:13: direct symbol import nullid, short from C:.hgdev.src.mercurial.node
(esc)
+ C:/hgdev/src/mercurial/vfs.py:16: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/vfs.py:17: direct symbol import delattr, getattr, setattr from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/windows.py:19: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/windows.py:20: direct symbol import getattr from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/wireprotoframing.py:17: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/wireprotoframing.py:18: direct symbol import getattr from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/wireprotoframing.py:19: direct symbol import attr from C:.hgdev.src.mercurial.thirdparty
(esc)
+ C:/hgdev/src/mercurial/wireprotoserver.py:14: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/wireprototypes.py:8: direct symbol import bin, hex from C:.hgdev.src.mercurial.node
(esc)
+ C:/hgdev/src/mercurial/wireprototypes.py:12: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/wireprototypes.py:13: direct symbol import getattr from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/wireprototypes.py:14: direct symbol import attr from C:.hgdev.src.mercurial.thirdparty
(esc)
+ C:/hgdev/src/mercurial/wireprotov1peer.py:13: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/wireprotov1peer.py:14: direct symbol import bin from C:.hgdev.src.mercurial.node
(esc)
+ C:/hgdev/src/mercurial/wireprotov1peer.py:15: direct symbol import getattr, setattr from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/wireprotov1server.py:13: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/wireprotov1server.py:14: direct symbol import hex, nullid from C:.hgdev.src.mercurial.node
(esc)
+ C:/hgdev/src/mercurial/wireprotov1server.py:18: direct symbol import getattr from C:.hgdev.src.mercurial.pycompat
(esc)
+ C:/hgdev/src/mercurial/wireprotov2peer.py:12: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/wireprotov2server.py:12: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/mercurial/wireprotov2server.py:13: direct symbol import hex, nullid from C:.hgdev.src.mercurial.node
(esc)
+ C:/hgdev/src/mercurial/worker.py:24: direct symbol import _ from C:.hgdev.src.mercurial.i18n
(esc)
+ C:/hgdev/src/tests/badserverext.py:41: direct symbol import server from mercurial.hgweb
(esc)
+ C:/hgdev/src/tests/bruterebase.py:16: direct symbol import rebase from hgext
(esc)
+ C:/hgdev/src/tests/fakedirstatewritetime.py:17: direct symbol import dateutil from mercurial.utils
(esc)
+ C:/hgdev/src/tests/fakepatchtime.py:11: direct symbol import dateutil from mercurial.utils
(esc)
+ C:/hgdev/src/tests/flagprocessorext.py:15: direct symbol import flagutil from mercurial.revlogutils
(esc)
+ C:/hgdev/src/tests/hgweberror.py:5: direct symbol import webcommands from mercurial.hgweb
(esc)
+ C:/hgdev/src/tests/httpserverauth.py:6: direct symbol import common from mercurial.hgweb
(esc)
+ C:/hgdev/src/tests/mockblackbox.py:2: direct symbol import procutil from mercurial.utils
(esc)
+ C:/hgdev/src/tests/mockmakedate.py:8: direct symbol import dateutil from mercurial.utils
(esc)
+ C:/hgdev/src/tests/printrevset.py:12: direct symbol import stringutil from mercurial.utils
(esc)
+ C:/hgdev/src/tests/simplestorerepo.py:41: direct symbol import cborutil, storageutil from mercurial.utils
(esc)
+ C:/hgdev/src/tests/simplestorerepo.py:45: direct symbol import flagutil from mercurial.revlogutils
(esc)
+ C:/hgdev/src/tests/test-absorb-filefixupstate.py:5: direct symbol import absorb from hgext
(esc)
+ C:/hgdev/src/tests/test-annotate.t:1055: direct symbol import procutil from mercurial.utils
(esc)
+ C:/hgdev/src/tests/test-bugzilla.t:8: direct symbol import stringutil from mercurial.utils
(esc)
+ C:/hgdev/src/tests/test-bundle2-format.t:27: direct symbol import procutil from mercurial.utils
(esc)
+ C:/hgdev/src/tests/test-cbor.py:19: direct symbol import cborutil from mercurial.utils
(esc)
+ C:/hgdev/src/tests/test-commit-interactive.t:945: direct symbol import procutil from mercurial.utils
(esc)
+ C:/hgdev/src/tests/test-config-env.py:15: direct symbol import procutil from mercurial.utils
(esc)
+ C:/hgdev/src/tests/test-debugcommands.t:578: direct symbol import procutil from mercurial.utils
(esc)
+ C:/hgdev/src/tests/test-extension.t:155: direct symbol import procutil from mercurial.utils
(esc)
+ C:/hgdev/src/tests/test-fastannotate-revmap.py:11: direct symbol import error, revmap from hgext.fastannotate
(esc)
+ C:/hgdev/src/tests/test-help.t:1927: direct symbol import procutil from mercurial.utils
(esc)
+ C:/hgdev/src/tests/test-help.t:1938: direct symbol import procutil from mercurial.utils
(esc)
+ C:/hgdev/src/tests/test-hgweb-auth.py:6: symbol import follows non-symbol import: mercurial
(esc)
+ C:/hgdev/src/tests/test-hgweb-auth.py:13: direct symbol import stringutil from mercurial.utils
(esc)
+ C:/hgdev/src/tests/test-hgweb-auth.py:13: symbol import follows non-symbol import: mercurial.utils
(esc)
+ C:/hgdev/src/tests/test-hgweb-non-interactive.t:20: direct symbol import procutil from mercurial.utils
(esc)
+ C:/hgdev/src/tests/test-hgweb-non-interactive.t:24: direct symbol import hgweb_mod from mercurial.hgweb
(esc)
+ C:/hgdev/src/tests/test-hgwebdir-paths.py:8: direct symbol import hgwebdir_mod from mercurial.hgweb
(esc)
+ C:/hgdev/src/tests/test-http.t:543: direct symbol import common from mercurial.hgweb
(esc)
+ C:/hgdev/src/tests/test-http-permissions.t:3: direct symbol import hgweb_mod from mercurial.hgweb
(esc)
+ C:/hgdev/src/tests/test-import-context.t:22: direct symbol import procutil, stringutil from mercurial.utils
(esc)
+ C:/hgdev/src/tests/test-journal.t:7: direct symbol import dateutil, procutil from mercurial.utils
(esc)
+ C:/hgdev/src/tests/test-journal-share.t:14: direct symbol import procutil from mercurial.utils
(esc)
+ C:/hgdev/src/tests/test-lfs.t:561: direct symbol import stringutil from mercurial.utils
(esc)
+ C:/hgdev/src/tests/test-lfs.t:699: direct symbol import procutil, stringutil from mercurial.utils
(esc)
+ C:/hgdev/src/tests/test-lfs.t:821: direct symbol import pointer, wrapper from hgext.lfs
(esc)
+ C:/hgdev/src/tests/test-lfs-pointer.py:8: direct symbol import pointer from hgext.lfs
(esc)
+ C:/hgdev/src/tests/test-lfs-serve-access.t:202: direct symbol import blobstore from hgext.lfs
(esc)
+ C:/hgdev/src/tests/test-linerange.py:5: direct symbol import stringutil from mercurial.utils
(esc)
+ C:/hgdev/src/tests/test-minirst.py:3: direct symbol import stringutil from mercurial.utils
(esc)
+ C:/hgdev/src/tests/test-obsolete.t:1473: direct symbol import stringutil from mercurial.utils
(esc)
+ C:/hgdev/src/tests/test-propertycache.py:19: direct symbol import procutil from mercurial.utils
(esc)
+ C:/hgdev/src/tests/test-remotefilelog-datapack.py:32: direct symbol import basepack, constants, datapack from hgext.remotefilelog
(esc)
+ C:/hgdev/src/tests/test-remotefilelog-histpack.py:24: direct symbol import basepack, historypack from hgext.remotefilelog
(esc)
+ C:/hgdev/src/tests/test-revlog-raw.py:17: direct symbol import deltas, flagutil from mercurial.revlogutils
(esc)
+ C:/hgdev/src/tests/test-revset.t:46: direct symbol import stringutil from mercurial.utils
(esc)
+ C:/hgdev/src/tests/test-rust-ancestor.py:10: direct symbol import revlog from mercurial.testing
(esc)
+ C:/hgdev/src/tests/test-rust-revlog.py:16: direct symbol import revlog from mercurial.testing
(esc)
+ C:/hgdev/src/tests/test-simplemerge.py:25: direct symbol import stringutil from mercurial.utils
(esc)
+ C:/hgdev/src/tests/test-sshserver.py:13: direct symbol import procutil from mercurial.utils
(esc)
+ C:/hgdev/src/tests/test-state-extension.t:6: direct symbol import rebase from hgext
(esc)
+ C:/hgdev/src/tests/test-storage.py:16: direct symbol import storage from mercurial.testing
(esc)
+ C:/hgdev/src/tests/test-template-functions.t:1579: direct symbol import cborutil, procutil, stringutil from mercurial.utils
(esc)
+ C:/hgdev/src/tests/test-template-map.t:727: direct symbol import cborutil, procutil, stringutil from mercurial.utils
(esc)
+ C:/hgdev/src/tests/test-trusted.py:16: direct symbol import stringutil from mercurial.utils
(esc)
+ C:/hgdev/src/tests/test-ui-color.py:8: direct symbol import stringutil from mercurial.utils
(esc)
+ C:/hgdev/src/tests/test-ui-config.py:8: direct symbol import stringutil from mercurial.utils
(esc)
+ C:/hgdev/src/tests/test-update-atomic.t:25: direct symbol import stringutil from mercurial.utils
(esc)
+ C:/hgdev/src/tests/test-wireproto-clientreactor.py:12: direct symbol import cborutil from mercurial.utils
(esc)
+ C:/hgdev/src/tests/test-wireproto-serverreactor.py:10: direct symbol import cborutil from mercurial.utils
(esc)
+ C:/hgdev/src/tests/test-wsgirequest.py:5: direct symbol import request from mercurial.hgweb
(esc)
+ C:/hgdev/src/tests/testlib/ext-sidedata.py:21: direct symbol import sidedata from mercurial.revlogutils
(esc)
+ C:/hgdev/src/tests/wireprotosimplecache.py:22: direct symbol import stringutil from mercurial.utils
(esc)
+ [1]
--- c:/hgdev/src/tests/test-contrib-perf.t
+++ c:/hgdev/src/tests/test-contrib-perf.t.err
@@ -379,21 +379,24 @@
> testrepohg files -r tip glob:mercurial/*.c glob:mercurial/*.py) |
> "$TESTDIR"/check-perf-code.py contrib/perf.py
contrib/perf.py:\d+: (re)
+ > from mercurial import (
(esc)
+ import newer module separately in try clause for early Mercurial
+ contrib/perf.py:\d+: (re)
> from mercurial import (
import newer module separately in try clause for early Mercurial
contrib/perf.py:\d+: (re)
- > from mercurial import (
- import newer module separately in try clause for early Mercurial
- contrib/perf.py:\d+: (re)
- > origindexpath = orig.opener.join(orig.indexfile)
+ > from mercurial import (
(esc)
+ import newer module separately in try clause for early Mercurial
(esc)
+ contrib/perf.py:\d+: (re)
+ > origindexpath = orig.opener.join(orig.indexfile)
(esc)
use getvfs()/getsvfs() for early Mercurial
contrib/perf.py:\d+: (re)
- > origdatapath = orig.opener.join(orig.datafile)
+ > origdatapath = orig.opener.join(orig.datafile)
(esc)
use getvfs()/getsvfs() for early Mercurial
contrib/perf.py:\d+: (re)
- > vfs = vfsmod.vfs(tmpdir)
+ > vfs = vfsmod.vfs(tmpdir)
(esc)
use getvfs()/getsvfs() for early Mercurial
- contrib/perf.py:\d+: (re)
- > vfs.options = getattr(orig.opener, 'options', None)
- use getvfs()/getsvfs() for early Mercurial
+ contrib/perf.py:3002:
(esc)
+ > vfs.options = getattr(orig.opener, 'options', None)
(esc)
+ use getvfs()/getsvfs() for early Mercurial
(esc)
[1]
test-copy-move-merge.t
--- c:/hgdev/src/tests/test-copy-move-merge.t
+++ c:/hgdev/src/tests/test-copy-move-merge.t.err
@@ -100,10 +100,11 @@
resolving manifests
branchmerge: True, force: False, partial: False
ancestor: b8bf91eeebbc, local: add3f11052fa+, remote: 17c05bb7fcb6
+ starting 4 threads for background file closing
preserving a for resolve of b
preserving a for resolve of c
+ starting 4 threads for background file closing (?)
removing a
- starting 4 threads for background file closing (?)
b: remote moved from a -> m (premerge)
picked tool ':merge' for b (binary False symlink False changedelete False)
merging a and b to b
test-debugcommands.t
--- c:/hgdev/src/tests/test-debugcommands.t
+++ c:/hgdev/src/tests/test-debugcommands.t.err
@@ -440,11 +440,12 @@
> }
$ dolock -s &
$ waitlock .hg/store/lock
-
- $ hg debuglocks
- lock: user *, process * (*s) (glob)
- wlock: free
+ timeout: .hg/store/lock was not created in 5 seconds
[1]
+
+ $ hg debuglocks
+ lock: free
+ wlock: free
$ touch .hg/unlock
$ wait
$ [ -f .hg/store/lock ] || echo "There is no lock"
@@ -454,11 +455,12 @@
$ dolock -S &
$ waitlock .hg/wlock
-
- $ hg debuglocks
- lock: free
- wlock: user *, process * (*s) (glob)
+ timeout: .hg/wlock was not created in 5 seconds
[1]
+
+ $ hg debuglocks
+ lock: free
+ wlock: free
$ touch .hg/unlock
$ wait
$ [ -f .hg/wlock ] || echo "There is no wlock"
@@ -468,20 +470,21 @@
$ dolock -Ss &
$ waitlock .hg/wlock && waitlock .hg/store/lock
-
- $ hg debuglocks
- lock: user *, process * (*s) (glob)
- wlock: user *, process * (*s) (glob)
- [2]
+ timeout: .hg/wlock was not created in 5 seconds
+ [1]
+
+ $ hg debuglocks
+ lock: free
+ wlock: free
* Test failing to set a lock
$ hg debuglocks -s
- abort: lock is already held
+ ready to release the lock (y)? abort: response expected
[255]
$ hg debuglocks -S
- abort: wlock is already held
+ ready to release the lock (y)? abort: response expected
[255]
$ touch .hg/unlock
@@ -495,13 +498,16 @@
$ dolock -s &
$ waitlock .hg/store/lock
-
- $ hg debuglocks
- lock: user *, process * (*s) (glob)
- wlock: free
+ timeout: .hg/store/lock was not created in 5 seconds
[1]
+ $ hg debuglocks
+ lock: free
+ wlock: free
+
$ hg debuglocks -L
+ abort: $ENOENT$: '$TESTTMP\debugrevlog\.hg/store\lock'
+ [255]
$ hg debuglocks
lock: free
@@ -514,13 +520,16 @@
$ dolock -S &
$ waitlock .hg/wlock
-
- $ hg debuglocks
- lock: free
- wlock: user *, process * (*s) (glob)
+ timeout: .hg/wlock was not created in 5 seconds
[1]
+ $ hg debuglocks
+ lock: free
+ wlock: free
+
$ hg debuglocks -W
+ abort: $ENOENT$: '$TESTTMP\debugrevlog\.hg\wlock'
+ [255]
$ hg debuglocks
lock: free
test-doctest.py
--- c:/hgdev/src/tests/test-doctest.py.out
+++ c:/hgdev/src/tests/test-doctest.py.err
@@ -0,0 +1,6 @@
+Traceback (most recent call last):
+ File "c:\hgdev\src ests est-doctest.py", line 115, in <module>
+ testmod(modname, **kwargs)
+ File "c:\hgdev\src ests est-doctest.py", line 38, in testmod
+ __import__(name)
+ModuleNotFoundError: No module named 'C:'
test-double-merge.t
--- c:/hgdev/src/tests/test-double-merge.t
+++ c:/hgdev/src/tests/test-double-merge.t.err
@@ -35,9 +35,10 @@
resolving manifests
branchmerge: True, force: False, partial: False
ancestor: e6dc8efe11cc, local: 6a0df1dad128+, remote: 484bf6903104
+ starting 4 threads for background file closing
preserving foo for resolve of bar
+ starting 4 threads for background file closing (?)
preserving foo for resolve of foo
- starting 4 threads for background file closing (?)
bar: remote copied from foo -> m (premerge)
picked tool ':merge' for bar (binary False symlink False changedelete False)
merging foo and bar to bar
test-fix.t
--- c:/hgdev/src/tests/test-fix.t
+++ c:/hgdev/src/tests/test-fix.t.err
@@ -608,7 +608,7 @@
$ sleep 2 # mtime has a resolution of one or two seconds.
$ hg fix --working-dir
$ f foo.whole.orig --newer foo.whole
- foo.whole.orig: newer than foo.whole
+ foo.whole.orig: older than foo.whole
$ cd ..
@@ -939,6 +939,7 @@
0
$ hg fix -r .
$ hg log --template '{rev}
'
+ 1
0
$ cd ..
@@ -957,6 +958,7 @@
M foo.whole
$ hg fix -r .
$ hg status --change tip
+ M foo.whole
$ cd ..
@@ -984,15 +986,17 @@
$ hg fix -r 0:2
$ hg log --graph --template '{rev} {files}'
- o 4 bar.whole
+ o 5 bar.whole
|
- o 3
+ o 4
|
- | @ 2 bar.whole
- | |
- | x 1 foo.whole
- |/
- o 0 foo.whole
+ o 3 foo.whole
+
+ @ 2 bar.whole
+ |
+ x 1 foo.whole
+ |
+ x 0 foo.whole
$ cd ..
@@ -1507,13 +1511,13 @@
$ make_test_files wdir
$ hg fix -r 'not public()' -w
$ hg log -G -T'{rev}:{shortest(node,8)}: branch:{branch} desc:{desc}'
- @ 8:c22ce900: branch:child desc:child of merge
+ @ 8:6da3f279: branch:child desc:child of merge
|
- o 7:5a30615a: branch:merge desc:evil merge
+ o 7:0d0bfa28: branch:merge desc:evil merge
|- | o 6:4e5acdc4: branch:r2 desc:merge me, pt2
+ | o 6:5f9f0e2f: branch:r2 desc:merge me, pt2
| |
- o | 5:eea01878: branch:r1 desc:merge me, pt1
+ o | 5:935ac1bf: branch:r1 desc:merge me, pt1
|/
o 0:0c548d87: branch:r0 desc:r0
--- c:/hgdev/src/tests/test-graft.t
+++ c:/hgdev/src/tests/test-graft.t.err
@@ -210,8 +210,9 @@
resolving manifests
branchmerge: True, force: True, partial: False
ancestor: 68795b066622, local: ef0ef43d49e7+, remote: 5d205f8b35b6
+ starting 4 threads for background file closing
+ starting 4 threads for background file closing (?)
preserving b for resolve of b
- starting 4 threads for background file closing (?)
b: local copied/moved from a -> m (premerge)
picked tool ':merge' for b (binary False symlink False changedelete False)
merging b and a to b
--- c:/hgdev/src/tests/test-rename-merge1.t
+++ c:/hgdev/src/tests/test-rename-merge1.t.err
@@ -216,8 +216,9 @@
resolving manifests
branchmerge: True, force: False, partial: False
ancestor: 5151c134577e, local: 07fcbc9a74ed+, remote: f21419739508
+ starting 4 threads for background file closing
+ starting 4 threads for background file closing (?)
preserving z for resolve of z
- starting 4 threads for background file closing (?)
z: both renamed from y -> m (premerge)
picked tool ':merge3' for z (binary False symlink False changedelete False)
merging z
test-rename-merge2.t
--- c:/hgdev/src/tests/test-rename-merge2.t
+++ c:/hgdev/src/tests/test-rename-merge2.t.err
@@ -85,11 +85,12 @@
resolving manifests
branchmerge: True, force: False, partial: False
ancestor: 924404dff337, local: e300d1c794ec+, remote: 4ce40f5aca24
+ starting 4 threads for background file closing
preserving a for resolve of b
+ starting 4 threads for background file closing (?)
preserving rev for resolve of rev
starting 4 threads for background file closing (?)
b: remote copied from a -> m (premerge)
- starting 4 threads for background file closing (?)
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging a and b to b
my b@e300d1c794ec+ other b@4ce40f5aca24 ancestor a@924404dff337
@@ -165,10 +166,11 @@
resolving manifests
branchmerge: True, force: False, partial: False
ancestor: 924404dff337, local: e300d1c794ec+, remote: bdb19105162a
+ starting 4 threads for background file closing
preserving a for resolve of b
preserving rev for resolve of rev
+ starting 4 threads for background file closing (?)
removing a
- starting 4 threads for background file closing (?)
b: remote moved from a -> m (premerge)
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging a and b to b
@@ -204,9 +206,10 @@
resolving manifests
branchmerge: True, force: False, partial: False
ancestor: 924404dff337, local: 02963e448370+, remote: f4db7e329e71
- preserving b for resolve of b
- preserving rev for resolve of rev
- starting 4 threads for background file closing (?)
+ starting 4 threads for background file closing
+ preserving b for resolve of b
+ starting 4 threads for background file closing (?)
+ preserving rev for resolve of rev
b: local copied/moved from a -> m (premerge)
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging b and a to b
@@ -275,8 +278,9 @@
resolving manifests
branchmerge: True, force: False, partial: False
ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 97c705ade336
- preserving rev for resolve of rev
- starting 4 threads for background file closing (?)
+ starting 4 threads for background file closing
+ starting 4 threads for background file closing (?)
+ preserving rev for resolve of rev
rev: versions differ -> m (premerge)
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
merging rev
@@ -341,8 +345,9 @@
resolving manifests
branchmerge: True, force: False, partial: False
ancestor: 924404dff337, local: 02963e448370+, remote: 97c705ade336
- preserving rev for resolve of rev
- starting 4 threads for background file closing (?)
+ starting 4 threads for background file closing
+ starting 4 threads for background file closing (?)
+ preserving rev for resolve of rev
rev: versions differ -> m (premerge)
picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
merging rev
@@ -372,9 +377,10 @@
resolving manifests
branchmerge: True, force: False, partial: False
ancestor: 924404dff337, local: 62e7bf090eba+, remote: 49b6d8032493
- preserving b for resolve of b
- preserving rev for resolve of rev
- starting 4 threads for background file closing (?)
+ starting 4 threads for background file closing
+ preserving b for resolve of b
+ starting 4 threads for background file closing (?)
+ preserving rev for resolve of rev
b: both renamed from a -> m (premerge)
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging b
@@ -454,9 +460,10 @@
resolving manifests
branchmerge: True, force: False, partial: False
ancestor: 924404dff337, local: 86a2aa42fc76+, remote: af30c7647fc7
- preserving b for resolve of b
- preserving rev for resolve of rev
- starting 4 threads for background file closing (?)
+ starting 4 threads for background file closing
+ preserving b for resolve of b
+ starting 4 threads for background file closing (?)
+ preserving rev for resolve of rev
b: both created -> m (premerge)
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging b
@@ -496,9 +503,10 @@
ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a
a: other deleted -> r
removing a
- preserving b for resolve of b
- preserving rev for resolve of rev
- starting 4 threads for background file closing (?)
+ starting 4 threads for background file closing
+ preserving b for resolve of b
+ starting 4 threads for background file closing (?)
+ preserving rev for resolve of rev
b: both created -> m (premerge)
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging b
@@ -574,9 +582,10 @@
ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a
a: other deleted -> r
removing a
- preserving b for resolve of b
- preserving rev for resolve of rev
- starting 4 threads for background file closing (?)
+ starting 4 threads for background file closing
+ preserving b for resolve of b
+ starting 4 threads for background file closing (?)
+ preserving rev for resolve of rev
b: both created -> m (premerge)
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging b
@@ -650,11 +659,12 @@
resolving manifests
branchmerge: True, force: False, partial: False
ancestor: 924404dff337, local: 0b76e65c8289+, remote: 4ce40f5aca24
- preserving b for resolve of b
+ starting 4 threads for background file closing
+ preserving b for resolve of b
+ starting 4 threads for background file closing (?)
preserving rev for resolve of rev
starting 4 threads for background file closing (?)
b: both renamed from a -> m (premerge)
- starting 4 threads for background file closing (?)
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging b
my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor a@924404dff337
@@ -687,9 +697,10 @@
resolving manifests
branchmerge: True, force: False, partial: False
ancestor: 924404dff337, local: 02963e448370+, remote: 8dbce441892a
- preserving b for resolve of b
- preserving rev for resolve of rev
- starting 4 threads for background file closing (?)
+ starting 4 threads for background file closing
+ preserving b for resolve of b
+ starting 4 threads for background file closing (?)
+ preserving rev for resolve of rev
b: both renamed from a -> m (premerge)
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging b
@@ -722,9 +733,10 @@
resolving manifests
branchmerge: True, force: False, partial: False
ancestor: 924404dff337, local: 0b76e65c8289+, remote: bdb19105162a
- preserving b for resolve of b
- preserving rev for resolve of rev
- starting 4 threads for background file closing (?)
+ starting 4 threads for background file closing
+ preserving b for resolve of b
+ starting 4 threads for background file closing (?)
+ preserving rev for resolve of rev
b: both renamed from a -> m (premerge)
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging b
@@ -760,10 +772,11 @@
resolving manifests
branchmerge: True, force: False, partial: False
ancestor: 924404dff337, local: e300d1c794ec+, remote: 49b6d8032493
+ starting 4 threads for background file closing
preserving a for resolve of b
preserving rev for resolve of rev
+ starting 4 threads for background file closing (?)
removing a
- starting 4 threads for background file closing (?)
b: remote moved from a -> m (premerge)
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging a and b to b
@@ -803,9 +816,10 @@
resolving manifests
branchmerge: True, force: False, partial: False
ancestor: 924404dff337, local: 62e7bf090eba+, remote: f4db7e329e71
- preserving b for resolve of b
- preserving rev for resolve of rev
- starting 4 threads for background file closing (?)
+ starting 4 threads for background file closing
+ preserving b for resolve of b
+ starting 4 threads for background file closing (?)
+ preserving rev for resolve of rev
b: local copied/moved from a -> m (premerge)
picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
merging b and a to b
test-subrepo.t
--- c:/hgdev/src/tests/test-subrepo.t
+++ c:/hgdev/src/tests/test-subrepo.t.err
@@ -315,8 +315,9 @@
resolving manifests
branchmerge: True, force: False, partial: False
ancestor: 6747d179aa9a, local: 20a0db6fbf6c+, remote: 7af322bc1198
+ starting 4 threads for background file closing
+ starting 4 threads for background file closing (?)
preserving t for resolve of t
- starting 4 threads for background file closing (?)
t: versions differ -> m (premerge)
picked tool ':merge' for t (binary False symlink False changedelete False)
merging t
test-template-map.t
UnicodeDecodeError('unicodeescape', b'--- c:/hgdev/src/tests/test-template-map.t\n+++ c:/hgdev/src/tests/test-template-map.t.err\n@@ -138,7 +138,7 @@\n $ mkdir somedir\n $ echo "__base__ = somedir" > map-base-dir\n $ hg log -l1 -T./map-base-dir\n- abort: Is a directory: \'$TESTTMP/a/somedir\'\n+ abort: $TESTTMP\\a\\somedir: Access is denied\n [255]\n \n Test including a built-in template map\n@@ -1278,7 +1278,7 @@\n Error if style is a directory:\n \n $ hg log --style somedir\n- abort: Is a directory: \'somedir\'\n+ abort: somedir: Access is denied\n [255]\n \n Error if style is a directory whose name is a built-in style:\n@@ -1976,7 +1976,9 @@\n > EOF\n \n $ hg -R latesttag tip\n- test 11:97e5943b523a\n+ abort: style \'C:\\Users\\Administrator/styles/teststyle\' not found\n+ (available styles: bisect, changelog, compact, default, phases, show, status, xml)\n+ [255]\n \n Test recursive showlist template (issue1989):\n \n', 684, 686, 'truncated \\UXXXXXXXX escape') decoding diff, sorry
test-up-local-change.t
--- c:/hgdev/src/tests/test-up-local-change.t
+++ c:/hgdev/src/tests/test-up-local-change.t.err
@@ -70,8 +70,9 @@
ancestor: 1e71731e6fbb, local: 1e71731e6fbb+, remote: c19d34741b0a
b: other deleted -> r
removing b
+ starting 4 threads for background file closing
+ starting 4 threads for background file closing (?)
preserving a for resolve of a
- starting 4 threads for background file closing (?)
a: versions differ -> m (premerge)
picked tool 'true' for a (binary False symlink False changedelete False)
merging a