( )⚙ D3882 manifest: define and implement rev() on manifestlog

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3882

manifest: define and implement rev() on manifestlog
ClosedPublic

Authored by indygreg on Jul 4 2018, 3:16 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGf2f9bacf0587: manifest: define and implement rev() on manifestlog
Summary

Various code is accessing repo.manifestlog._revlog - a private
attribute. This bypasses our interface and makes it difficult to
implement non-revlog manifest storage.

This commit adds a rev() method to the manifestlog interface and
class and teaches callers to use it.

Ideally this method wouldn't exist, as very few consumers should
need to resolve the revision number of a manifest. Again, the
primary goal of interface work is to establish and use interfaces
first and to improve them later.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

indygreg created this revision.Jul 4 2018, 3:16 PM
Closed by commit rHGf2f9bacf0587: manifest: define and implement rev() on manifestlog (authored by indygreg). · Explain WhyJul 5 2018, 8:10 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 9433

mercurial/logcmdutil.py

self.ui.write(columns['phase'] % ctx.phasestr(), label='log.phase') self.ui.write(columns['phase'] % ctx.phasestr(), label='log.phase')
for pctx in scmutil.meaningfulparents(self.repo, ctx): for pctx in scmutil.meaningfulparents(self.repo, ctx):
label = 'log.parent changeset.%s' % pctx.phasestr() label = 'log.parent changeset.%s' % pctx.phasestr()
self.ui.write(columns['parent'] % scmutil.formatchangeid(pctx), self.ui.write(columns['parent'] % scmutil.formatchangeid(pctx),
label=label) label=label)
if self.ui.debugflag and rev is not None: if self.ui.debugflag and rev is not None:
mnode = ctx.manifestnode() mnode = ctx.manifestnode()
mrev = self.repo.manifestlog._revlog.rev(mnode) mrev = self.repo.manifestlog.rev(mnode)
self.ui.write(columns['manifest'] self.ui.write(columns['manifest']
% scmutil.formatrevnode(self.ui, mrev, mnode), % scmutil.formatrevnode(self.ui, mrev, mnode),
label='ui.debug log.manifest') label='ui.debug log.manifest')
self.ui.write(columns['user'] % ctx.user(), label='log.user') self.ui.write(columns['user'] % ctx.user(), label='log.user')
self.ui.write(columns['date'] % dateutil.datestr(ctx.date()), self.ui.write(columns['date'] % dateutil.datestr(ctx.date()),
label='log.date') label='log.date')
if ctx.isunstable(): if ctx.isunstable():

mercurial/manifest.py

self._dirmancache[dir] = mancache self._dirmancache[dir] = mancache
mancache[node] = m mancache[node] = m
return m return m
def clearcaches(self): def clearcaches(self):
self._dirmancache.clear() self._dirmancache.clear()
self._revlog.clearcaches() self._revlog.clearcaches()
def rev(self, node):
return self._revlog.rev(node)
@interfaceutil.implementer(repository.imanifestrevisionwritable) @interfaceutil.implementer(repository.imanifestrevisionwritable)
class memmanifestctx(object): class memmanifestctx(object):
def __init__(self, manifestlog): def __init__(self, manifestlog):
self._manifestlog = manifestlog self._manifestlog = manifestlog
self._manifestdict = manifestdict() self._manifestdict = manifestdict()
def _revlog(self): def _revlog(self):
return self._manifestlog._revlog return self._manifestlog._revlog

mercurial/repository.py

The returned object conforms to the ``imanifestrevisionstored`` The returned object conforms to the ``imanifestrevisionstored``
interface. interface.
""" """
def clearcaches(): def clearcaches():
"""Clear caches associated with this collection.""" """Clear caches associated with this collection."""
def rev(node):
"""Obtain the revision number for a binary node.
Raises ``error.LookupError`` if the node is not known.
"""
class completelocalrepository(interfaceutil.Interface): class completelocalrepository(interfaceutil.Interface):
"""Monolithic interface for local repositories. """Monolithic interface for local repositories.
This currently captures the reality of things - not how things should be. This currently captures the reality of things - not how things should be.
""" """
supportedformats = interfaceutil.Attribute( supportedformats = interfaceutil.Attribute(
"""Set of requirements that apply to stream clone. """Set of requirements that apply to stream clone.

mercurial/templatekw.py

@templatekeyword('manifest', requires={'repo', 'ctx'}) @templatekeyword('manifest', requires={'repo', 'ctx'})
def showmanifest(context, mapping): def showmanifest(context, mapping):
repo = context.resource(mapping, 'repo') repo = context.resource(mapping, 'repo')
ctx = context.resource(mapping, 'ctx') ctx = context.resource(mapping, 'ctx')
mnode = ctx.manifestnode() mnode = ctx.manifestnode()
if mnode is None: if mnode is None:
# just avoid crash, we might want to use the 'ff...' hash in future # just avoid crash, we might want to use the 'ff...' hash in future
return return
mrev = repo.manifestlog._revlog.rev(mnode) mrev = repo.manifestlog.rev(mnode)
mhex = hex(mnode) mhex = hex(mnode)
mapping = context.overlaymap(mapping, {'rev': mrev, 'node': mhex}) mapping = context.overlaymap(mapping, {'rev': mrev, 'node': mhex})
f = context.process('manifest', mapping) f = context.process('manifest', mapping)
# TODO: perhaps 'ctx' should be dropped from mapping because manifest # TODO: perhaps 'ctx' should be dropped from mapping because manifest
# rev and node are completely different from changeset's. # rev and node are completely different from changeset's.
return templateutil.hybriditem(f, None, f, return templateutil.hybriditem(f, None, f,
lambda x: {'rev': mrev, 'node': mhex}) lambda x: {'rev': mrev, 'node': mhex})