Show More
@@ -304,7 +304,7 b' class cg1packer(object):' | |||
|
304 | 304 | def fileheader(self, fname): |
|
305 | 305 | return chunkheader(len(fname)) + fname |
|
306 | 306 | |
|
307 |
def group(self, nodelist, revlog, lookup, units=None |
|
|
307 | def group(self, nodelist, revlog, lookup, units=None): | |
|
308 | 308 | """Calculate a delta group, yielding a sequence of changegroup chunks |
|
309 | 309 | (strings). |
|
310 | 310 | |
@@ -325,7 +325,7 b' class cg1packer(object):' | |||
|
325 | 325 | |
|
326 | 326 | # for generaldelta revlogs, we linearize the revs; this will both be |
|
327 | 327 | # much quicker and generate a much smaller bundle |
|
328 | if (revlog._generaldelta and reorder is None) or reorder: | |
|
328 | if (revlog._generaldelta and self._reorder is None) or self._reorder: | |
|
329 | 329 | dag = dagutil.revlogdag(revlog) |
|
330 | 330 | revs = set(revlog.rev(n) for n in nodelist) |
|
331 | 331 | revs = dag.linearize(revs) |
@@ -381,8 +381,7 b' class cg1packer(object):' | |||
|
381 | 381 | |
|
382 | 382 | self._verbosenote(_('uncompressed size of bundle content:\n')) |
|
383 | 383 | size = 0 |
|
384 |
for chunk in self.group(clnodes, cl, lookupcl, units=_('changesets') |
|
|
385 | reorder=reorder): | |
|
384 | for chunk in self.group(clnodes, cl, lookupcl, units=_('changesets')): | |
|
386 | 385 | size += len(chunk) |
|
387 | 386 | yield chunk |
|
388 | 387 | self._verbosenote(_('%8.i (changelog)\n') % size) |
@@ -406,8 +405,7 b' class cg1packer(object):' | |||
|
406 | 405 | |
|
407 | 406 | mfnodes = self.prune(ml, mfs, commonrevs) |
|
408 | 407 | size = 0 |
|
409 |
for chunk in self.group(mfnodes, ml, lookupmf, units=_('manifests') |
|
|
410 | reorder=reorder): | |
|
408 | for chunk in self.group(mfnodes, ml, lookupmf, units=_('manifests')): | |
|
411 | 409 | size += len(chunk) |
|
412 | 410 | yield chunk |
|
413 | 411 | self._verbosenote(_('%8.i (manifests)\n') % size) |
@@ -439,7 +437,6 b' class cg1packer(object):' | |||
|
439 | 437 | def generatefiles(self, changedfiles, linknodes, commonrevs, source): |
|
440 | 438 | repo = self._repo |
|
441 | 439 | progress = self._progress |
|
442 | reorder = self._reorder | |
|
443 | 440 | msgbundling = _('bundling') |
|
444 | 441 | |
|
445 | 442 | total = len(changedfiles) |
@@ -463,8 +460,7 b' class cg1packer(object):' | |||
|
463 | 460 | h = self.fileheader(fname) |
|
464 | 461 | size = len(h) |
|
465 | 462 | yield h |
|
466 |
for chunk in self.group(filenodes, filerevlog, lookupfilelog |
|
|
467 | reorder=reorder): | |
|
463 | for chunk in self.group(filenodes, filerevlog, lookupfilelog): | |
|
468 | 464 | size += len(chunk) |
|
469 | 465 | yield chunk |
|
470 | 466 | self._verbosenote(_('%8.i %s\n') % (size, fname)) |
General Comments 0
You need to be logged in to leave comments.
Login now