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
101 lines
3.1 KiB
Python
101 lines
3.1 KiB
Python
# extension to emulate invoking 'dirstate.write()' at the time
|
|
# specified by '[fakedirstatewritetime] fakenow', only when
|
|
# 'dirstate.write()' is invoked via functions below:
|
|
#
|
|
# - 'workingctx._poststatusfixup()' (= 'repo.status()')
|
|
# - 'committablectx.markcommitted()'
|
|
|
|
from __future__ import absolute_import
|
|
|
|
from edenscm.mercurial import (
|
|
context,
|
|
dirstate,
|
|
extensions,
|
|
policy,
|
|
registrar,
|
|
treedirstate,
|
|
treestate,
|
|
util,
|
|
)
|
|
|
|
|
|
configtable = {}
|
|
configitem = registrar.configitem(configtable)
|
|
|
|
configitem("fakedirstatewritetime", "fakenow", default=None)
|
|
|
|
parsers = policy.importmod(r"parsers")
|
|
|
|
|
|
def pack_dirstate(fakenow, orig, dmap, copymap, pl, now):
|
|
# execute what original parsers.pack_dirstate should do actually
|
|
# for consistency
|
|
actualnow = int(now)
|
|
for f, e in dmap.iteritems():
|
|
if e[0] == "n" and e[3] == actualnow:
|
|
e = parsers.dirstatetuple(e[0], e[1], e[2], -1)
|
|
dmap[f] = e
|
|
|
|
return orig(dmap, copymap, pl, fakenow)
|
|
|
|
|
|
def fakewrite(ui, func):
|
|
# fake "now" of 'pack_dirstate' only if it is invoked while 'func'
|
|
|
|
fakenow = ui.config("fakedirstatewritetime", "fakenow")
|
|
if not fakenow:
|
|
# Execute original one, if fakenow isn't configured. This is
|
|
# useful to prevent subrepos from executing replaced one,
|
|
# because replacing 'parsers.pack_dirstate' is also effective
|
|
# in subrepos.
|
|
return func()
|
|
|
|
# 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]
|
|
|
|
orig_pack_dirstate = parsers.pack_dirstate
|
|
orig_dirstate_getfsnow = dirstate._getfsnow
|
|
wrapper = lambda *args: pack_dirstate(fakenow, orig_pack_dirstate, *args)
|
|
|
|
parsers.pack_dirstate = wrapper
|
|
dirstate._getfsnow = lambda *args: fakenow
|
|
try:
|
|
return func()
|
|
finally:
|
|
parsers.pack_dirstate = orig_pack_dirstate
|
|
dirstate._getfsnow = orig_dirstate_getfsnow
|
|
|
|
|
|
def _poststatusfixup(orig, workingctx, status, fixup):
|
|
ui = workingctx.repo().ui
|
|
return fakewrite(ui, lambda: orig(workingctx, status, fixup))
|
|
|
|
|
|
def markcommitted(orig, committablectx, node):
|
|
ui = committablectx.repo().ui
|
|
return fakewrite(ui, lambda: orig(committablectx, node))
|
|
|
|
|
|
def treedirstatewrite(orig, self, st, now):
|
|
ui = self._ui
|
|
fakenow = ui.config("fakedirstatewritetime", "fakenow")
|
|
if fakenow:
|
|
now = util.parsedate(fakenow, ["%Y%m%d%H%M"])[0]
|
|
return orig(self, st, now)
|
|
|
|
|
|
def treestatewrite(orig, self, st, now):
|
|
ui = self._ui
|
|
fakenow = ui.config("fakedirstatewritetime", "fakenow")
|
|
if fakenow:
|
|
now = util.parsedate(fakenow, ["%Y%m%d%H%M"])[0]
|
|
return orig(self, st, now)
|
|
|
|
|
|
def extsetup(ui):
|
|
extensions.wrapfunction(context.workingctx, "_poststatusfixup", _poststatusfixup)
|
|
extensions.wrapfunction(context.committablectx, "markcommitted", markcommitted)
|
|
extensions.wrapfunction(treedirstate.treedirstatemap, "write", treedirstatewrite)
|
|
extensions.wrapfunction(treestate.treestatemap, "write", treestatewrite)
|