This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9847

revlog: decouple caching from addrevision callback for addgroup
ClosedPublic

Authored by joerg.sonnenberger on Jan 21 2021, 12:58 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG711ba0f1057e: revlog: decouple caching from addrevision callback for addgroup
Summary

For changesets, it is useful to cache the content as it will almost
always be processed afterwards. For manifests on the other hand, the
content is often not used directly as there is a fast path for deltas.
Explicitly disable the cache in exchangev2's manifest handling for that
reason.

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

joerg.sonnenberger added a commit: rHG711ba0f1057e: revlog: decouple caching from addrevision callback for addgroup.Jan 22 2021, 3:39 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG711ba0f1057e: revlog: decouple caching from addrevision callback for addgroup (authored by joerg.sonnenberger). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 25228

mercurial/changegroup.py

repo.register_changeset(rev, ctx) repo.register_changeset(rev, ctx)
self.changelogheader() self.changelogheader()
deltas = self.deltaiter() deltas = self.deltaiter()
if not cl.addgroup( if not cl.addgroup(
deltas, deltas,
csmap, csmap,
trp, trp,
alwayscache=True,
addrevisioncb=onchangelog, addrevisioncb=onchangelog,
duplicaterevisioncb=ondupchangelog, duplicaterevisioncb=ondupchangelog,
): ):
repo.ui.develwarn( repo.ui.develwarn(
b'applied empty changelog from changegroup', b'applied empty changelog from changegroup',
config=b'warn-empty-changegroup', config=b'warn-empty-changegroup',
) )
efiles = len(efilesset) efiles = len(efilesset)

mercurial/exchangev2.py

# Flags not yet supported. # Flags not yet supported.
0, 0,
) )
cl.addgroup( cl.addgroup(
iterrevisions(), iterrevisions(),
linkrev, linkrev,
weakref.proxy(tr), weakref.proxy(tr),
alwayscache=True,
addrevisioncb=onchangeset, addrevisioncb=onchangeset,
duplicaterevisioncb=ondupchangeset, duplicaterevisioncb=ondupchangeset,
) )
progress.complete() progress.complete()
return { return {
b'added': added, b'added': added,

mercurial/interfaces/repository.py

(node, p1, p2, linknode, deltabase, delta, flags) defining revisions (node, p1, p2, linknode, deltabase, delta, flags) defining revisions
to add. to add.
The ``delta`` field contains ``mpatch`` data to apply to a base The ``delta`` field contains ``mpatch`` data to apply to a base
revision, identified by ``deltabase``. The base node can be revision, identified by ``deltabase``. The base node can be
``nullid``, in which case the header from the delta can be ignored ``nullid``, in which case the header from the delta can be ignored
and the delta used as the fulltext. and the delta used as the fulltext.
``alwayscache`` instructs the lower layers to cache the content of the
newly added revision, even if it needs to be explicitly computed.
This used to be the default when ``addrevisioncb`` was provided up to
Mercurial 5.8.
``addrevisioncb`` should be called for each node as it is committed. ``addrevisioncb`` should be called for each node as it is committed.
``duplicaterevisioncb`` should be called for each pre-existing node.
``maybemissingparents`` is a bool indicating whether the incoming ``maybemissingparents`` is a bool indicating whether the incoming
data may reference parents/ancestor revisions that aren't present. data may reference parents/ancestor revisions that aren't present.
This flag is set when receiving data into a "shallow" store that This flag is set when receiving data into a "shallow" store that
doesn't hold all history. doesn't hold all history.
Returns a list of nodes that were processed. A node will be in the list Returns a list of nodes that were processed. A node will be in the list
even if it existed in the store previously. even if it existed in the store previously.

mercurial/manifest.py

deltamode=deltamode, deltamode=deltamode,
) )
def addgroup( def addgroup(
self, self,
deltas, deltas,
linkmapper, linkmapper,
transaction, transaction,
alwayscache=False,
addrevisioncb=None, addrevisioncb=None,
duplicaterevisioncb=None, duplicaterevisioncb=None,
): ):
return self._revlog.addgroup( return self._revlog.addgroup(
deltas, deltas,
linkmapper, linkmapper,
transaction, transaction,
alwayscache=alwayscache,
addrevisioncb=addrevisioncb, addrevisioncb=addrevisioncb,
duplicaterevisioncb=duplicaterevisioncb, duplicaterevisioncb=duplicaterevisioncb,
) )
def rawsize(self, rev): def rawsize(self, rev):
return self._revlog.rawsize(rev) return self._revlog.rawsize(rev)
def getstrippoint(self, minlink): def getstrippoint(self, minlink):

mercurial/revlog.py

self._enforceinlinesize(transaction, ifh) self._enforceinlinesize(transaction, ifh)
nodemaputil.setup_persistent_nodemap(transaction, self) nodemaputil.setup_persistent_nodemap(transaction, self)
def addgroup( def addgroup(
self, self,
deltas, deltas,
linkmapper, linkmapper,
transaction, transaction,
alwayscache=False,
addrevisioncb=None, addrevisioncb=None,
duplicaterevisioncb=None, duplicaterevisioncb=None,
): ):
""" """
add a delta group add a delta group
given a set of deltas, add them to the revision log. the given a set of deltas, add them to the revision log. the
first delta is against its parent, which should be in our first delta is against its parent, which should be in our
transaction, transaction,
link, link,
p1, p1,
p2, p2,
flags, flags,
(baserev, delta), (baserev, delta),
ifh, ifh,
dfh, dfh,
alwayscache=bool(addrevisioncb), alwayscache=alwayscache,
deltacomputer=deltacomputer, deltacomputer=deltacomputer,
) )
if addrevisioncb: if addrevisioncb:
addrevisioncb(self, node) addrevisioncb(self, node)
empty = False empty = False
if not dfh and not self._inline: if not dfh and not self._inline:

mercurial/unionrepo.py

def addrevision(self, text, transaction, link, p1=None, p2=None, d=None): def addrevision(self, text, transaction, link, p1=None, p2=None, d=None):
raise NotImplementedError raise NotImplementedError
def addgroup( def addgroup(
self, self,
deltas, deltas,
linkmapper, linkmapper,
transaction, transaction,
alwayscache=False,
addrevisioncb=None, addrevisioncb=None,
duplicaterevisioncb=None, duplicaterevisioncb=None,
maybemissingparents=False, maybemissingparents=False,
): ):
raise NotImplementedError raise NotImplementedError
def strip(self, minlink, transaction): def strip(self, minlink, transaction):
raise NotImplementedError raise NotImplementedError