##// END OF EJS Templates
fsmonitor: execute setup procedures only if dirstate is already instantiated...
FUJIWARA Katsunori -
r33387:68e9762a default
parent child Browse files
Show More
@@ -698,16 +698,12 b' def reposetup(ui, repo):'
698 repo._fsmonitorstate = fsmonitorstate
698 repo._fsmonitorstate = fsmonitorstate
699 repo._watchmanclient = client
699 repo._watchmanclient = client
700
700
701 # at this point since fsmonitorstate wasn't present, repo.dirstate is
701 dirstate, cached = localrepo.isfilecached(repo, 'dirstate')
702 # not a fsmonitordirstate
702 if cached:
703 dirstate = repo.dirstate
703 # at this point since fsmonitorstate wasn't present,
704 # repo.dirstate is not a fsmonitordirstate
704 makedirstate(repo, dirstate)
705 makedirstate(repo, dirstate)
705
706
706 # invalidate property cache, but keep filecache which contains the
707 # wrapped dirstate object
708 del repo.unfiltered().__dict__['dirstate']
709 assert dirstate is repo._filecache['dirstate'].obj
710
711 class fsmonitorrepo(repo.__class__):
707 class fsmonitorrepo(repo.__class__):
712 def status(self, *args, **kwargs):
708 def status(self, *args, **kwargs):
713 orig = super(fsmonitorrepo, self).status
709 orig = super(fsmonitorrepo, self).status
General Comments 0
You need to be logged in to leave comments. Login now