mirror of
https://github.com/facebook/sapling.git
synced 2024-10-16 11:52:02 +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
39 lines
945 B
Python
39 lines
945 B
Python
"""test helper extension to create commits with multiple extra fields"""
|
|
|
|
from edenscm.mercurial import cmdutil, commands, scmutil
|
|
|
|
|
|
cmdtable = {}
|
|
try:
|
|
from edenscm.mercurial import registrar
|
|
|
|
command = registrar.command(cmdtable)
|
|
except (ImportError, AttributeError):
|
|
command = cmdutil.command(cmdtable)
|
|
testedwith = "internal"
|
|
|
|
|
|
@command(
|
|
"commitextra",
|
|
[("", "field", [], "extra data to store", "FIELD=VALUE")]
|
|
+ commands.commitopts
|
|
+ commands.commitopts2,
|
|
"commitextra",
|
|
)
|
|
def commitextra(ui, repo, *pats, **opts):
|
|
"""make a commit with extra fields"""
|
|
fields = opts.get("field")
|
|
extras = {}
|
|
for field in fields:
|
|
k, v = field.split("=", 1)
|
|
extras[k] = v
|
|
message = cmdutil.logmessage(ui, opts)
|
|
repo.commit(
|
|
message,
|
|
opts.get("user"),
|
|
opts.get("date"),
|
|
match=scmutil.match(repo[None], pats, opts),
|
|
extra=extras,
|
|
)
|
|
return 0
|