This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6732

localrepo: push manifestlog and changelog construction code into store
ClosedPublic

Authored by durin42 on Aug 16 2019, 4:54 PM.

Details

Reviewers
indygreg
pulkit
Group Reviewers
hg-reviewers
Commits
rHG3df3b139a43d: localrepo: push manifestlog and changelog construction code into store
Summary

This feels substantially more appropriate, as the store is actually
the layer with knowledge of how to handle this storage. I didn't move
the caching decorators for now because that's going to require some
more involved work, and this unblocks my current experimentation.

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

durin42 created this revision.Aug 16 2019, 4:54 PM
indygreg accepted this revision.Aug 21 2019, 11:46 AM
indygreg added a subscriber: indygreg.

The boundary between localrepository and store is a bit murky and definitely needs some work. When I last had things paged into my brain last year, I think I was trending towards breaking up the store into discrete classes and making the code that dynamically resolves repository types cherry pick the classes depending on the opener options. But we could easily have the store handle this logic as well. This is all very complicated and I don't prescribe to have a single correct answer.

This revision is now accepted and ready to land.Aug 21 2019, 11:46 AM
durin42 added a comment.Aug 22 2019, 10:02 AM

I think pushing it down into the store makes a reasonable amount of sense, since it's going to be pretty heavily tied to the revision storage mechanism...

durin42 added a comment.Sep 5 2019, 3:20 PM

Ping on this - can we get this landed to unblock my experimentation?

durin42 updated this revision to Diff 16386.Sep 5 2019, 3:20 PM
pulkit accepted this revision.Sep 9 2019, 11:15 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/localrepo.py (9 lines)
Mmercurial/store.py (10 lines)

Diff 16456

mercurial/localrepo.py

nullrev, nullrev,
short, short,
) )
from . import ( from . import (
bookmarks, bookmarks,
branchmap, branchmap,
bundle2, bundle2,
changegroup, changegroup,
changelog,
color, color,
context, context,
dirstate, dirstate,
dirstateguard, dirstateguard,
discovery, discovery,
encoding, encoding,
error, error,
exchange, exchange,
extensions, extensions,
filelog, filelog,
hook, hook,
lock as lockmod, lock as lockmod,
manifest,
match as matchmod, match as matchmod,
merge as mergemod, merge as mergemod,
mergeutil, mergeutil,
namespaces, namespaces,
narrowspec, narrowspec,
obsolete, obsolete,
pathutil, pathutil,
phases, phases,
return phases.phasecache(self, self._phasedefaults) return phases.phasecache(self, self._phasedefaults)
@storecache('obsstore') @storecache('obsstore')
def obsstore(self): def obsstore(self):
return obsolete.makestore(self.ui, self) return obsolete.makestore(self.ui, self)
@storecache('00changelog.i') @storecache('00changelog.i')
def changelog(self): def changelog(self):
return changelog.changelog(self.svfs, return self.store.changelog(txnutil.mayhavepending(self.root))
trypending=txnutil.mayhavepending(self.root))
@storecache('00manifest.i') @storecache('00manifest.i')
def manifestlog(self): def manifestlog(self):
rootstore = manifest.manifestrevlog(self.svfs) return self.store.manifestlog(self, self._storenarrowmatch)
return manifest.manifestlog(self.svfs, self, rootstore,
self._storenarrowmatch)
@repofilecache('dirstate') @repofilecache('dirstate')
def dirstate(self): def dirstate(self):
return self._makedirstate() return self._makedirstate()
def _makedirstate(self): def _makedirstate(self):
"""Extension point for wrapping the dirstate per-repo.""" """Extension point for wrapping the dirstate per-repo."""
sparsematchfn = lambda: sparse.matcher(self) sparsematchfn = lambda: sparse.matcher(self)

mercurial/store.py

import errno import errno
import functools import functools
import hashlib import hashlib
import os import os
import stat import stat
from .i18n import _ from .i18n import _
from . import ( from . import (
changelog,
error, error,
manifest,
node, node,
policy, policy,
pycompat, pycompat,
util, util,
vfs as vfsmod, vfs as vfsmod,
) )
parsers = policy.importmod(r'parsers') parsers = policy.importmod(r'parsers')
if filefilter(f, kind, st): if filefilter(f, kind, st):
n = util.pconvert(fp[striplen:]) n = util.pconvert(fp[striplen:])
l.append((decodedir(n), n, st.st_size)) l.append((decodedir(n), n, st.st_size))
elif kind == stat.S_IFDIR and recurse: elif kind == stat.S_IFDIR and recurse:
visit.append(fp) visit.append(fp)
l.sort() l.sort()
return l return l
def changelog(self, trypending):
return changelog.changelog(self.vfs, trypending=trypending)
def manifestlog(self, repo, storenarrowmatch):
rootstore = manifest.manifestrevlog(self.vfs)
return manifest.manifestlog(
self.vfs, repo, rootstore, storenarrowmatch)
def datafiles(self, matcher=None): def datafiles(self, matcher=None):
return self._walk('data', True) + self._walk('meta', True) return self._walk('data', True) + self._walk('meta', True)
def topfiles(self): def topfiles(self):
# yield manifest before changelog # yield manifest before changelog
return reversed(self._walk('', False)) return reversed(self._walk('', False))
def walk(self, matcher=None): def walk(self, matcher=None):