--- a/tests/fakedirstatewritetime.py Mon Oct 25 11:36:22 2021 +0200
+++ b/tests/fakedirstatewritetime.py Fri Nov 19 03:04:42 2021 +0100
@@ -37,14 +37,8 @@
has_rust_dirstate = policy.importrust('dirstate') is not None
-def pack_dirstate(fakenow, orig, dmap, copymap, pl, now):
- # execute what original parsers.pack_dirstate should do actually
- # for consistency
- for f, e in dmap.items():
- if e.need_delay(now):
- e.set_possibly_dirty()
-
- return orig(dmap, copymap, pl, fakenow)
+def pack_dirstate(orig, dmap, copymap, pl):
+ return orig(dmap, copymap, pl)
def fakewrite(ui, func):
@@ -67,19 +61,19 @@
# The Rust implementation does not use public parse/pack dirstate
# to prevent conversion round-trips
orig_dirstatemap_write = dirstatemapmod.dirstatemap.write
- wrapper = lambda self, tr, st, now: orig_dirstatemap_write(
- self, tr, st, fakenow
- )
+ wrapper = lambda self, tr, st: orig_dirstatemap_write(self, tr, st)
dirstatemapmod.dirstatemap.write = wrapper
orig_get_fs_now = timestamp.get_fs_now
- wrapper = lambda *args: pack_dirstate(fakenow, orig_pack_dirstate, *args)
+ wrapper = lambda *args: pack_dirstate(orig_pack_dirstate, *args)
orig_module = parsers
orig_pack_dirstate = parsers.pack_dirstate
orig_module.pack_dirstate = wrapper
- timestamp.get_fs_now = lambda *args: fakenow
+ timestamp.get_fs_now = (
+ lambda *args: fakenow
+ ) # XXX useless for this purpose now
try:
return func()
finally: