mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 07:17:55 +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
24 lines
640 B
Python
24 lines
640 B
Python
# Dummy extension to define a namespace containing revision names
|
|
|
|
from __future__ import absolute_import
|
|
|
|
from edenscm.mercurial import namespaces, registrar
|
|
|
|
|
|
namespacepredicate = registrar.namespacepredicate()
|
|
|
|
|
|
@namespacepredicate("revnames", priority=70)
|
|
def _revnamelookup(repo):
|
|
names = {"r%d" % rev: repo[rev].node() for rev in repo}
|
|
namemap = lambda r, name: names.get(name)
|
|
nodemap = lambda r, node: ["r%d" % repo[node].rev()]
|
|
|
|
return namespaces.namespace(
|
|
templatename="revname",
|
|
logname="revname",
|
|
listnames=lambda r: names.keys(),
|
|
namemap=namemap,
|
|
nodemap=nodemap,
|
|
)
|