mercurial-scm/hg: comparison mercurial/changegroup.py

equal deleted inserted replaced

-:c4a2d19d393a
+:d662959dc881
 linknode = attr.ib()
 # 2 bytes of flags to apply to revision data.
 flags = attr.ib()
 # Iterable of chunks holding raw delta data.
 deltachunks = attr.ib()
+def _revisiondeltatochunks(delta, headerfn):
+"""Serialize a revisiondelta to changegroup chunks."""
+meta = headerfn(delta)
+l = len(meta) + sum(len(x) for x in delta.deltachunks)
+yield chunkheader(l)
+yield meta
+for x in delta.deltachunks:
+yield x
 def _sortnodesnormal(store, nodes, reorder):
 """Sort nodes for changegroup generation and turn into revnums."""
 # for generaldelta revlogs, we linearize the revs; this will both be
 # much quicker and generate a much smaller bundle
 flags=flags,
 deltachunks=(diffheader, data),
 )
 def deltagroup(repo, revs, store, ischangelog, lookup, deltaparentfn,
-deltaheaderfn, units=None,
+units=None,
 ellipses=False, clrevtolocalrev=None, fullclnodes=None,
 precomputedellipsis=None):
-"""Calculate a delta group, yielding a sequence of changegroup chunks
+"""Calculate deltas for a set of revisions.
-(strings).
+Is a generator of ``revisiondelta`` instances.
-Given a list of changeset revs, return a set of deltas and
-metadata corresponding to nodes. The first delta is
-first parent(nodelist[0]) -> nodelist[0], the receiver is
-guaranteed to have this parent as it has all history before
-these changesets. In the case firstparent is nullrev the
-changegroup starts with a full revision.
 If units is not None, progress detail will be generated, units specifies
 the type of revlog that is touched (changelog, manifest, etc.).
 """
 # if we don't have any revisions touched by these changesets, bail
 precomputedellipsis)
 else:
 delta = _revisiondeltanormal(store, curr, prev, linknode,
 deltaparentfn)
-if not delta:
+if delta:
-continue
+yield delta
-meta = deltaheaderfn(delta)
-l = len(meta) + sum(len(x) for x in delta.deltachunks)
-yield chunkheader(l)
-yield meta
-for x in delta.deltachunks:
-yield x
 if progress:
 progress.complete()
 class cgpacker(object):
 cl = repo.changelog
 self._verbosenote(_('uncompressed size of bundle content:\n'))
 size = 0
-clstate, chunks = self._generatechangelog(cl, clnodes)
+clstate, deltas = self._generatechangelog(cl, clnodes)
-for chunk in chunks:
+for delta in deltas:
-size += len(chunk)
+for chunk in _revisiondeltatochunks(delta, self._builddeltaheader):
-yield chunk
+size += len(chunk)
+yield chunk
 close = closechunk()
 size += len(close)
 yield closechunk()
 size = 0
 it = self.generatemanifests(
 commonrevs, clrevorder, fastpathlinkrev, mfs, fnodes, source,
 clstate['clrevtomanifestrev'])
-for dir, chunks in it:
+for dir, deltas in it:
 if dir:
 assert self.version == b'03'
 chunk = _fileheader(dir)
 size += len(chunk)
 yield chunk
-for chunk in chunks:
+for delta in deltas:
-size += len(chunk)
+chunks = _revisiondeltatochunks(delta, self._builddeltaheader)
-yield chunk
+for chunk in chunks:
+size += len(chunk)
+yield chunk
 close = closechunk()
 size += len(close)
 yield close
 it = self.generatefiles(changedfiles, commonrevs,
 source, mfdicts, fastpathlinkrev,
 fnodes, clrevs)
-for path, chunks in it:
+for path, deltas in it:
 h = _fileheader(path)
 size = len(h)
 yield h
-for chunk in chunks:
+for delta in deltas:
-size += len(chunk)
+chunks = _revisiondeltatochunks(delta, self._builddeltaheader)
-yield chunk
+for chunk in chunks:
+size += len(chunk)
+yield chunk
 close = closechunk()
 size += len(close)
 yield close
 'clrevtomanifestrev': clrevtomanifestrev,
 }
 gen = deltagroup(
 self._repo, revs, cl, True, lookupcl,
-self._deltaparentfn, self._builddeltaheader,
+self._deltaparentfn,
 ellipses=self._ellipses,
 units=_('changesets'),
 clrevtolocalrev={},
 fullclnodes=self._fullclnodes,
 precomputedellipsis=self._precomputedellipsis)
 lookupfn)
 else:
 revs = _sortnodesnormal(store, prunednodes,
 self._reorder)
-it = deltagroup(
+deltas = deltagroup(
 self._repo, revs, store, False, lookupfn,
-self._deltaparentfn, self._builddeltaheader,
+self._deltaparentfn,
 ellipses=self._ellipses,
 units=_('manifests'),
 clrevtolocalrev=clrevtolocalrev,
 fullclnodes=self._fullclnodes,
 precomputedellipsis=self._precomputedellipsis)
-yield dir, it
+yield dir, deltas
 # The 'source' parameter is useful for extensions
 def generatefiles(self, changedfiles, commonrevs, source,
 mfdicts, fastpathlinkrev, fnodes, clrevs):
 changedfiles = list(filter(self._filematcher, changedfiles))
 revs = _sortnodesnormal(filerevlog, filenodes,
 self._reorder)
 progress.update(i + 1, item=fname)
-it = deltagroup(
+deltas = deltagroup(
 self._repo, revs, filerevlog, False, lookupfilelog,
-self._deltaparentfn, self._builddeltaheader,
+self._deltaparentfn,
 ellipses=self._ellipses,
 clrevtolocalrev=clrevtolocalrev,
 fullclnodes=self._fullclnodes,
 precomputedellipsis=self._precomputedellipsis)
-yield fname, it
+yield fname, deltas
 progress.complete()
 def _deltaparentprev(store, rev, p1, p2, prev):
 """Resolve a delta parent to the previous revision.

changeset 39014	d662959dc881
parent 39013	c4a2d19d393a
child 39015	ad9eccedb379