comparison hgext/fsmonitor/__init__.py @ 33387:68e9762a357b

fsmonitor: execute setup procedures only if dirstate is already instantiated

Before this patch, reposetup() of fsmonitor executes setup procedures
for dirstate, even if it isn't yet instantiated at that time.

On the other hand, dirstate might be already instantiated before
reposetup() intentionally (prefilling by chg, for example, see
bf3af0eced44 for detail). If so, just discarding already instantiated
one in reposetup() causes issue.

To resolve both issues above, this patch executes setup procedures,
only if dirstate is already instantiated.

BTW, this patch removes "del repo.unfiltered().__dict__['dirstate']",
because it is responsibility of the code path, which causes
instantiation of dirstate before reposetup(). After this patch, using
localrepo.isfilecached() should avoid creating the corresponded entry
in repo.unfiltered().__dict__.

33386:5a9b4370bb3b

            return

        repo._fsmonitorstate = fsmonitorstate
        repo._watchmanclient = client

        # at this point since fsmonitorstate wasn't present, repo.dirstate is
        # not a fsmonitordirstate
        dirstate = repo.dirstate
        makedirstate(repo, dirstate)

        # invalidate property cache, but keep filecache which contains the
        # wrapped dirstate object
        del repo.unfiltered().__dict__['dirstate']
        assert dirstate is repo._filecache['dirstate'].obj

        class fsmonitorrepo(repo.__class__):
            def status(self, *args, **kwargs):
                orig = super(fsmonitorrepo, self).status
                return overridestatus(orig, self, *args, **kwargs)

33387:68e9762a357b

            return

        repo._fsmonitorstate = fsmonitorstate
        repo._watchmanclient = client

        dirstate, cached = localrepo.isfilecached(repo, 'dirstate')
        if cached:
            # at this point since fsmonitorstate wasn't present,
            # repo.dirstate is not a fsmonitordirstate
            makedirstate(repo, dirstate)

        class fsmonitorrepo(repo.__class__):
            def status(self, *args, **kwargs):
                orig = super(fsmonitorrepo, self).status
                return overridestatus(orig, self, *args, **kwargs)