This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4278

manifest: rename manifestlog._treeinmem to ._treemanifests
ClosedPublic

Authored by indygreg on Aug 13 2018, 12:55 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG071f97d03acb: manifest: rename manifestlog._treeinmem to ._treemanifests
Summary

Not sure what "inmem" was supposed to indicate. This object is an
interface to manifest data on disk as well as "in memory" (assuming
that's what "inmem" means).

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

indygreg created this revision.Aug 13 2018, 12:55 PM
durin42 added a subscriber: durin42.Aug 22 2018, 12:34 PM

We used to have a way to do tree-in-memory but flat-on-disk, IIRC.

Closed by commit rHG071f97d03acb: manifest: rename manifestlog._treeinmem to ._treemanifests (authored by indygreg). · Explain WhyAug 22 2018, 12:37 PM
This revision was automatically updated to reflect the committed changes.
martinvonz added a subscriber: martinvonz.Aug 28 2018, 2:22 PM
martinvonz added inline comments.
mercurial/manifest.py
1275

_treeinmem was used for indicating that the treemanifest type should be used in memory and this variable (_treeondisk) was used for indicating that treemanifest revlogs should be used. The only reason this distinction was useful was so you could set manually force _treeinmem = True in the code and run the test suite to make sure that the treemanifest type worked.

Revision Contents
Changeset List

PathPackages
Mmercurial/manifest.py (5 lines)

Diff 10525

mercurial/manifest.py

# stacks of commits, the number can go up, hence the config knob below. # stacks of commits, the number can go up, hence the config knob below.
cachesize = 4 cachesize = 4
optiontreemanifest = False optiontreemanifest = False
opts = getattr(opener, 'options', None) opts = getattr(opener, 'options', None)
if opts is not None: if opts is not None:
cachesize = opts.get('manifestcachesize', cachesize) cachesize = opts.get('manifestcachesize', cachesize)
optiontreemanifest = opts.get('treemanifest', False) optiontreemanifest = opts.get('treemanifest', False)
self._treeondisk = optiontreemanifest or treemanifest self._treeondisk = optiontreemanifest or treemanifest
martinvonzUnsubmitted
Not Done

_treeinmem was used for indicating that the treemanifest type should be used in memory and this variable (_treeondisk) was used for indicating that treemanifest revlogs should be used. The only reason this distinction was useful was so you could set manually force _treeinmem = True in the code and run the test suite to make sure that the treemanifest type worked.

martinvonz: `_treeinmem` was used for indicating that the `treemanifest` type should be used in memory and…
self._fulltextcache = manifestfulltextcache(cachesize) self._fulltextcache = manifestfulltextcache(cachesize)
if tree: if tree:
assert self._treeondisk, 'opts is %r' % opts assert self._treeondisk, 'opts is %r' % opts
if indexfile is None: if indexfile is None:
indexfile = '00manifest.i' indexfile = '00manifest.i'
def __init__(self, opener, repo): def __init__(self, opener, repo):
usetreemanifest = False usetreemanifest = False
cachesize = 4 cachesize = 4
opts = getattr(opener, 'options', None) opts = getattr(opener, 'options', None)
if opts is not None: if opts is not None:
usetreemanifest = opts.get('treemanifest', usetreemanifest) usetreemanifest = opts.get('treemanifest', usetreemanifest)
cachesize = opts.get('manifestcachesize', cachesize) cachesize = opts.get('manifestcachesize', cachesize)
self._treeinmem = usetreemanifest
self._treemanifests = usetreemanifest
self._revlog = repo._constructmanifest() self._revlog = repo._constructmanifest()
self._revlog._setupmanifestcachehooks(repo) self._revlog._setupmanifestcachehooks(repo)
self._narrowmatch = repo.narrowmatch() self._narrowmatch = repo.narrowmatch()
# A cache of the manifestctx or treemanifestctx for each directory # A cache of the manifestctx or treemanifestctx for each directory
self._dirmancache = {} self._dirmancache = {}
self._dirmancache[''] = util.lrucachedict(cachesize) self._dirmancache[''] = util.lrucachedict(cachesize)
raise error.Abort( raise error.Abort(
_("cannot ask for manifest directory '%s' in a flat " _("cannot ask for manifest directory '%s' in a flat "
"manifest") % tree) "manifest") % tree)
else: else:
if verify: if verify:
if node not in self._revlog.nodemap: if node not in self._revlog.nodemap:
raise LookupError(node, self._revlog.indexfile, raise LookupError(node, self._revlog.indexfile,
_('no node')) _('no node'))
if self._treeinmem: if self._treemanifests:
m = treemanifestctx(self, '', node) m = treemanifestctx(self, '', node)
else: else:
m = manifestctx(self, node) m = manifestctx(self, node)
if node != revlog.nullid: if node != revlog.nullid:
mancache = self._dirmancache.get(tree) mancache = self._dirmancache.get(tree)
if not mancache: if not mancache:
mancache = util.lrucachedict(self._cachesize) mancache = util.lrucachedict(self._cachesize)