This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11783

dirstate: move "get fs now" in the timestamp utility module
ClosedPublic

Authored by marmoute on Nov 24 2021, 6:11 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG08b060abd658: dirstate: move "get fs now" in the timestamp utility module
Summary

We will need it during update.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

marmoute created this revision.Nov 24 2021, 6:11 AM
Alphare accepted this revision.Nov 24 2021, 8:09 AM
This revision is now accepted and ready to land.Nov 24 2021, 8:09 AM
marmoute updated this revision to Diff 31224.Nov 30 2021, 6:53 PM

Revision Contents
Changeset List

Diff 31105

mercurial/dirstate.py

class rootcache(filecache): class rootcache(filecache):
"""filecache for files in the repository root""" """filecache for files in the repository root"""
def join(self, obj, fname): def join(self, obj, fname):
return obj._join(fname) return obj._join(fname)
def _getfsnow(vfs):
'''Get "now" timestamp on filesystem'''
tmpfd, tmpname = vfs.mkstemp()
try:
return timestamp.mtime_of(os.fstat(tmpfd))
finally:
os.close(tmpfd)
vfs.unlink(tmpname)
def requires_parents_change(func): def requires_parents_change(func):
def wrap(self, *args, **kwargs): def wrap(self, *args, **kwargs):
if not self.pendingparentchange(): if not self.pendingparentchange():
msg = 'calling `%s` outside of a parentchange context' msg = 'calling `%s` outside of a parentchange context'
msg %= func.__name__ msg %= func.__name__
raise error.ProgrammingError(msg) raise error.ProgrammingError(msg)
return func(self, *args, **kwargs) return func(self, *args, **kwargs)
if tr: if tr:
# 'dirstate.write()' is not only for writing in-memory # 'dirstate.write()' is not only for writing in-memory
# changes out, but also for dropping ambiguous timestamp. # changes out, but also for dropping ambiguous timestamp.
# delayed writing re-raise "ambiguous timestamp issue". # delayed writing re-raise "ambiguous timestamp issue".
# See also the wiki page below for detail: # See also the wiki page below for detail:
# https://www.mercurial-scm.org/wiki/DirstateTransactionPlan # https://www.mercurial-scm.org/wiki/DirstateTransactionPlan
# record when mtime start to be ambiguous # record when mtime start to be ambiguous
now = _getfsnow(self._opener) now = timestamp.get_fs_now(self._opener)
# delay writing in-memory changes out # delay writing in-memory changes out
tr.addfilegenerator( tr.addfilegenerator(
b'dirstate', b'dirstate',
(self._filename,), (self._filename,),
lambda f: self._writedirstate(tr, f, now=now), lambda f: self._writedirstate(tr, f, now=now),
location=b'plain', location=b'plain',
) )

mercurial/dirstateutils/timestamp.py

# Copyright Mercurial Contributors # Copyright Mercurial Contributors
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from __future__ import absolute_import from __future__ import absolute_import
import functools import functools
import os
import stat import stat
rangemask = 0x7FFFFFFF rangemask = 0x7FFFFFFF
@functools.total_ordering @functools.total_ordering
class timestamp(tuple): class timestamp(tuple):
if self_secs < other_secs: if self_secs < other_secs:
return False return False
if self_subsec_nanos == 0 or other_subsec_nanos == 0: if self_subsec_nanos == 0 or other_subsec_nanos == 0:
# they are considered equal, so not "greater than" # they are considered equal, so not "greater than"
return False return False
return self_subsec_nanos > other_subsec_nanos return self_subsec_nanos > other_subsec_nanos
def get_fs_now(vfs):
"""return a timestamp for "now" in the current vfs
This will raise an exception if no temporary file could be created.
"""
tmpfd, tmpname = vfs.mkstemp()
try:
return mtime_of(os.fstat(tmpfd))
finally:
os.close(tmpfd)
vfs.unlink(tmpname)
def zero(): def zero():
""" """
Returns the `timestamp` at the Unix epoch. Returns the `timestamp` at the Unix epoch.
""" """
return tuple.__new__(timestamp, (0, 0)) return tuple.__new__(timestamp, (0, 0))
def mtime_of(stat_result): def mtime_of(stat_result):

tests/fakedirstatewritetime.py

# extension to emulate invoking 'dirstate.write()' at the time # extension to emulate invoking 'dirstate.write()' at the time
# specified by '[fakedirstatewritetime] fakenow', only when # specified by '[fakedirstatewritetime] fakenow', only when
# 'dirstate.write()' is invoked via functions below: # 'dirstate.write()' is invoked via functions below:
# #
# - 'workingctx._poststatusfixup()' (= 'repo.status()') # - 'workingctx._poststatusfixup()' (= 'repo.status()')
# - 'committablectx.markcommitted()' # - 'committablectx.markcommitted()'
from __future__ import absolute_import from __future__ import absolute_import
from mercurial import ( from mercurial import (
context, context,
dirstate,
dirstatemap as dirstatemapmod, dirstatemap as dirstatemapmod,
extensions, extensions,
policy, policy,
registrar, registrar,
) )
from mercurial.dirstateutils import timestamp from mercurial.dirstateutils import timestamp
from mercurial.utils import dateutil from mercurial.utils import dateutil
# The Rust implementation does not use public parse/pack dirstate # The Rust implementation does not use public parse/pack dirstate
# to prevent conversion round-trips # to prevent conversion round-trips
orig_dirstatemap_write = dirstatemapmod.dirstatemap.write orig_dirstatemap_write = dirstatemapmod.dirstatemap.write
wrapper = lambda self, tr, st, now: orig_dirstatemap_write( wrapper = lambda self, tr, st, now: orig_dirstatemap_write(
self, tr, st, fakenow self, tr, st, fakenow
) )
dirstatemapmod.dirstatemap.write = wrapper dirstatemapmod.dirstatemap.write = wrapper
orig_dirstate_getfsnow = dirstate._getfsnow orig_get_fs_now = timestamp.get_fs_now
wrapper = lambda *args: pack_dirstate(fakenow, orig_pack_dirstate, *args) wrapper = lambda *args: pack_dirstate(fakenow, orig_pack_dirstate, *args)
orig_module = parsers orig_module = parsers
orig_pack_dirstate = parsers.pack_dirstate orig_pack_dirstate = parsers.pack_dirstate
orig_module.pack_dirstate = wrapper orig_module.pack_dirstate = wrapper
dirstate._getfsnow = lambda *args: fakenow timestamp.get_fs_now = lambda *args: fakenow
try: try:
return func() return func()
finally: finally:
orig_module.pack_dirstate = orig_pack_dirstate orig_module.pack_dirstate = orig_pack_dirstate
dirstate._getfsnow = orig_dirstate_getfsnow timestamp.get_fs_now = orig_get_fs_now
if has_rust_dirstate: if has_rust_dirstate:
dirstatemapmod.dirstatemap.write = orig_dirstatemap_write dirstatemapmod.dirstatemap.write = orig_dirstatemap_write
def _poststatusfixup(orig, workingctx, status, fixup): def _poststatusfixup(orig, workingctx, status, fixup):
ui = workingctx.repo().ui ui = workingctx.repo().ui
return fakewrite(ui, lambda: orig(workingctx, status, fixup)) return fakewrite(ui, lambda: orig(workingctx, status, fixup))