##// END OF EJS Templates
bundle2: use compressstream compression engine API...
Gregory Szorc -
r30357:5925bda4 default
parent child Browse files
Show More
@@ -571,13 +571,8 b' class bundle20(object):'
571 yield _pack(_fstreamparamsize, len(param))
571 yield _pack(_fstreamparamsize, len(param))
572 if param:
572 if param:
573 yield param
573 yield param
574 # starting compression
574 for chunk in self._compengine.compressstream(self._getcorechunk()):
575 compressor = self._compengine.compressorobj()
575 yield chunk
576 for chunk in self._getcorechunk():
577 data = compressor.compress(chunk)
578 if data:
579 yield data
580 yield compressor.flush()
581
576
582 def _paramchunk(self):
577 def _paramchunk(self):
583 """return a encoded version of all stream parameters"""
578 """return a encoded version of all stream parameters"""
@@ -1323,15 +1318,10 b' def writebundle(ui, cg, filename, bundle'
1323 raise error.Abort(_('unknown stream compression type: %s')
1318 raise error.Abort(_('unknown stream compression type: %s')
1324 % comp)
1319 % comp)
1325 compengine = util.compengines.forbundletype(comp)
1320 compengine = util.compengines.forbundletype(comp)
1326 compressor = compengine.compressorobj()
1327 subchunkiter = cg.getchunks()
1328 def chunkiter():
1321 def chunkiter():
1329 yield header
1322 yield header
1330 for chunk in subchunkiter:
1323 for chunk in compengine.compressstream(cg.getchunks()):
1331 data = compressor.compress(chunk)
1324 yield chunk
1332 if data:
1333 yield data
1334 yield compressor.flush()
1335 chunkiter = chunkiter()
1325 chunkiter = chunkiter()
1336
1326
1337 # parse the changegroup data, otherwise we will block
1327 # parse the changegroup data, otherwise we will block
General Comments 0
You need to be logged in to leave comments. Login now