This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11483

manifestlog: also monitor `00manifestlog.n` when applicable
ClosedPublic

Authored by marmoute on Sep 21 2021, 5:51 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG7970895a21cb: manifestlog: also monitor `00manifest.n` when applicable
Summary

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.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

marmoute created this revision.Sep 21 2021, 5:51 PM
Alphare added a subscriber: Alphare.Sep 22 2021, 5:32 AM
Alphare added inline comments.
mercurial/localrepo.py
167

Shouldn't this be 00manifest.i?

marmoute added inline comments.Sep 23 2021, 1:35 PM
mercurial/localrepo.py
167

it should :-/ (same for the .n)
Do you want a resent or do you awnt to fix it in-flight ?

Alphare added inline comments.Sep 24 2021, 5:56 AM
mercurial/localrepo.py
167

If you're fixing the other nit it the series I'd rather it be a re-send

marmoute updated this revision to Diff 30402.Sep 24 2021, 12:43 PM
marmoute added a commit: rHG7970895a21cb: manifestlog: also monitor `00manifest.n` when applicable.Sep 28 2021, 4:08 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG7970895a21cb: manifestlog: also monitor `00manifest.n` when applicable (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/localrepo.py (17 lines)

Diff 30410

mercurial/localrepo.py

def tracked_paths(self, obj): def tracked_paths(self, obj):
paths = [self.join(obj, b'00changelog.i')] paths = [self.join(obj, b'00changelog.i')]
if obj.store.opener.options.get(b'persistent-nodemap', False): if obj.store.opener.options.get(b'persistent-nodemap', False):
paths.append(self.join(obj, b'00changelog.n')) paths.append(self.join(obj, b'00changelog.n'))
return paths return paths
class manifestlogcache(storecache):
"""filecache for the manifestlog"""
def __init__(self):
super(manifestlogcache, self).__init__()
_cachedfiles.add((b'00manifest.i', b''))
AlphareUnsubmitted
Not Done

Shouldn't this be 00manifest.i?

Alphare: Shouldn't this be `00manifest.i`?
marmouteAuthorUnsubmitted
Done

it should :-/ (same for the .n)
Do you want a resent or do you awnt to fix it in-flight ?

marmoute: it should :-/ (same for the .n) Do you want a resent or do you awnt to fix it in-flight ?
AlphareUnsubmitted
Not Done

If you're fixing the other nit it the series I'd rather it be a re-send

Alphare: If you're fixing the other nit it the series I'd rather it be a re-send
_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): class mixedrepostorecache(_basefilecache):
"""filecache for a mix files in .hg/store and outside""" """filecache for a mix files in .hg/store and outside"""
def __init__(self, *pathsandlocations): def __init__(self, *pathsandlocations):
# scmutil.filecache only uses the path for passing back into our # scmutil.filecache only uses the path for passing back into our
# join(), so we can safely pass a list of paths and locations # join(), so we can safely pass a list of paths and locations
super(mixedrepostorecache, self).__init__(*pathsandlocations) super(mixedrepostorecache, self).__init__(*pathsandlocations)
_cachedfiles.update(pathsandlocations) _cachedfiles.update(pathsandlocations)
def changelog(repo): def changelog(repo):
# load dirstate before changelog to avoid race see issue6303 # load dirstate before changelog to avoid race see issue6303
repo.dirstate.prefetch_parents() repo.dirstate.prefetch_parents()
return repo.store.changelog( return repo.store.changelog(
txnutil.mayhavepending(repo.root), txnutil.mayhavepending(repo.root),
concurrencychecker=revlogchecker.get_checker(repo.ui, b'changelog'), concurrencychecker=revlogchecker.get_checker(repo.ui, b'changelog'),
) )
@storecache(b'00manifest.i') @manifestlogcache()
def manifestlog(self): def manifestlog(self):
return self.store.manifestlog(self, self._storenarrowmatch) return self.store.manifestlog(self, self._storenarrowmatch)
@repofilecache(b'dirstate') @repofilecache(b'dirstate')
def dirstate(self): def dirstate(self):
return self._makedirstate() return self._makedirstate()
def _makedirstate(self): def _makedirstate(self):