This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4274

manifest: remove addgroup() from manifestlog and imanifestlog
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGaad4b46e89bb: manifest: remove addgroup() from manifestlog and imanifestlog
Summary

addgroup() is part of the storage interface for manifests.
Unfortunately, we don't yet have a formal storage interface
for manifests. (One will be established in subsequent commits.)

One thing is for sure, addgroup() doesn't belong on imanifestlog -
at least not unless we extend that interface to encompass storage.

For now, let's access addgroup() on the _revlog attribute, just like
we do for tree manifests. Even though this violates visibility,
it is consistent.

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.

Revision Contents
Changeset List

PathPackages
Mmercurial/changegroup.py (3 lines)
Mmercurial/manifest.py (3 lines)
Mmercurial/repository.py (16 lines)

Diff 10522

mercurial/changegroup.py

def _unpackmanifests(self, repo, revmap, trp, prog): def _unpackmanifests(self, repo, revmap, trp, prog):
self.callback = prog.increment self.callback = prog.increment
# no need to check for empty manifest group here: # no need to check for empty manifest group here:
# if the result of the merge of 1 and 2 is the same in 3 and 4, # if the result of the merge of 1 and 2 is the same in 3 and 4,
# no new manifest will be created and the manifest group will # no new manifest will be created and the manifest group will
# be empty during the pull # be empty during the pull
self.manifestheader() self.manifestheader()
deltas = self.deltaiter() deltas = self.deltaiter()
repo.manifestlog.addgroup(deltas, revmap, trp) # TODO this violates storage abstraction.
repo.manifestlog._revlog.addgroup(deltas, revmap, trp)
prog.complete() prog.complete()
self.callback = None self.callback = None
def apply(self, repo, tr, srctype, url, targetphase=phases.draft, def apply(self, repo, tr, srctype, url, targetphase=phases.draft,
expectedtotal=None): expectedtotal=None):
"""Add the changegroup returned by source.read() to this repo. """Add the changegroup returned by source.read() to this repo.
srctype is a string like 'push', 'pull', or 'unbundle'. url is srctype is a string like 'push', 'pull', or 'unbundle'. url is
the URL of the repo where this changegroup is coming from. the URL of the repo where this changegroup is coming from.

mercurial/manifest.py

def clearcaches(self, clear_persisted_data=False): def clearcaches(self, clear_persisted_data=False):
self._dirmancache.clear() self._dirmancache.clear()
self._revlog.clearcaches(clear_persisted_data=clear_persisted_data) self._revlog.clearcaches(clear_persisted_data=clear_persisted_data)
def rev(self, node): def rev(self, node):
return self._revlog.rev(node) return self._revlog.rev(node)
def addgroup(self, deltas, linkmapper, transaction):
return self._revlog.addgroup(deltas, linkmapper, transaction)
@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

"""Clear caches associated with this collection.""" """Clear caches associated with this collection."""
def rev(node): def rev(node):
"""Obtain the revision number for a binary node. """Obtain the revision number for a binary node.
Raises ``error.LookupError`` if the node is not known. Raises ``error.LookupError`` if the node is not known.
""" """
def addgroup(deltas, linkmapper, transaction):
"""Process a series of deltas for storage.
``deltas`` is an iterable of 7-tuples of
(node, p1, p2, linknode, deltabase, delta, flags) defining revisions
to add.
The ``delta`` field contains ``mpatch`` data to apply to a base
revision, identified by ``deltabase``. The base node can be
``nullid``, in which case the header from the delta can be ignored
and the delta used as the fulltext.
Returns a list of nodes that were processed. A node will be in the list
even if it existed in the store previously.
"""
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.