This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4010

exchange: refactor control flow of _getbundlechangegrouppart()
ClosedPublic

Authored by indygreg on Aug 1 2018, 1:03 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGafb442f58cbf: exchange: refactor control flow of _getbundlechangegrouppart()
rHGcc5be5f6ebcb: exchange: refactor control flow of _getbundlechangegrouppart()
rHG188d12d890f0: exchange: refactor control flow of _getbundlechangegrouppart()
Summary

The use of early return makes the control flow of this function much
easier to reason about IMO.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

indygreg created this revision.Aug 1 2018, 1:03 PM
durin42 accepted this revision.Aug 1 2018, 4:50 PM
This revision is now accepted and ready to land.Aug 1 2018, 4:50 PM
Closed by commit rHG188d12d890f0: exchange: refactor control flow of _getbundlechangegrouppart() (authored by indygreg). · Explain WhyAug 1 2018, 5:25 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/exchange.py (50 lines)

Diff 9702

mercurial/exchange.py

@getbundle2partsgenerator('stream2') @getbundle2partsgenerator('stream2')
def _getbundlestream2(bundler, repo, *args, **kwargs): def _getbundlestream2(bundler, repo, *args, **kwargs):
return bundle2.addpartbundlestream2(bundler, repo, **kwargs) return bundle2.addpartbundlestream2(bundler, repo, **kwargs)
@getbundle2partsgenerator('changegroup') @getbundle2partsgenerator('changegroup')
def _getbundlechangegrouppart(bundler, repo, source, bundlecaps=None, def _getbundlechangegrouppart(bundler, repo, source, bundlecaps=None,
b2caps=None, heads=None, common=None, **kwargs): b2caps=None, heads=None, common=None, **kwargs):
"""add a changegroup part to the requested bundle""" """add a changegroup part to the requested bundle"""
cgstream = None if not kwargs.get(r'cg', True):
if kwargs.get(r'cg', True): return
# build changegroup bundle here.
version = '01' version = '01'
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: if not outgoing.missing:
return
cgstream = changegroup.makestream(repo, outgoing, version, source, cgstream = changegroup.makestream(repo, outgoing, version, source,
bundlecaps=bundlecaps) bundlecaps=bundlecaps)
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', '%d' % len(outgoing.missing), part.addparam('nbchanges', '%d' % len(outgoing.missing),
mandatory=False) mandatory=False)
if 'treemanifest' in repo.requirements: if 'treemanifest' in repo.requirements:
part.addparam('treemanifest', '1') part.addparam('treemanifest', '1')
@getbundle2partsgenerator('bookmarks') @getbundle2partsgenerator('bookmarks')
def _getbundlebookmarkpart(bundler, repo, source, bundlecaps=None, def _getbundlebookmarkpart(bundler, repo, source, bundlecaps=None,
b2caps=None, **kwargs): b2caps=None, **kwargs):
"""add a bookmark part to the requested bundle""" """add a bookmark part to the requested bundle"""
if not kwargs.get(r'bookmarks', False): if not kwargs.get(r'bookmarks', False):
return return
if 'bookmarks' not in b2caps: if 'bookmarks' not in b2caps: