This is an archive of the discontinued Mercurial Phabricator instance.

Differential D670

changegroup: remove external uses of getbundler
ClosedPublic

Authored by durham on Sep 10 2017, 10:07 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGdbf598196f05: changegroup: remove external uses of getbundler
Summary

Now that makestream and makechangegroup are the primary creation methods for
changegroups, let's get rid of this rogue use of getbundler and getsubsetraw.

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 10 2017, 10:07 PM
indygreg accepted this revision.Sep 11 2017, 6:12 PM
This revision is now accepted and ready to land.Sep 11 2017, 6:12 PM
Closed by commit rHGdbf598196f05: changegroup: remove external uses of getbundler (authored by durham). · Explain WhySep 11 2017, 6:27 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/exchange.py (4 lines)

Diff 1739

mercurial/exchange.py

if not usebundle2: if not usebundle2:
if bundlecaps and not kwargs.get('cg', True): if bundlecaps and not kwargs.get('cg', True):
raise ValueError(_('request for bundle10 must include changegroup')) raise ValueError(_('request for bundle10 must include changegroup'))
if kwargs: if kwargs:
raise ValueError(_('unsupported getbundle arguments: %s') raise ValueError(_('unsupported getbundle arguments: %s')
% ', '.join(sorted(kwargs.keys()))) % ', '.join(sorted(kwargs.keys())))
outgoing = _computeoutgoing(repo, heads, common) outgoing = _computeoutgoing(repo, heads, common)
bundler = changegroup.getbundler('01', repo, bundlecaps) return changegroup.makestream(repo, outgoing, '01', source,
return changegroup.getsubsetraw(repo, outgoing, bundler, source) bundlecaps=bundlecaps)
# bundle20 case # bundle20 case
b2caps = {} b2caps = {}
for bcaps in bundlecaps: for bcaps in bundlecaps:
if bcaps.startswith('bundle2='): if bcaps.startswith('bundle2='):
blob = urlreq.unquote(bcaps[len('bundle2='):]) blob = urlreq.unquote(bcaps[len('bundle2='):])
b2caps.update(bundle2.decodecaps(blob)) b2caps.update(bundle2.decodecaps(blob))
bundler = bundle2.bundle20(repo.ui, b2caps) bundler = bundle2.bundle20(repo.ui, b2caps)