mirror of
https://github.com/facebook/sapling.git
synced 2024-10-11 01:07:15 +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
49 lines
1.1 KiB
Python
49 lines
1.1 KiB
Python
from __future__ import absolute_import
|
|
|
|
import os
|
|
|
|
from edenscm.mercurial import hg, ui as uimod
|
|
from edenscm.mercurial.hgweb import hgwebdir_mod
|
|
|
|
|
|
hgwebdir = hgwebdir_mod.hgwebdir
|
|
|
|
os.mkdir("webdir")
|
|
os.chdir("webdir")
|
|
|
|
webdir = os.path.realpath(".")
|
|
|
|
u = uimod.ui.load()
|
|
hg.repository(u, "a", create=1)
|
|
hg.repository(u, "b", create=1)
|
|
os.chdir("b")
|
|
hg.repository(u, "d", create=1)
|
|
os.chdir("..")
|
|
hg.repository(u, "c", create=1)
|
|
os.chdir("..")
|
|
|
|
paths = {
|
|
"t/a/": "%s/a" % webdir,
|
|
"b": "%s/b" % webdir,
|
|
"coll": "%s/*" % webdir,
|
|
"rcoll": "%s/**" % webdir,
|
|
}
|
|
|
|
config = os.path.join(webdir, "hgwebdir.conf")
|
|
configfile = open(config, "w")
|
|
configfile.write("[paths]\n")
|
|
for k, v in paths.items():
|
|
configfile.write("%s = %s\n" % (k, v))
|
|
configfile.close()
|
|
|
|
confwd = hgwebdir(config)
|
|
dictwd = hgwebdir(paths)
|
|
|
|
assert len(confwd.repos) == len(dictwd.repos), "different numbers"
|
|
assert len(confwd.repos) == 9, "expected 9 repos, found %d" % len(confwd.repos)
|
|
|
|
found = dict(confwd.repos)
|
|
for key, path in dictwd.repos:
|
|
assert key in found, "repository %s was not found" % key
|
|
assert found[key] == path, "different paths for repo %s" % key
|