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
59 lines
1.3 KiB
Perl
59 lines
1.3 KiB
Perl
#require fsmonitor
|
|
|
|
$ setconfig fsmonitor.detectrace=1
|
|
$ newrepo
|
|
|
|
No races for common operations
|
|
|
|
$ touch x
|
|
$ hg status
|
|
? x
|
|
|
|
$ rm x
|
|
$ touch y
|
|
$ hg status
|
|
? y
|
|
|
|
Create a race by write files by writing files if context._dirstatestatus is called
|
|
|
|
$ echo 'f' > .gitignore
|
|
$ mkdir c
|
|
$ touch e f g
|
|
$ cat > $TESTTMP/racy.py << EOF
|
|
> from edenscm.mercurial import context, extensions
|
|
> def _race(orig, *args, **kwargs):
|
|
> open('a', 'w').close()
|
|
> open('f', 'w').close()
|
|
> open('c/d.txt', 'w').close()
|
|
> return orig(*args, **kwargs)
|
|
> def uisetup(ui):
|
|
> extensions.wrapfunction(context.workingctx, "_dirstatestatus", _race)
|
|
> EOF
|
|
|
|
$ hg status --config extensions.racy=$TESTTMP/racy.py
|
|
abort: [race-detector] files changed when scanning changes in working copy:
|
|
a
|
|
c/d.txt
|
|
|
|
(this is an error because HGDETECTRACE or fsmonitor.detectrace is set to true)
|
|
[75]
|
|
|
|
$ hg status -i --config extensions.racy=$TESTTMP/racy.py
|
|
abort: [race-detector] files changed when scanning changes in working copy:
|
|
a
|
|
c/d.txt
|
|
f
|
|
|
|
(this is an error because HGDETECTRACE or fsmonitor.detectrace is set to true)
|
|
[75]
|
|
|
|
Race detector can be turned off:
|
|
|
|
$ hg status --config extensions.racy=$TESTTMP/racy.py --config fsmonitor.detectrace=0
|
|
? .gitignore
|
|
? a
|
|
? c/d.txt
|
|
? e
|
|
? g
|
|
? y
|