mirror of
https://github.com/facebook/sapling.git
synced 2024-10-06 23:07:18 +03:00
2ef2ab5d6d
This patch delays writing in-memory changes out, if transaction is
running.
'_getfsnow()' is defined as a function, to hook it easily for
ambiguous timestamp tests (see also fakedirstatewritetime.py)
'if tr:' code path in this patch is still disabled at this revision,
because there is no client invoking 'dirstate.write()' with repo
object.
BTW, this patch changes 'dirstate.invalidate()' semantics around
'dirstate.write()' in a transaction scope:
before:
with repo.transaction():
dirstate.CHANGE('A')
dirstate.write() # change for A is written out here
dirstate.CHANGE('B')
dirstate.invalidate() # discards only change for B
after:
with repo.transaction():
dirstate.CHANGE('A')
dirstate.write() # change for A is still kept in memory
dirstate.CHANGE('B')
dirstate.invalidate() # discards changes for A and B
Fortunately, there is no code path expecting the former, at least, in
Mercurial itself, because 'dirstateguard' was introduced to remove
such 'dirstate.invalidate()'.
69 lines
2.3 KiB
Python
69 lines
2.3 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._checklookup()' (= 'repo.status()')
|
|
# - 'committablectx.markcommitted()'
|
|
|
|
from __future__ import absolute_import
|
|
|
|
from mercurial import (
|
|
context,
|
|
dirstate,
|
|
extensions,
|
|
parsers,
|
|
util,
|
|
)
|
|
|
|
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 _checklookup(orig, workingctx, files):
|
|
ui = workingctx.repo().ui
|
|
return fakewrite(ui, lambda : orig(workingctx, files))
|
|
|
|
def markcommitted(orig, committablectx, node):
|
|
ui = committablectx.repo().ui
|
|
return fakewrite(ui, lambda : orig(committablectx, node))
|
|
|
|
def extsetup(ui):
|
|
extensions.wrapfunction(context.workingctx, '_checklookup',
|
|
_checklookup)
|
|
extensions.wrapfunction(context.committablectx, 'markcommitted',
|
|
markcommitted)
|