comparison mercurial/dirstate.py @ 34332:b36881c68569

dirstate: create new dirstatemap class

This is part of a larger refactor to move the dirstate storage logic to a
separate class, so it's easier to rewrite the dirstate storage layer without
having to rewrite all the algorithms as well.

Step one it to create the class, and replace dirstate._map with it.  The
abstraction bleeds through in a few places where the main dirstate class has to
access self._map._map, but those will be cleaned up in future patches.

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

34331:531332502568

        vfs.unlink(tmpname)

def nonnormalentries(dmap):
    '''Compute the nonnormal dirstate entries from the dmap'''
    try:
        return parsers.nonnormalotherparententries(dmap)
    except AttributeError:
        nonnorm = set()
        otherparent = set()
        for fname, e in dmap.iteritems():
            if e[0] != 'n' or e[3] == -1:

        try:
            makefilefoldmap = parsers.make_file_foldmap
        except AttributeError:
            pass
        else:
            return makefilefoldmap(self._map, util.normcasespec,
                                   util.normcasefallback)

        f = {}
        normcase = util.normcase
        for name, s in self._map.iteritems():

                raise
        return [nullid, nullid]

    @propertycache
    def _dirs(self):
        return util.dirs(self._map, 'r')

    def dirs(self):
        return self._dirs

    @rootcache('.hgignore')

                                'changed parallelly'))
        self._pendingmode = mode
        return fp

    def _read(self):
        self._map = {}
        self._copymap = {}
        # ignore HG_PENDING because identity is used only for writing
        self._identity = util.filestat.frompath(
            self._opener.join(self._filename))
        try:

            # size.
            #
            # This heuristic is imperfect in many ways, so in a future dirstate
            # format update it makes sense to just record the number of entries
            # on write.
            self._map = parsers.dict_new_presized(len(st) / 71)

        # Python's garbage collector triggers a GC each time a certain number
        # of container objects (the number being defined by
        # gc.get_threshold()) are allocated. parse_dirstate creates a tuple
        # for each file in the dirstate. The C version then immediately marks

        # this can get very expensive. As a workaround, disable GC while
        # parsing the dirstate.
        #
        # (we cannot decorate the function directly since it is in a C module)
        parse_dirstate = util.nogc(parsers.parse_dirstate)
        p = parse_dirstate(self._map, self._copymap, st)
        if not self._dirtypl:
            self._pl = p

    def invalidate(self):
        '''Causes the next access to reread the dirstate.

        if self._checkcase:
            return self._normalize(path, isknown, ignoremissing)
        return path

    def clear(self):
        self._map = {}
        self._nonnormalset = set()
        self._otherparentset = set()
        if "_dirs" in self.__dict__:
            delattr(self, "_dirs")
        self._copymap = {}

                    end = start + delaywrite
                    time.sleep(end - clock)
                    now = end # trust our estimate that the end is near now
                    break

        st.write(parsers.pack_dirstate(self._map, self._copymap, self._pl, now))
        self._nonnormalset, self._otherparentset = nonnormalentries(self._map)
        st.close()
        self._lastnormaltime = 0
        self._dirty = self._dirtypl = False

            except OSError as inst: # nf not found on disk - it is dirstate only
                if nf in dmap: # does it exactly match a missing file?
                    results[nf] = None
                else: # does it match a missing directory?
                    if alldirs is None:
                        alldirs = util.dirs(dmap)
                    if nf in alldirs:
                        if matchedir:
                            matchedir(nf)
                        notfoundadd(nf)
                    else:

        self._opener.rename(backupname, filename, checkambig=True)

    def clearbackup(self, tr, backupname):
        '''Clear backup file'''
        self._opener.unlink(backupname)

34332:b36881c68569

        vfs.unlink(tmpname)

def nonnormalentries(dmap):
    '''Compute the nonnormal dirstate entries from the dmap'''
    try:
        return parsers.nonnormalotherparententries(dmap._map)
    except AttributeError:
        nonnorm = set()
        otherparent = set()
        for fname, e in dmap.iteritems():
            if e[0] != 'n' or e[3] == -1:

        try:
            makefilefoldmap = parsers.make_file_foldmap
        except AttributeError:
            pass
        else:
            return makefilefoldmap(self._map._map, util.normcasespec,
                                   util.normcasefallback)

        f = {}
        normcase = util.normcase
        for name, s in self._map.iteritems():

                raise
        return [nullid, nullid]

    @propertycache
    def _dirs(self):
        return util.dirs(self._map._map, 'r')

    def dirs(self):
        return self._dirs

    @rootcache('.hgignore')

                                'changed parallelly'))
        self._pendingmode = mode
        return fp

    def _read(self):
        self._map = dirstatemap()

        self._copymap = {}
        # ignore HG_PENDING because identity is used only for writing
        self._identity = util.filestat.frompath(
            self._opener.join(self._filename))
        try:

            # size.
            #
            # This heuristic is imperfect in many ways, so in a future dirstate
            # format update it makes sense to just record the number of entries
            # on write.
            self._map._map = parsers.dict_new_presized(len(st) / 71)

        # Python's garbage collector triggers a GC each time a certain number
        # of container objects (the number being defined by
        # gc.get_threshold()) are allocated. parse_dirstate creates a tuple
        # for each file in the dirstate. The C version then immediately marks

        # this can get very expensive. As a workaround, disable GC while
        # parsing the dirstate.
        #
        # (we cannot decorate the function directly since it is in a C module)
        parse_dirstate = util.nogc(parsers.parse_dirstate)
        p = parse_dirstate(self._map._map, self._copymap, st)
        if not self._dirtypl:
            self._pl = p

    def invalidate(self):
        '''Causes the next access to reread the dirstate.

        if self._checkcase:
            return self._normalize(path, isknown, ignoremissing)
        return path

    def clear(self):
        self._map = dirstatemap()
        self._nonnormalset = set()
        self._otherparentset = set()
        if "_dirs" in self.__dict__:
            delattr(self, "_dirs")
        self._copymap = {}

                    end = start + delaywrite
                    time.sleep(end - clock)
                    now = end # trust our estimate that the end is near now
                    break

        st.write(parsers.pack_dirstate(self._map._map, self._copymap, self._pl,
                                       now))
        self._nonnormalset, self._otherparentset = nonnormalentries(self._map)
        st.close()
        self._lastnormaltime = 0
        self._dirty = self._dirtypl = False

            except OSError as inst: # nf not found on disk - it is dirstate only
                if nf in dmap: # does it exactly match a missing file?
                    results[nf] = None
                else: # does it match a missing directory?
                    if alldirs is None:
                        alldirs = util.dirs(dmap._map)
                    if nf in alldirs:
                        if matchedir:
                            matchedir(nf)
                        notfoundadd(nf)
                    else:

        self._opener.rename(backupname, filename, checkambig=True)

    def clearbackup(self, tr, backupname):
        '''Clear backup file'''
        self._opener.unlink(backupname)

class dirstatemap(object):
    def __init__(self):
        self._map = {}

    def iteritems(self):
        return self._map.iteritems()

    def __iter__(self):
        return iter(self._map)

    def get(self, key, default=None):
        return self._map.get(key, default)

    def __contains__(self, key):
        return key in self._map

    def __setitem__(self, key, value):
        self._map[key] = value

    def __getitem__(self, key):
        return self._map[key]

    def __delitem__(self, key):
        del self._map[key]

    def keys(self):
        return self._map.keys()