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
61 lines
1.8 KiB
Python
61 lines
1.8 KiB
Python
from __future__ import absolute_import, print_function
|
|
|
|
import os
|
|
|
|
from edenscm.mercurial import hg, scmutil, ui as uimod, util
|
|
|
|
|
|
chdir = os.chdir
|
|
mkdir = os.mkdir
|
|
pjoin = os.path.join
|
|
|
|
walkrepos = scmutil.walkrepos
|
|
checklink = util.checklink
|
|
|
|
u = uimod.ui.load()
|
|
sym = checklink(".")
|
|
|
|
hg.repository(u, "top1", create=1)
|
|
mkdir("subdir")
|
|
chdir("subdir")
|
|
hg.repository(u, "sub1", create=1)
|
|
mkdir("subsubdir")
|
|
chdir("subsubdir")
|
|
hg.repository(u, "subsub1", create=1)
|
|
chdir(os.path.pardir)
|
|
if sym:
|
|
os.symlink(os.path.pardir, "circle")
|
|
os.symlink(pjoin("subsubdir", "subsub1"), "subsub1")
|
|
|
|
|
|
def runtest():
|
|
reposet = frozenset(walkrepos(".", followsym=True))
|
|
if sym and (len(reposet) != 3):
|
|
print("reposet = %r" % (reposet,))
|
|
print(("Found %d repositories when I should have found 3" % (len(reposet),)))
|
|
if (not sym) and (len(reposet) != 2):
|
|
print("reposet = %r" % (reposet,))
|
|
print(("Found %d repositories when I should have found 2" % (len(reposet),)))
|
|
sub1set = frozenset((pjoin(".", "sub1"), pjoin(".", "circle", "subdir", "sub1")))
|
|
if len(sub1set & reposet) != 1:
|
|
print("sub1set = %r" % (sub1set,))
|
|
print("reposet = %r" % (reposet,))
|
|
print("sub1set and reposet should have exactly one path in common.")
|
|
sub2set = frozenset((pjoin(".", "subsub1"), pjoin(".", "subsubdir", "subsub1")))
|
|
if len(sub2set & reposet) != 1:
|
|
print("sub2set = %r" % (sub2set,))
|
|
print("reposet = %r" % (reposet,))
|
|
print("sub2set and reposet should have exactly one path in common.")
|
|
sub3 = pjoin(".", "circle", "top1")
|
|
if sym and sub3 not in reposet:
|
|
print("reposet = %r" % (reposet,))
|
|
print("Symbolic links are supported and %s is not in reposet" % (sub3,))
|
|
|
|
|
|
runtest()
|
|
if sym:
|
|
# Simulate not having symlinks.
|
|
del os.path.samestat
|
|
sym = False
|
|
runtest()
|