This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4136

changegroup: record changelogdone after fully consuming its data
ClosedPublic

Authored by indygreg on Aug 6 2018, 3:51 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG6d726d1b08cb: changegroup: record changelogdone after fully consuming its data
Summary

Setting this as a side-effect of calling _close() is wonky. There's
only one group for changelog data. So we can wait until after all
data has been emitted before recording it.

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 6 2018, 3:51 PM
indygreg updated this revision to Diff 10063.Aug 7 2018, 1:26 PM
Closed by commit rHG6d726d1b08cb: changegroup: record changelogdone after fully consuming its data (authored by indygreg). · Explain WhyAug 9 2018, 2:15 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/changegroup.py (3 lines)

Diff 10143

mercurial/changegroup.py

self._clnodetorev = {} self._clnodetorev = {}
def _close(self): def _close(self):
# Ellipses serving mode. # Ellipses serving mode.
self._clrevtolocalrev.clear() self._clrevtolocalrev.clear()
if self._nextclrevtolocalrev is not None: if self._nextclrevtolocalrev is not None:
self._clrevtolocalrev = self._nextclrevtolocalrev self._clrevtolocalrev = self._nextclrevtolocalrev
self._nextclrevtolocalrev = None self._nextclrevtolocalrev = None
self._changelogdone = True
return closechunk() return closechunk()
def _fileheader(self, fname): def _fileheader(self, fname):
return chunkheader(len(fname)) + fname return chunkheader(len(fname)) + fname
# Extracted both for clarity and for overriding in extensions. # Extracted both for clarity and for overriding in extensions.
def _sortgroup(self, store, nodelist, lookup): def _sortgroup(self, store, nodelist, lookup):
clstate, chunks = self._generatechangelog(cl, clnodes) clstate, chunks = self._generatechangelog(cl, clnodes)
for chunk in chunks: for chunk in chunks:
size += len(chunk) size += len(chunk)
yield chunk yield chunk
self._verbosenote(_('%8.i (changelog)\n') % size) self._verbosenote(_('%8.i (changelog)\n') % size)
self._changelogdone = True
clrevorder = clstate['clrevorder'] clrevorder = clstate['clrevorder']
mfs = clstate['mfs'] mfs = clstate['mfs']
changedfiles = clstate['changedfiles'] changedfiles = clstate['changedfiles']
# We need to make sure that the linkrev in the changegroup refers to # We need to make sure that the linkrev in the changegroup refers to
# the first changeset that introduced the manifest or file revision. # the first changeset that introduced the manifest or file revision.
# The fastpath is usually safer than the slowpath, because the filelogs # The fastpath is usually safer than the slowpath, because the filelogs
# are walked in revlog order. # are walked in revlog order.