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
52 lines
1.1 KiB
Python
52 lines
1.1 KiB
Python
# extension to emulate invoking 'patch.internalpatch()' at the time
|
|
# specified by '[fakepatchtime] fakenow'
|
|
|
|
from __future__ import absolute_import
|
|
|
|
from edenscm.mercurial import extensions, patch as patchmod, registrar, util
|
|
|
|
|
|
configtable = {}
|
|
configitem = registrar.configitem(configtable)
|
|
|
|
configitem("fakepatchtime", "fakenow", default=None)
|
|
|
|
|
|
def internalpatch(
|
|
orig,
|
|
ui,
|
|
repo,
|
|
patchobj,
|
|
strip,
|
|
prefix="",
|
|
files=None,
|
|
eolmode="strict",
|
|
similarity=0,
|
|
):
|
|
if files is None:
|
|
files = set()
|
|
r = orig(
|
|
ui,
|
|
repo,
|
|
patchobj,
|
|
strip,
|
|
prefix=prefix,
|
|
files=files,
|
|
eolmode=eolmode,
|
|
similarity=similarity,
|
|
)
|
|
|
|
fakenow = ui.config("fakepatchtime", "fakenow")
|
|
if fakenow:
|
|
# parsing 'fakenow' in YYYYmmddHHMM format makes comparison between
|
|
# 'fakenow' value and 'touch -t YYYYmmddHHMM' argument easy
|
|
fakenow = util.parsedate(fakenow, ["%Y%m%d%H%M"])[0]
|
|
for f in files:
|
|
repo.wvfs.utime(f, (fakenow, fakenow))
|
|
|
|
return r
|
|
|
|
|
|
def extsetup(ui):
|
|
extensions.wrapfunction(patchmod, "internalpatch", internalpatch)
|