This is an archive of the discontinued Mercurial Phabricator instance.

Differential D690

changegroup: avoid creating empty changegroup part
ClosedPublic

Authored by durham on Sep 12 2017, 12:13 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG709b44f38ab9: changegroup: avoid creating empty changegroup part
Summary

Previously this check happened in the changegroup code itself. Since it's
refactor, this logic needs to move out to callers that care about it, such as
this one. Otherwise we get empty bundle devel-warnings in certain extensions.

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

durham created this revision.Sep 12 2017, 12:13 PM
Closed by commit rHG709b44f38ab9: changegroup: avoid creating empty changegroup part (authored by durham). · Explain WhySep 12 2017, 7:42 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/exchange.py (5 lines)

Diff 1774

mercurial/exchange.py

cgversions = b2caps.get('changegroup') cgversions = b2caps.get('changegroup')
if cgversions: # 3.1 and 3.2 ship with an empty value if cgversions: # 3.1 and 3.2 ship with an empty value
cgversions = [v for v in cgversions cgversions = [v for v in cgversions
if v in changegroup.supportedoutgoingversions(repo)] if v in changegroup.supportedoutgoingversions(repo)]
if not cgversions: if not cgversions:
raise ValueError(_('no common changegroup version')) raise ValueError(_('no common changegroup version'))
version = max(cgversions) version = max(cgversions)
outgoing = _computeoutgoing(repo, heads, common) outgoing = _computeoutgoing(repo, heads, common)
if outgoing.missing:
cgstream = changegroup.makestream(repo, outgoing, version, source, cgstream = changegroup.makestream(repo, outgoing, version, source,
bundlecaps=bundlecaps) bundlecaps=bundlecaps)
if cgstream: if cgstream:
part = bundler.newpart('changegroup', data=cgstream) part = bundler.newpart('changegroup', data=cgstream)
if cgversions: if cgversions:
part.addparam('version', version) part.addparam('version', version)
part.addparam('nbchanges', str(len(outgoing.missing)), mandatory=False) part.addparam('nbchanges', str(len(outgoing.missing)), mandatory=False)
if 'treemanifest' in repo.requirements: if 'treemanifest' in repo.requirements:
part.addparam('treemanifest', '1') part.addparam('treemanifest', '1')