This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4886

changegroup: add a parts argument to cgpacker.generate()
AbandonedPublic

Authored by pulkit on Oct 5 2018, 11:40 AM.

Details

Reviewers
durin42
martinvonz
Group Reviewers
hg-reviewers
Summary

This patch removes the changelog argument added to cgpacker.generate() few weeks
ago and add a parts argument which will be a tuple of parts to be included into
the changegroup.

The changelog argument was used to determine that whether we need to add
changelog data to the changegroup or not. In upcoming patches, I will need same
functionality for manifests where I just want to send the dirlogs for extending
a narrow clone. Instead of adding a new argument for each possible thing, let's
add one argument specifying things we want to generate.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Revision Contents
Changeset List

PathPackages
Mmercurial/bundle2.py (3 lines)
Mmercurial/changegroup.py (15 lines)

Diff 11705

mercurial/bundle2.py

for r in repo.revs("::%ln", common): for r in repo.revs("::%ln", common):
commonnodes.add(cl.node(r)) commonnodes.add(cl.node(r))
if commonnodes: if commonnodes:
# XXX: we should only send the filelogs (and treemanifest). user # XXX: we should only send the filelogs (and treemanifest). user
# already has the changelog and manifest # already has the changelog and manifest
packer = changegroup.getbundler(cgversion, repo, packer = changegroup.getbundler(cgversion, repo,
filematcher=diffmatcher, filematcher=diffmatcher,
fullnodes=commonnodes) fullnodes=commonnodes)
reqparts = ('manifest', 'dirlogs', 'filelog')
cgdata = packer.generate(set([nodemod.nullid]), list(commonnodes), cgdata = packer.generate(set([nodemod.nullid]), list(commonnodes),
False, 'narrow_widen', changelog=False) False, 'narrow_widen', parts=reqparts)
part = bundler.newpart('changegroup', data=cgdata) part = bundler.newpart('changegroup', data=cgdata)
part.addparam('version', cgversion) part.addparam('version', cgversion)
if 'treemanifest' in repo.requirements: if 'treemanifest' in repo.requirements:
part.addparam('treemanifest', '1') part.addparam('treemanifest', '1')
return bundler return bundler

mercurial/changegroup.py

self._repo = repo self._repo = repo
if self._repo.ui.verbose and not self._repo.ui.debugflag: if self._repo.ui.verbose and not self._repo.ui.debugflag:
self._verbosenote = self._repo.ui.note self._verbosenote = self._repo.ui.note
else: else:
self._verbosenote = lambda s: None self._verbosenote = lambda s: None
def generate(self, commonrevs, clnodes, fastpathlinkrev, source, def generate(self, commonrevs, clnodes, fastpathlinkrev, source,
changelog=True): parts=None):
"""Yield a sequence of changegroup byte chunks. """Yield a sequence of changegroup byte chunks.
If changelog is False, changelog data won't be added to changegroup
parts is a tuple of things which should be generated in the changegroup.
Possible values of tuple are 'changelog', 'manifest', 'dirlogs' and
'filelogs'
callers can pass a tuple omitting some part which they don't want in the
changegroup. For ex. widening with narrow passes parts as
('dirlogs', 'filelogs')
""" """
if parts is None:
parts = ('changelog', 'manifest', 'dirlogs', 'filelog')
repo = self._repo repo = self._repo
cl = repo.changelog cl = repo.changelog
self._verbosenote(_('uncompressed size of bundle content:\n')) self._verbosenote(_('uncompressed size of bundle content:\n'))
size = 0 size = 0
clstate, deltas = self._generatechangelog(cl, clnodes) clstate, deltas = self._generatechangelog(cl, clnodes)
for delta in deltas: for delta in deltas:
if changelog: if 'changelog' in parts:
for chunk in _revisiondeltatochunks(delta, for chunk in _revisiondeltatochunks(delta,
self._builddeltaheader): self._builddeltaheader):
size += len(chunk) size += len(chunk)
yield chunk yield chunk
close = closechunk() close = closechunk()
size += len(close) size += len(close)
yield closechunk() yield closechunk()