comparison hgext/fsmonitor/__init__.py @ 48306:1421c75b20de

fsmonitor: fix traceback after removal of nonnormalset (issue6600)

This basically does the same thing it used to do, but in the only place it's
needed.

Differential Revision: https://phab.mercurial-scm.org/D11707

48305:6fb282ce9113

    dmap = self._map
    if util.safehasattr(dmap, b'_map'):
        # for better performance, directly access the inner dirstate map if the
        # standard dirstate implementation is in use.
        dmap = dmap._map
    nonnormalset = self._map.nonnormalset

    copymap = self._map.copymap
    getkind = stat.S_IFMT
    dirkind = stat.S_IFDIR
    regkind = stat.S_IFREG

48306:1421c75b20de

    dmap = self._map
    if util.safehasattr(dmap, b'_map'):
        # for better performance, directly access the inner dirstate map if the
        # standard dirstate implementation is in use.
        dmap = dmap._map
    nonnormalset = {
        f
        for f, e in self._map.items()
        if e.v1_state() != "n" or e.v1_mtime() == -1
    }

    copymap = self._map.copymap
    getkind = stat.S_IFMT
    dirkind = stat.S_IFDIR
    regkind = stat.S_IFREG