mercurial/dirstate.py

34673:e2214632c3a2

    def _identity(self):
        self._read()
        return self._identity

    @propertycache
    def _nonnormalset(self):
        nonnorm, otherparents = self._map.nonnormalentries()
        self._otherparentset = otherparents
        return nonnorm

    @propertycache
    def _otherparentset(self):
        nonnorm, otherparents = self._map.nonnormalentries()
        self._nonnormalset = nonnorm
        return otherparents

    @propertycache
    def _filefoldmap(self):
        return self._map.filefoldmap()

    @propertycache
    def _dirfoldmap(self):

        if self._origpl is None:
            self._origpl = self._pl
        self._map.setparents(p1, p2)
        copies = {}
        if oldp2 != nullid and p2 == nullid:
            candidatefiles = self._nonnormalset.union(self._otherparentset)
            for f in candidatefiles:
                s = self._map.get(f)
                if s is None:
                    continue

        rereads the dirstate. Use localrepo.invalidatedirstate() if you want to
        check whether the dirstate has changed before rereading it.'''

        for a in ("_map", "_identity",
                  "_filefoldmap", "_dirfoldmap", "_branch",
                  "_dirs", "_ignore", "_nonnormalset",
                  "_otherparentset"):
            if a in self.__dict__:
                delattr(self, a)
        self._lastnormaltime = 0
        self._dirty = False
        self._updatedfiles.clear()

            self._dirs.addpath(f)
        self._dirty = True
        self._updatedfiles.add(f)
        self._map[f] = dirstatetuple(state, mode, size, mtime)
        if state != 'n' or mtime == -1:
            self._nonnormalset.add(f)
        if size == -2:
            self._otherparentset.add(f)

    def normal(self, f):
        '''Mark a file normal and clean.'''
        s = os.lstat(self._join(f))
        mtime = s.st_mtime
        self._addpath(f, 'n', s.st_mode,
                      s.st_size & _rangemask, mtime & _rangemask)
        self._map.copymap.pop(f, None)
        if f in self._nonnormalset:
            self._nonnormalset.remove(f)
        if mtime > self._lastnormaltime:
            # Remember the most recent modification timeslot for status(),
            # to make sure we won't miss future size-preserving file content
            # modifications that happen within the same timeslot.
            self._lastnormaltime = mtime

                    return
                if entry[0] == 'm' or entry[0] == 'n' and entry[2] == -2:
                    return
        self._addpath(f, 'n', 0, -1, -1)
        self._map.copymap.pop(f, None)
        if f in self._nonnormalset:
            self._nonnormalset.remove(f)

    def otherparent(self, f):
        '''Mark as coming from the other parent, always dirty.'''
        if self._pl[1] == nullid:
            raise error.Abort(_("setting %r to other parent "

                # backup the previous state
                if entry[0] == 'm': # merge
                    size = -1
                elif entry[0] == 'n' and entry[2] == -2: # other parent
                    size = -2
                    self._otherparentset.add(f)
        self._map[f] = dirstatetuple('r', 0, size, 0)
        self._nonnormalset.add(f)
        if size == 0:
            self._map.copymap.pop(f, None)

    def merge(self, f):
        '''Mark a file merged.'''

        '''Drop a file from the dirstate'''
        if f in self._map:
            self._dirty = True
            self._droppath(f)
            del self._map[f]
            if f in self._nonnormalset:
                self._nonnormalset.remove(f)
            self._map.copymap.pop(f, None)

    def _discoverpath(self, path, normed, ignoremissing, exists, storemap):
        if exists is None:
            exists = os.path.lexists(os.path.join(self._root, path))

            return self._normalize(path, isknown, ignoremissing)
        return path

    def clear(self):
        self._map = dirstatemap(self._ui, self._opener, self._root)
        self._nonnormalset = set()
        self._otherparentset = set()
        if "_dirs" in self.__dict__:
            delattr(self, "_dirs")
        self._map.setparents(nullid, nullid)
        self._lastnormaltime = 0
        self._updatedfiles.clear()

            dmap = self._map
            for f in self._updatedfiles:
                e = dmap.get(f)
                if e is not None and e[0] == 'n' and e[3] == now:
                    dmap[f] = dirstatetuple(e[0], e[1], e[2], -1)
                    self._nonnormalset.add(f)

            # emulate that all 'dirstate.normal' results are written out
            self._lastnormaltime = 0
            self._updatedfiles.clear()

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

        self._map.write(st, now)
        self._nonnormalset, self._otherparentset = self._map.nonnormalentries()
        self._lastnormaltime = 0
        self._dirty = False

    def _dirignore(self, f):
        if f == '.':

    def write(self, st, now):
        st.write(parsers.pack_dirstate(self._map, self.copymap,
                                       self.parents(), now))
        st.close()
        self._dirtyparents = False

34674:60927b19ed65

    def _identity(self):
        self._read()
        return self._identity

    @propertycache
    def _filefoldmap(self):
        return self._map.filefoldmap()

    @propertycache
    def _dirfoldmap(self):

        if self._origpl is None:
            self._origpl = self._pl
        self._map.setparents(p1, p2)
        copies = {}
        if oldp2 != nullid and p2 == nullid:
            candidatefiles = self._map.nonnormalset.union(
                                self._map.otherparentset)
            for f in candidatefiles:
                s = self._map.get(f)
                if s is None:
                    continue

        rereads the dirstate. Use localrepo.invalidatedirstate() if you want to
        check whether the dirstate has changed before rereading it.'''

        for a in ("_map", "_identity",
                  "_filefoldmap", "_dirfoldmap", "_branch",
                  "_dirs", "_ignore"):
            if a in self.__dict__:
                delattr(self, a)
        self._lastnormaltime = 0
        self._dirty = False
        self._updatedfiles.clear()

            self._dirs.addpath(f)
        self._dirty = True
        self._updatedfiles.add(f)
        self._map[f] = dirstatetuple(state, mode, size, mtime)
        if state != 'n' or mtime == -1:
            self._map.nonnormalset.add(f)
        if size == -2:
            self._map.otherparentset.add(f)

    def normal(self, f):
        '''Mark a file normal and clean.'''
        s = os.lstat(self._join(f))
        mtime = s.st_mtime
        self._addpath(f, 'n', s.st_mode,
                      s.st_size & _rangemask, mtime & _rangemask)
        self._map.copymap.pop(f, None)
        if f in self._map.nonnormalset:
            self._map.nonnormalset.remove(f)
        if mtime > self._lastnormaltime:
            # Remember the most recent modification timeslot for status(),
            # to make sure we won't miss future size-preserving file content
            # modifications that happen within the same timeslot.
            self._lastnormaltime = mtime

                    return
                if entry[0] == 'm' or entry[0] == 'n' and entry[2] == -2:
                    return
        self._addpath(f, 'n', 0, -1, -1)
        self._map.copymap.pop(f, None)
        if f in self._map.nonnormalset:
            self._map.nonnormalset.remove(f)

    def otherparent(self, f):
        '''Mark as coming from the other parent, always dirty.'''
        if self._pl[1] == nullid:
            raise error.Abort(_("setting %r to other parent "

                # backup the previous state
                if entry[0] == 'm': # merge
                    size = -1
                elif entry[0] == 'n' and entry[2] == -2: # other parent
                    size = -2
                    self._map.otherparentset.add(f)
        self._map[f] = dirstatetuple('r', 0, size, 0)
        self._map.nonnormalset.add(f)
        if size == 0:
            self._map.copymap.pop(f, None)

    def merge(self, f):
        '''Mark a file merged.'''

        '''Drop a file from the dirstate'''
        if f in self._map:
            self._dirty = True
            self._droppath(f)
            del self._map[f]
            if f in self._map.nonnormalset:
                self._map.nonnormalset.remove(f)
            self._map.copymap.pop(f, None)

    def _discoverpath(self, path, normed, ignoremissing, exists, storemap):
        if exists is None:
            exists = os.path.lexists(os.path.join(self._root, path))

            return self._normalize(path, isknown, ignoremissing)
        return path

    def clear(self):
        self._map = dirstatemap(self._ui, self._opener, self._root)
        if "_dirs" in self.__dict__:
            delattr(self, "_dirs")
        self._map.setparents(nullid, nullid)
        self._lastnormaltime = 0
        self._updatedfiles.clear()

            dmap = self._map
            for f in self._updatedfiles:
                e = dmap.get(f)
                if e is not None and e[0] == 'n' and e[3] == now:
                    dmap[f] = dirstatetuple(e[0], e[1], e[2], -1)
                    self._map.nonnormalset.add(f)

            # emulate that all 'dirstate.normal' results are written out
            self._lastnormaltime = 0
            self._updatedfiles.clear()

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

        self._map.write(st, now)
        self._lastnormaltime = 0
        self._dirty = False

    def _dirignore(self, f):
        if f == '.':

    def write(self, st, now):
        st.write(parsers.pack_dirstate(self._map, self.copymap,
                                       self.parents(), now))
        st.close()
        self._dirtyparents = False
        self.nonnormalset, self.otherparentset = self.nonnormalentries()

    @propertycache
    def nonnormalset(self):
        nonnorm, otherparents = self.nonnormalentries()
        self.otherparentset = otherparents
        return nonnorm

    @propertycache
    def otherparentset(self):
        nonnorm, otherparents = self.nonnormalentries()
        self.nonnormalset = nonnorm
        return otherparents