This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1924

exchange: make stream bundle part deterministic
ClosedPublic

Authored by indygreg on Jan 20 2018, 7:44 PM.

Details

Reviewers
lothiraldan
durin42
Group Reviewers
hg-reviewers
Commits
rHG08cc94dd3d3c: exchange: make stream bundle part deterministic
Summary

repo.requirements is a set. We need to sort it so the part
content is deterministic.

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

indygreg created this revision.Jan 20 2018, 7:44 PM
lothiraldan accepted this revision.Jan 22 2018, 10:44 AM
durin42 accepted this revision.Jan 22 2018, 3:01 PM
This revision is now accepted and ready to land.Jan 22 2018, 3:01 PM
Closed by commit rHG08cc94dd3d3c: exchange: make stream bundle part deterministic (authored by indygreg). · Explain WhyJan 22 2018, 3:07 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/exchange.py (2 lines)

Diff 4982

mercurial/exchange.py

return bundler.getchunks() return bundler.getchunks()
@getbundle2partsgenerator('stream') @getbundle2partsgenerator('stream')
def _getbundlestream(bundler, repo, source, bundlecaps=None, def _getbundlestream(bundler, repo, source, bundlecaps=None,
b2caps=None, heads=None, common=None, **kwargs): b2caps=None, heads=None, common=None, **kwargs):
if not kwargs.get('stream', False): if not kwargs.get('stream', False):
return return
filecount, bytecount, it = streamclone.generatev2(repo) filecount, bytecount, it = streamclone.generatev2(repo)
requirements = ' '.join(repo.requirements) requirements = ' '.join(sorted(repo.requirements))
part = bundler.newpart('stream', data=it) part = bundler.newpart('stream', data=it)
part.addparam('bytecount', '%d' % bytecount, mandatory=True) part.addparam('bytecount', '%d' % bytecount, mandatory=True)
part.addparam('filecount', '%d' % filecount, mandatory=True) part.addparam('filecount', '%d' % filecount, mandatory=True)
part.addparam('requirements', requirements, mandatory=True) part.addparam('requirements', requirements, mandatory=True)
part.addparam('version', 'v2', mandatory=True) part.addparam('version', 'v2', mandatory=True)
@getbundle2partsgenerator('changegroup') @getbundle2partsgenerator('changegroup')
def _getbundlechangegrouppart(bundler, repo, source, bundlecaps=None, def _getbundlechangegrouppart(bundler, repo, source, bundlecaps=None,