comparison mercurial/localrepo.py @ 13784:f1e639c71a2b

changegroup: move sorting down into group
author Matt Mackall <mpm@selenic.com>
date Mon, 28 Mar 2011 11:18:56 -0500
parents c196352d935b
children 470ec600b525
comparison
equal deleted inserted replaced
13783:c196352d935b 13784:f1e639c71a2b
1556 count[0] += 1 1556 count[0] += 1
1557 self.ui.progress(_('bundling'), count[0], 1557 self.ui.progress(_('bundling'), count[0],
1558 unit=_('manifests'), total=changecount) 1558 unit=_('manifests'), total=changecount)
1559 return mfs[x] 1559 return mfs[x]
1560 1560
1561 for chunk in mf.group(sorted(mfs, key=mf.rev), mlookup): 1561 for chunk in mf.group(mfs, mlookup):
1562 yield chunk 1562 yield chunk
1563 self.ui.progress(_('bundling'), None) 1563 self.ui.progress(_('bundling'), None)
1564 1564
1565 mfs.clear() 1565 mfs.clear()
1566 1566
1588 self.ui.progress( 1588 self.ui.progress(
1589 _('bundling'), idx, item=fname, 1589 _('bundling'), idx, item=fname,
1590 unit=_('files'), total=efiles) 1590 unit=_('files'), total=efiles)
1591 return missingfnodes[x] 1591 return missingfnodes[x]
1592 1592
1593 for chunk in filerevlog.group( 1593 for chunk in filerevlog.group(missingfnodes, flookup):
1594 sorted(missingfnodes, key=filerevlog.rev), flookup):
1595 yield chunk 1594 yield chunk
1596 # Signal that no more groups are left. 1595 # Signal that no more groups are left.
1597 yield changegroup.closechunk() 1596 yield changegroup.closechunk()
1598 self.ui.progress(_('bundling'), None) 1597 self.ui.progress(_('bundling'), None)
1599 1598