parsers: make pack_dirstate take now in integer for consistency On recent OS, 'stat.st_mtime' has a double precision floating point value to represent nano seconds, but it is not wide enough for actual file timestamp: nowadays, only 52 - 32 = 20 bit width is available for decimal places in sec. Therefore, casting it to 'int' may cause unexpected result. See also changeset 13272104bb07 fixing issue4836 for detail. For example, changed file A may be treated as "clean" unexpectedly in steps below. "rounded now" is the value gotten by rounding via 'int(st.st_mtime)' or so. ---------------------+--------------------+------------------------ "now" | | timestamp of A (time_t) float rounded time_t| action | FS dirstate ------ ------- ------+--------------------+-------- --------------- N+.nnn N N | | --- --- | update file A | N | dirstate.normal(A) | N N+.999 N+1 N | | | dirstate.write() | N (*1) | : | | change file A | N | : | N+1.00 N+1 N+1 | | | "hg status" (*2) | N N ------ ------- ------+--------------------+-------- --------------- Timestamp N of A in dirstate isn't dropped at (*1), because "rounded now" is N+1 at that time, even if 'st_mtime' in 'time_t' is still N. Then, file A is unexpectedly treated as "clean" at (*2) in this case. For consistent handling of 'stat.st_mtime', this patch makes 'pack_dirstate()' take 'now' argument not in floating point but in integer. This patch makes 'PyArg_ParseTuple()' in 'pack_dirstate()' use format 'i' (= checking type mismatch or overflow), even though it is ensured that 'now' is in the range of 32bit signed integer by masking with '_rangemask' (= 0x7fffffff) on caller side. It should be cheaper enough than packing itself, and useful to detect that legacy code invokes 'pack_dirstate()' with 'now' in floating point value.

     1

# extension to emulate invoking 'dirstate.write()' at the time

     2

# specified by '[fakedirstatewritetime] fakenow', only when

     3

# 'dirstate.write()' is invoked via functions below:

     4

#

     5

#   - 'workingctx._checklookup()' (= 'repo.status()')

     6

#   - 'committablectx.markcommitted()'

     7

     8

from mercurial import context, extensions, parsers, util

     9

    10

def pack_dirstate(fakenow, orig, dmap, copymap, pl, now):

    11

    # execute what original parsers.pack_dirstate should do actually

    12

    # for consistency

    13

    actualnow = int(now)

    14

    for f, e in dmap.iteritems():

    15

        if e[0] == 'n' and e[3] == actualnow:

    16

            e = parsers.dirstatetuple(e[0], e[1], e[2], -1)

    17

            dmap[f] = e

    18

    19

    return orig(dmap, copymap, pl, fakenow)

    20

    21

def fakewrite(ui, func):

    22

    # fake "now" of 'pack_dirstate' only if it is invoked while 'func'

    23

    24

    fakenow = ui.config('fakedirstatewritetime', 'fakenow')

    25

    if not fakenow:

    26

        # Execute original one, if fakenow isn't configured. This is

    27

        # useful to prevent subrepos from executing replaced one,

    28

        # because replacing 'parsers.pack_dirstate' is also effective

    29

        # in subrepos.

    30

        return func()

    31

    32

    # parsing 'fakenow' in YYYYmmddHHMM format makes comparison between

    33

    # 'fakenow' value and 'touch -t YYYYmmddHHMM' argument easy

    34

    fakenow = util.parsedate(fakenow, ['%Y%m%d%H%M'])[0]

    35

    36

    orig_pack_dirstate = parsers.pack_dirstate

    37

    wrapper = lambda *args: pack_dirstate(fakenow, orig_pack_dirstate, *args)

    38

    39

    parsers.pack_dirstate = wrapper

    40

    try:

    41

        return func()

    42

    finally:

    43

        parsers.pack_dirstate = orig_pack_dirstate

    44

    45

def _checklookup(orig, workingctx, files):

    46

    ui = workingctx.repo().ui

    47

    return fakewrite(ui, lambda : orig(workingctx, files))

    48

    49

def markcommitted(orig, committablectx, node):

    50

    ui = committablectx.repo().ui

    51

    return fakewrite(ui, lambda : orig(committablectx, node))

    52

    53

def extsetup(ui):

    54

    extensions.wrapfunction(context.workingctx, '_checklookup',

    55

                            _checklookup)

    56

    extensions.wrapfunction(context.committablectx, 'markcommitted',

    57

                            markcommitted)