# HG changeset patch # User FUJIWARA Katsunori # Date 1473617189 -32400 # Node ID e35a83cedde1a8a4f774797d043e95b2e29f0de9 # Parent 519a02267f90c86af5a80a571d3d9c7bf3d65c24 localrepo: make _refreshfilecachestats unfiltered method to refresh correctly Before this patch, if transaction is started via "filtered repo" object, _refreshfilecachestats() at closing transaction doesn't refresh file stat of any @filecache properties correctly, because: - _refreshfilecachestats() omits refreshing file stat of a @filecache property, if it doesn't appear in self.__dict__ - if transaction is started via "filtered repo", _refreshfilecachestats() is applied on "filtered repo" because repo.transaction() adds "self._refreshfilecachestats" to post close procedures. repo.transaction() isn't unfiltered method, and "self" in it means "filtered repo" in this case. Transactions started by explicit repo.transaction() easily causes this situation. - _refreshfilecachestats() applied on "filtered repo" omits whole refreshing because @filecache properties are stored into "unfiltered repo", and appear only in self.__dict__ of "unfiltered repo". This incorrect refreshing causes unnecessary reloading from files. To refresh file stat of @filecache properties at closing transaction correctly, this patch makes _refreshfilecachestats() unfiltered method. This patch chooses making _refreshfilecachestats() unfiltered method instead of making transaction() unfiltered method, to reduce unexpected side effect. diff -r 519a02267f90 -r e35a83cedde1 mercurial/localrepo.py --- a/mercurial/localrepo.py Mon Sep 12 03:06:29 2016 +0900 +++ b/mercurial/localrepo.py Mon Sep 12 03:06:29 2016 +0900 @@ -1279,6 +1279,7 @@ self.invalidate() self.invalidatedirstate() + @unfilteredmethod def _refreshfilecachestats(self, tr): """Reload stats of cached files so that they are flagged as valid""" for k, ce in self._filecache.items():