[PATCH] localrepo: clear _filecache earlier to really force reloading (issue3462)

Idan Kamara idankk86 at gmail.com
Tue May 29 10:30:14 CDT 2012


# HG changeset patch
# User Idan Kamara <idankk86 at gmail.com>
# Date 1338305232 -10800
# Branch stable
# Node ID fe5e37568295c83c697e4ddcfaf3594f9415d923
# Parent  30e46d7138de0acb2d811162c1cf3441afe1687e
localrepo: clear _filecache earlier to really force reloading (issue3462)

ce0ad184f489 attempted to force the filecaches in localrepo to reload
everything after a rollback. But simply clearing _filecache isn't enough,
invalidate() needs to be called before/after. localrepo._rollback calls
invalidate() already, so we clear the map right afterwards which ensures
everything will be reread.

diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -833,6 +833,9 @@
                         self.sjoin('phaseroots'))
         self.invalidate()
 
+        # Discard all cache entries to force reloading everything.
+        self._filecache.clear()
+
         parentgone = (parents[0] not in self.changelog.nodemap or
                       parents[1] not in self.changelog.nodemap)
         if parentgone:
@@ -1316,9 +1319,6 @@
         # tag cache retrieval" case to work.
         self.invalidatecaches()
 
-        # Discard all cache entries to force reloading everything.
-        self._filecache.clear()
-
     def walk(self, match, node=None):
         '''
         walk recursively through the directory tree or a given


More information about the Mercurial-devel mailing list