mirror of
https://github.com/facebook/sapling.git
synced 2024-10-12 09:48:05 +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
31 lines
757 B
Python
31 lines
757 B
Python
# Extension to write out fake unsupported records into the merge state
|
|
#
|
|
#
|
|
|
|
from __future__ import absolute_import
|
|
|
|
from edenscm.mercurial import merge, registrar
|
|
|
|
|
|
cmdtable = {}
|
|
command = registrar.command(cmdtable)
|
|
|
|
|
|
@command(
|
|
"fakemergerecord",
|
|
[
|
|
("X", "mandatory", None, "add a fake mandatory record"),
|
|
("x", "advisory", None, "add a fake advisory record"),
|
|
],
|
|
"",
|
|
)
|
|
def fakemergerecord(ui, repo, *pats, **opts):
|
|
with repo.wlock():
|
|
ms = merge.mergestate.read(repo)
|
|
records = ms._makerecords()
|
|
if opts.get("mandatory"):
|
|
records.append(("X", "mandatory record"))
|
|
if opts.get("advisory"):
|
|
records.append(("x", "advisory record"))
|
|
ms._writerecords(records)
|