This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5155

bundle2: fix broken compression engine assertion
ClosedPublic

Authored by martinvonz on Oct 18 2018, 4:52 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG81c80ed7c991: bundle2: fix broken compression engine assertion
Summary

bundletype() is a function, so it needs to be called, and it is
documented to return a 2-tuple. This code is untested, so that's why
we haven't noticed the bad assertion.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Oct 18 2018, 4:52 PM
Closed by commit rHG81c80ed7c991: bundle2: fix broken compression engine assertion (authored by martinvonz). · Explain WhyOct 19 2018, 9:29 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/bundle2.py (2 lines)

Diff 12253

mercurial/bundle2.py

if paramssize < 0: if paramssize < 0:
raise error.BundleValueError('negative bundle param size: %i' raise error.BundleValueError('negative bundle param size: %i'
% paramssize) % paramssize)
yield _pack(_fstreamparamsize, paramssize) yield _pack(_fstreamparamsize, paramssize)
if paramssize: if paramssize:
params = self._readexact(paramssize) params = self._readexact(paramssize)
self._processallparams(params) self._processallparams(params)
yield params yield params
assert self._compengine.bundletype == 'UN' assert self._compengine.bundletype()[1] == 'UN'
# From there, payload might need to be decompressed # From there, payload might need to be decompressed
self._fp = self._compengine.decompressorreader(self._fp) self._fp = self._compengine.decompressorreader(self._fp)
emptycount = 0 emptycount = 0
while emptycount < 2: while emptycount < 2:
# so we can brainlessly loop # so we can brainlessly loop
assert _fpartheadersize == _fpayloadsize assert _fpartheadersize == _fpayloadsize
size = self._unpack(_fpartheadersize)[0] size = self._unpack(_fpartheadersize)[0]
yield _pack(_fpartheadersize, size) yield _pack(_fpartheadersize, size)