( )⚙ D4210 changegroup: move file chunk emission to generate()

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4210

changegroup: move file chunk emission to generate()
ClosedPublic

Authored by indygreg on Aug 9 2018, 4:52 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGc4a2d19d393a: changegroup: move file chunk emission to generate()
Summary

Same deal as manifests. We want to get to a point where we can
emit data structures from deltagroup() and derive the raw
changegroup data as late as possible.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

indygreg created this revision.Aug 9 2018, 4:52 PM
Closed by commit rHGc4a2d19d393a: changegroup: move file chunk emission to generate() (authored by indygreg). · Explain WhyAug 9 2018, 10:24 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/changegroup.py (34 lines)

Diff 10204

mercurial/changegroup.py

mfdicts = None mfdicts = None
if self._ellipses and self._isshallow: if self._ellipses and self._isshallow:
mfdicts = [(self._repo.manifestlog[n].read(), lr) mfdicts = [(self._repo.manifestlog[n].read(), lr)
for (n, lr) in mfs.iteritems()] for (n, lr) in mfs.iteritems()]
mfs.clear() mfs.clear()
clrevs = set(cl.rev(x) for x in clnodes) clrevs = set(cl.rev(x) for x in clnodes)
for chunk in self.generatefiles(changedfiles, commonrevs, it = self.generatefiles(changedfiles, commonrevs,
source, mfdicts, fastpathlinkrev, source, mfdicts, fastpathlinkrev,
fnodes, clrevs): fnodes, clrevs)
for path, chunks in it:
h = _fileheader(path)
size = len(h)
yield h
for chunk in chunks:
size += len(chunk)
yield chunk yield chunk
close = closechunk()
size += len(close)
yield close
self._verbosenote(_('%8.i %s\n') % (size, path))
yield closechunk() yield closechunk()
if clnodes: if clnodes:
repo.hook('outgoing', node=hex(clnodes[0]), source=source) repo.hook('outgoing', node=hex(clnodes[0]), source=source)
def _generatechangelog(self, cl, nodes): def _generatechangelog(self, cl, nodes):
"""Generate data for changelog chunks. """Generate data for changelog chunks.
if self._ellipses: if self._ellipses:
revs = _sortnodesellipsis(filerevlog, filenodes, revs = _sortnodesellipsis(filerevlog, filenodes,
cl, lookupfilelog) cl, lookupfilelog)
else: else:
revs = _sortnodesnormal(filerevlog, filenodes, revs = _sortnodesnormal(filerevlog, filenodes,
self._reorder) self._reorder)
progress.update(i + 1, item=fname) progress.update(i + 1, item=fname)
h = _fileheader(fname)
size = len(h)
yield h
it = deltagroup( it = deltagroup(
self._repo, revs, filerevlog, False, lookupfilelog, self._repo, revs, filerevlog, False, lookupfilelog,
self._deltaparentfn, self._builddeltaheader, self._deltaparentfn, self._builddeltaheader,
ellipses=self._ellipses, ellipses=self._ellipses,
clrevtolocalrev=clrevtolocalrev, clrevtolocalrev=clrevtolocalrev,
fullclnodes=self._fullclnodes, fullclnodes=self._fullclnodes,
precomputedellipsis=self._precomputedellipsis) precomputedellipsis=self._precomputedellipsis)
for chunk in it: yield fname, it
size += len(chunk)
yield chunk
close = closechunk()
size += len(close)
yield close
self._verbosenote(_('%8.i %s\n') % (size, fname))
progress.complete() progress.complete()
def _deltaparentprev(store, rev, p1, p2, prev): def _deltaparentprev(store, rev, p1, p2, prev):
"""Resolve a delta parent to the previous revision. """Resolve a delta parent to the previous revision.
Used for version 1 changegroups, which don't support generaldelta. Used for version 1 changegroups, which don't support generaldelta.
""" """
return prev return prev