mirror of
https://github.com/facebook/sapling.git
synced 2024-10-11 09:17:30 +03:00
9dc21f8d0b
Summary: D13853115 adds `edenscm/` to `sys.path` and code still uses `import mercurial`. That has nasty problems if both `import mercurial` and `import edenscm.mercurial` are used, because Python would think `mercurial.foo` and `edenscm.mercurial.foo` are different modules so code like `try: ... except mercurial.error.Foo: ...`, or `isinstance(x, mercurial.foo.Bar)` would fail to handle the `edenscm.mercurial` version. There are also some module-level states (ex. `extensions._extensions`) that would cause trouble if they have multiple versions in a single process. Change imports to use the `edenscm` so ideally the `mercurial` is no longer imported at all. Add checks in extensions.py to catch unexpected extensions importing modules from the old (wrong) locations when running tests. Reviewed By: phillco Differential Revision: D13868981 fbshipit-source-id: f4e2513766957fd81d85407994f7521a08e4de48
74 lines
2.3 KiB
Perl
74 lines
2.3 KiB
Perl
$ hg init t
|
|
$ cd t
|
|
$ echo a > a
|
|
$ hg add a
|
|
$ hg commit -m test
|
|
$ rm .hg/requires
|
|
$ hg tip
|
|
abort: unknown version (2) in revlog 00changelog.i!
|
|
[255]
|
|
$ echo indoor-pool > .hg/requires
|
|
$ hg tip
|
|
abort: repository requires features unknown to this Mercurial: indoor-pool!
|
|
(see https://mercurial-scm.org/wiki/MissingRequirement for more information)
|
|
[255]
|
|
$ echo outdoor-pool >> .hg/requires
|
|
$ hg tip
|
|
abort: repository requires features unknown to this Mercurial: indoor-pool outdoor-pool!
|
|
(see https://mercurial-scm.org/wiki/MissingRequirement for more information)
|
|
[255]
|
|
$ cd ..
|
|
|
|
Test checking between features supported locally and ones required in
|
|
another repository of push/pull/clone on localhost:
|
|
|
|
$ mkdir supported-locally
|
|
$ cd supported-locally
|
|
|
|
$ hg init supported
|
|
$ echo a > supported/a
|
|
$ hg -R supported commit -Am '#0 at supported'
|
|
adding a
|
|
|
|
$ echo 'featuresetup-test' >> supported/.hg/requires
|
|
$ cat > $TESTTMP/supported-locally/supportlocally.py <<EOF
|
|
> from __future__ import absolute_import
|
|
> from edenscm.mercurial import extensions, localrepo
|
|
> def featuresetup(ui, supported):
|
|
> for name, module in extensions.extensions(ui):
|
|
> if __name__ == module.__name__:
|
|
> # support specific feature locally
|
|
> supported |= {'featuresetup-test'}
|
|
> return
|
|
> def uisetup(ui):
|
|
> localrepo.localrepository.featuresetupfuncs.add(featuresetup)
|
|
> EOF
|
|
$ cat > supported/.hg/hgrc <<EOF
|
|
> [extensions]
|
|
> # enable extension locally
|
|
> supportlocally = $TESTTMP/supported-locally/supportlocally.py
|
|
> EOF
|
|
$ hg -R supported status
|
|
|
|
$ hg init push-dst
|
|
$ hg -R supported push push-dst
|
|
pushing to push-dst
|
|
abort: required features are not supported in the destination: featuresetup-test
|
|
[255]
|
|
|
|
$ hg init pull-src
|
|
$ hg -R pull-src pull supported
|
|
pulling from supported
|
|
abort: required features are not supported in the destination: featuresetup-test
|
|
[255]
|
|
|
|
$ hg clone supported clone-dst
|
|
abort: repository requires features unknown to this Mercurial: featuresetup-test!
|
|
(see https://mercurial-scm.org/wiki/MissingRequirement for more information)
|
|
[255]
|
|
$ hg clone --pull supported clone-dst
|
|
abort: required features are not supported in the destination: featuresetup-test
|
|
[255]
|
|
|
|
$ cd ..
|