equal
deleted
inserted
replaced
485 |
485 |
486 # populate keepkeys with keys from the current manifest |
486 # populate keepkeys with keys from the current manifest |
487 if type(m) is dict: |
487 if type(m) is dict: |
488 # m is a result of diff of two manifests and is a dictionary that |
488 # m is a result of diff of two manifests and is a dictionary that |
489 # maps filename to ((newnode, newflag), (oldnode, oldflag)) tuple |
489 # maps filename to ((newnode, newflag), (oldnode, oldflag)) tuple |
490 for filename, diff in pycompat.iteritems(m): |
490 for filename, diff in m.items(): |
491 if diff[0][0] is not None: |
491 if diff[0][0] is not None: |
492 keepkeys.add(keyfn(filename, diff[0][0])) |
492 keepkeys.add(keyfn(filename, diff[0][0])) |
493 else: |
493 else: |
494 # m is a manifest object |
494 # m is a manifest object |
495 for filename, filenode in pycompat.iteritems(m): |
495 for filename, filenode in m.items(): |
496 keepkeys.add(keyfn(filename, filenode)) |
496 keepkeys.add(keyfn(filename, filenode)) |
497 |
497 |
498 return keepkeys |
498 return keepkeys |
499 |
499 |
500 |
500 |
600 |
600 |
601 count = 0 |
601 count = 0 |
602 repackprogress = ui.makeprogress( |
602 repackprogress = ui.makeprogress( |
603 _(b"repacking data"), unit=self.unit, total=len(byfile) |
603 _(b"repacking data"), unit=self.unit, total=len(byfile) |
604 ) |
604 ) |
605 for filename, entries in sorted(pycompat.iteritems(byfile)): |
605 for filename, entries in sorted(byfile.items()): |
606 repackprogress.update(count) |
606 repackprogress.update(count) |
607 |
607 |
608 ancestors = {} |
608 ancestors = {} |
609 nodes = list(node for node in entries) |
609 nodes = list(node for node in entries) |
610 nohistory = [] |
610 nohistory = [] |
754 byfile.setdefault(entry.filename, {})[entry.node] = entry |
754 byfile.setdefault(entry.filename, {})[entry.node] = entry |
755 |
755 |
756 progress = ui.makeprogress( |
756 progress = ui.makeprogress( |
757 _(b"repacking history"), unit=self.unit, total=len(byfile) |
757 _(b"repacking history"), unit=self.unit, total=len(byfile) |
758 ) |
758 ) |
759 for filename, entries in sorted(pycompat.iteritems(byfile)): |
759 for filename, entries in sorted(byfile.items()): |
760 ancestors = {} |
760 ancestors = {} |
761 nodes = list(node for node in entries) |
761 nodes = list(node for node in entries) |
762 |
762 |
763 for node in nodes: |
763 for node in nodes: |
764 if node in ancestors: |
764 if node in ancestors: |