mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 00:45:18 +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
38 lines
878 B
Perl
38 lines
878 B
Perl
$ cat > abortcommit.py <<EOF
|
|
> from edenscm.mercurial import error
|
|
> def hook(**args):
|
|
> raise error.Abort("no commits allowed")
|
|
> def reposetup(ui, repo):
|
|
> repo.ui.setconfig("hooks", "pretxncommit.nocommits", hook)
|
|
> EOF
|
|
$ abspath=`pwd`/abortcommit.py
|
|
|
|
$ cat <<EOF >> $HGRCPATH
|
|
> [extensions]
|
|
> mq =
|
|
> abortcommit = $abspath
|
|
> EOF
|
|
|
|
$ hg init foo
|
|
$ cd foo
|
|
$ echo foo > foo
|
|
$ hg add foo
|
|
|
|
mq may keep a reference to the repository so __del__ will not be
|
|
called and .hg/journal.dirstate will not be deleted:
|
|
|
|
$ hg ci -m foo
|
|
error: pretxncommit.nocommits hook failed: no commits allowed
|
|
transaction abort!
|
|
rollback completed
|
|
abort: no commits allowed
|
|
[255]
|
|
$ hg ci -m foo
|
|
error: pretxncommit.nocommits hook failed: no commits allowed
|
|
transaction abort!
|
|
rollback completed
|
|
abort: no commits allowed
|
|
[255]
|
|
|
|
$ cd ..
|