mirror of
https://github.com/facebook/sapling.git
synced 2024-10-11 17:27:53 +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
33 lines
658 B
Python
Executable File
33 lines
658 B
Python
Executable File
#!/usr/bin/env python
|
|
from __future__ import absolute_import, print_function
|
|
|
|
from edenscm.mercurial import commands, localrepo, ui as uimod
|
|
|
|
|
|
u = uimod.ui.load()
|
|
|
|
print("% creating repo")
|
|
repo = localrepo.localrepository(u, ".", create=True)
|
|
|
|
f = open("test.py", "w")
|
|
try:
|
|
f.write("foo\n")
|
|
finally:
|
|
f.close
|
|
|
|
print("% add and commit")
|
|
commands.add(u, repo, "test.py")
|
|
commands.commit(u, repo, message="*")
|
|
commands.status(u, repo, clean=True)
|
|
|
|
|
|
print("% change")
|
|
f = open("test.py", "w")
|
|
try:
|
|
f.write("bar\n")
|
|
finally:
|
|
f.close()
|
|
|
|
# this would return clean instead of changed before the fix
|
|
commands.status(u, repo, clean=True, modified=True)
|