Show More
@@ -1532,7 +1532,7 b' class localrepository(repo.repository):' | |||||
1532 |
|
1532 | |||
1533 | collect = changegroup.collector(cl, mfs, changedfiles) |
|
1533 | collect = changegroup.collector(cl, mfs, changedfiles) | |
1534 | count = [0] |
|
1534 | count = [0] | |
1535 | def clookup(x): |
|
1535 | def clookup(revlog, x): | |
1536 | collect(x) |
|
1536 | collect(x) | |
1537 | count[0] += 1 |
|
1537 | count[0] += 1 | |
1538 | self.ui.progress(_('bundling'), count[0], unit=_('changesets')) |
|
1538 | self.ui.progress(_('bundling'), count[0], unit=_('changesets')) | |
@@ -1551,7 +1551,7 b' class localrepository(repo.repository):' | |||||
1551 | # and data collection functions back. |
|
1551 | # and data collection functions back. | |
1552 | fcollect = filenode_collector(changedfiles) |
|
1552 | fcollect = filenode_collector(changedfiles) | |
1553 | count = [0] |
|
1553 | count = [0] | |
1554 | def mlookup(x): |
|
1554 | def mlookup(revlog, x): | |
1555 | fcollect(x) |
|
1555 | fcollect(x) | |
1556 | count[0] += 1 |
|
1556 | count[0] += 1 | |
1557 | self.ui.progress(_('bundling'), count[0], |
|
1557 | self.ui.progress(_('bundling'), count[0], | |
@@ -1581,7 +1581,7 b' class localrepository(repo.repository):' | |||||
1581 | # Create a group generator and only pass in a changenode |
|
1581 | # Create a group generator and only pass in a changenode | |
1582 | # lookup function as we need to collect no information |
|
1582 | # lookup function as we need to collect no information | |
1583 | # from filenodes. |
|
1583 | # from filenodes. | |
1584 | def flookup(x): |
|
1584 | def flookup(revlog, x): | |
1585 | # even though we print the same progress on |
|
1585 | # even though we print the same progress on | |
1586 | # most loop iterations, put the progress call |
|
1586 | # most loop iterations, put the progress call | |
1587 | # here so that time estimates (if any) can be updated |
|
1587 | # here so that time estimates (if any) can be updated | |
@@ -1639,7 +1639,7 b' class localrepository(repo.repository):' | |||||
1639 |
|
1639 | |||
1640 | collect = changegroup.collector(cl, mmfs, changedfiles) |
|
1640 | collect = changegroup.collector(cl, mmfs, changedfiles) | |
1641 | count = [0] |
|
1641 | count = [0] | |
1642 | def clookup(x): |
|
1642 | def clookup(revlog, x): | |
1643 | count[0] += 1 |
|
1643 | count[0] += 1 | |
1644 | self.ui.progress(_('bundling'), count[0], unit=_('changesets')) |
|
1644 | self.ui.progress(_('bundling'), count[0], unit=_('changesets')) | |
1645 | collect(x) |
|
1645 | collect(x) | |
@@ -1655,7 +1655,7 b' class localrepository(repo.repository):' | |||||
1655 | nodeiter = gennodelst(mnfst) |
|
1655 | nodeiter = gennodelst(mnfst) | |
1656 | mfunc = lookuplinkrev_func(mnfst) |
|
1656 | mfunc = lookuplinkrev_func(mnfst) | |
1657 | count = [0] |
|
1657 | count = [0] | |
1658 | def mlookup(x): |
|
1658 | def mlookup(revlog, x): | |
1659 | count[0] += 1 |
|
1659 | count[0] += 1 | |
1660 | self.ui.progress(_('bundling'), count[0], |
|
1660 | self.ui.progress(_('bundling'), count[0], | |
1661 | unit=_('manifests'), total=changecount) |
|
1661 | unit=_('manifests'), total=changecount) | |
@@ -1675,7 +1675,7 b' class localrepository(repo.repository):' | |||||
1675 | yield changegroup.chunkheader(len(fname)) |
|
1675 | yield changegroup.chunkheader(len(fname)) | |
1676 | yield fname |
|
1676 | yield fname | |
1677 | ffunc = lookuplinkrev_func(filerevlog) |
|
1677 | ffunc = lookuplinkrev_func(filerevlog) | |
1678 | def flookup(x): |
|
1678 | def flookup(revlog, x): | |
1679 | self.ui.progress( |
|
1679 | self.ui.progress( | |
1680 | _('bundling'), idx, item=fname, |
|
1680 | _('bundling'), idx, item=fname, | |
1681 | total=efiles, unit=_('files')) |
|
1681 | total=efiles, unit=_('files')) |
@@ -1087,7 +1087,7 b' class revlog(object):' | |||||
1087 | nb = self.node(b) |
|
1087 | nb = self.node(b) | |
1088 |
|
1088 | |||
1089 | p = self.parents(nb) |
|
1089 | p = self.parents(nb) | |
1090 | meta = nb + p[0] + p[1] + lookup(nb) |
|
1090 | meta = nb + p[0] + p[1] + lookup(self, nb) | |
1091 | if a == nullrev: |
|
1091 | if a == nullrev: | |
1092 | d = self.revision(nb) |
|
1092 | d = self.revision(nb) | |
1093 | meta += mdiff.trivialdiffheader(len(d)) |
|
1093 | meta += mdiff.trivialdiffheader(len(d)) |
General Comments 0
You need to be logged in to leave comments.
Login now