1401 collect = changegroup.collector(cl, msng_mnfst_set, changedfiles) |
1401 collect = changegroup.collector(cl, msng_mnfst_set, changedfiles) |
1402 |
1402 |
1403 # Create a changenode group generator that will call our functions |
1403 # Create a changenode group generator that will call our functions |
1404 # back to lookup the owning changenode and collect information. |
1404 # back to lookup the owning changenode and collect information. |
1405 group = cl.group(msng_cl_lst, identity, collect) |
1405 group = cl.group(msng_cl_lst, identity, collect) |
1406 cnt = 0 |
1406 for cnt, chnk in enumerate(group): |
1407 for chnk in group: |
|
1408 yield chnk |
1407 yield chnk |
1409 self.ui.progress(_('bundling changes'), cnt, unit=_('chunks')) |
1408 self.ui.progress(_('bundling changes'), cnt, unit=_('chunks')) |
1410 cnt += 1 |
|
1411 self.ui.progress(_('bundling changes'), None) |
1409 self.ui.progress(_('bundling changes'), None) |
1412 |
1410 |
1413 prune(mnfst, msng_mnfst_set) |
1411 prune(mnfst, msng_mnfst_set) |
1414 add_extra_nodes(1, msng_mnfst_set) |
1412 add_extra_nodes(1, msng_mnfst_set) |
1415 msng_mnfst_lst = msng_mnfst_set.keys() |
1413 msng_mnfst_lst = msng_mnfst_set.keys() |
1418 # Create a generator for the manifestnodes that calls our lookup |
1416 # Create a generator for the manifestnodes that calls our lookup |
1419 # and data collection functions back. |
1417 # and data collection functions back. |
1420 group = mnfst.group(msng_mnfst_lst, |
1418 group = mnfst.group(msng_mnfst_lst, |
1421 lambda mnode: msng_mnfst_set[mnode], |
1419 lambda mnode: msng_mnfst_set[mnode], |
1422 filenode_collector(changedfiles)) |
1420 filenode_collector(changedfiles)) |
1423 cnt = 0 |
1421 for cnt, chnk in enumerate(group): |
1424 for chnk in group: |
|
1425 yield chnk |
1422 yield chnk |
1426 self.ui.progress(_('bundling manifests'), cnt, unit=_('chunks')) |
1423 self.ui.progress(_('bundling manifests'), cnt, unit=_('chunks')) |
1427 cnt += 1 |
|
1428 self.ui.progress(_('bundling manifests'), None) |
1424 self.ui.progress(_('bundling manifests'), None) |
1429 |
1425 |
1430 # These are no longer needed, dereference and toss the memory for |
1426 # These are no longer needed, dereference and toss the memory for |
1431 # them. |
1427 # them. |
1432 msng_mnfst_lst = None |
1428 msng_mnfst_lst = None |
1514 # construct a list of all changed files |
1510 # construct a list of all changed files |
1515 changedfiles = set() |
1511 changedfiles = set() |
1516 mmfs = {} |
1512 mmfs = {} |
1517 collect = changegroup.collector(cl, mmfs, changedfiles) |
1513 collect = changegroup.collector(cl, mmfs, changedfiles) |
1518 |
1514 |
1519 cnt = 0 |
1515 for cnt, chnk in enumerate(cl.group(nodes, identity, collect)): |
1520 for chnk in cl.group(nodes, identity, collect): |
|
1521 self.ui.progress(_('bundling changes'), cnt, unit=_('chunks')) |
1516 self.ui.progress(_('bundling changes'), cnt, unit=_('chunks')) |
1522 cnt += 1 |
|
1523 yield chnk |
1517 yield chnk |
1524 self.ui.progress(_('bundling changes'), None) |
1518 self.ui.progress(_('bundling changes'), None) |
1525 |
1519 |
1526 mnfst = self.manifest |
1520 mnfst = self.manifest |
1527 nodeiter = gennodelst(mnfst) |
1521 nodeiter = gennodelst(mnfst) |
1528 cnt = 0 |
1522 for cnt, chnk in enumerate(mnfst.group(nodeiter, |
1529 for chnk in mnfst.group(nodeiter, lookuplinkrev_func(mnfst)): |
1523 lookuplinkrev_func(mnfst))): |
1530 self.ui.progress(_('bundling manifests'), cnt, unit=_('chunks')) |
1524 self.ui.progress(_('bundling manifests'), cnt, unit=_('chunks')) |
1531 cnt += 1 |
|
1532 yield chnk |
1525 yield chnk |
1533 self.ui.progress(_('bundling manifests'), None) |
1526 self.ui.progress(_('bundling manifests'), None) |
1534 |
1527 |
1535 cnt = 0 |
1528 cnt = 0 |
1536 for fname in sorted(changedfiles): |
1529 for fname in sorted(changedfiles): |