# HG changeset patch # User Pierre-Yves David # Date 2021-09-21 16:18:56 # Node ID 7970895a21cb7bb4ebe891317c6b5d654459e1c5 # Parent c094e829e848e950163a42c61211925c8f1c0a7b manifestlog: also monitor `00manifest.n` when applicable This let the locarepo's file cache detect outdated nodemap docket and reload the manifestlog after `localrepo.invalidate` when applicable. The same problem than issue6554 could affect the Manifest too. Differential Revision: https://phab.mercurial-scm.org/D11483 diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py --- a/mercurial/localrepo.py +++ b/mercurial/localrepo.py @@ -159,6 +159,21 @@ class changelogcache(storecache): return paths +class manifestlogcache(storecache): + """filecache for the manifestlog""" + + def __init__(self): + super(manifestlogcache, self).__init__() + _cachedfiles.add((b'00manifest.i', b'')) + _cachedfiles.add((b'00manifest.n', b'')) + + def tracked_paths(self, obj): + paths = [self.join(obj, b'00manifest.i')] + if obj.store.opener.options.get(b'persistent-nodemap', False): + paths.append(self.join(obj, b'00manifest.n')) + return paths + + class mixedrepostorecache(_basefilecache): """filecache for a mix files in .hg/store and outside""" @@ -1697,7 +1712,7 @@ class localrepository(object): concurrencychecker=revlogchecker.get_checker(repo.ui, b'changelog'), ) - @storecache(b'00manifest.i') + @manifestlogcache() def manifestlog(self): return self.store.manifestlog(self, self._storenarrowmatch)