Show More
@@ -49,15 +49,6 b' bundletypes = {' | |||||
49 | "HG10GZ": ("HG10GZ", lambda: zlib.compressobj()), |
|
49 | "HG10GZ": ("HG10GZ", lambda: zlib.compressobj()), | |
50 | } |
|
50 | } | |
51 |
|
51 | |||
52 | def collector(cl, mmfs, files): |
|
|||
53 | # Gather information about changeset nodes going out in a bundle. |
|
|||
54 | # We want to gather manifests needed and filelogs affected. |
|
|||
55 | def collect(node): |
|
|||
56 | c = cl.read(node) |
|
|||
57 | files.update(c[3]) |
|
|||
58 | mmfs.setdefault(c[0], node) |
|
|||
59 | return collect |
|
|||
60 |
|
||||
61 | # hgweb uses this list to communicate its preferred type |
|
52 | # hgweb uses this list to communicate its preferred type | |
62 | bundlepriority = ['HG10GZ', 'HG10BZ', 'HG10UN'] |
|
53 | bundlepriority = ['HG10GZ', 'HG10BZ', 'HG10UN'] | |
63 |
|
54 |
@@ -1530,10 +1530,11 b' class localrepository(repo.repository):' | |||||
1530 | # The set of changed files starts empty. |
|
1530 | # The set of changed files starts empty. | |
1531 | changedfiles = set() |
|
1531 | changedfiles = set() | |
1532 |
|
1532 | |||
1533 | collect = changegroup.collector(cl, mfs, changedfiles) |
|
|||
1534 | count = [0] |
|
1533 | count = [0] | |
1535 | def clookup(revlog, x): |
|
1534 | def clookup(revlog, x): | |
1536 |
c |
|
1535 | c = cl.read(x) | |
|
1536 | changedfiles.update(c[3]) | |||
|
1537 | mfs.setdefault(c[0], x) | |||
1537 | count[0] += 1 |
|
1538 | count[0] += 1 | |
1538 | self.ui.progress(_('bundling'), count[0], unit=_('changesets')) |
|
1539 | self.ui.progress(_('bundling'), count[0], unit=_('changesets')) | |
1539 | return x |
|
1540 | return x | |
@@ -1637,12 +1638,13 b' class localrepository(repo.repository):' | |||||
1637 | changedfiles = set() |
|
1638 | changedfiles = set() | |
1638 | mmfs = {} |
|
1639 | mmfs = {} | |
1639 |
|
1640 | |||
1640 | collect = changegroup.collector(cl, mmfs, changedfiles) |
|
|||
1641 | count = [0] |
|
1641 | count = [0] | |
1642 | def clookup(revlog, x): |
|
1642 | def clookup(revlog, x): | |
|
1643 | c = cl.read(x) | |||
|
1644 | changedfiles.update(c[3]) | |||
|
1645 | mmfs.setdefault(c[0], x) | |||
1643 | count[0] += 1 |
|
1646 | count[0] += 1 | |
1644 | self.ui.progress(_('bundling'), count[0], unit=_('changesets')) |
|
1647 | self.ui.progress(_('bundling'), count[0], unit=_('changesets')) | |
1645 | collect(x) |
|
|||
1646 | return x |
|
1648 | return x | |
1647 |
|
1649 | |||
1648 | for chunk in cl.group(nodes, clookup): |
|
1650 | for chunk in cl.group(nodes, clookup): |
General Comments 0
You need to be logged in to leave comments.
Login now