equal
deleted
inserted
replaced
488 self, |
488 self, |
489 repo=None, |
489 repo=None, |
490 vfs=None, |
490 vfs=None, |
491 copies=None, |
491 copies=None, |
492 max_changeset=None, |
492 max_changeset=None, |
|
493 preserve_file_count=False, |
493 ): |
494 ): |
494 """return a list of data stream associated to files for this entry |
495 """return a list of data stream associated to files for this entry |
495 |
496 |
496 return [(unencoded_file_path, content_iterator, content_size), …] |
497 return [(unencoded_file_path, content_iterator, content_size), …] |
497 """ |
498 """ |
597 self, |
598 self, |
598 repo=None, |
599 repo=None, |
599 vfs=None, |
600 vfs=None, |
600 copies=None, |
601 copies=None, |
601 max_changeset=None, |
602 max_changeset=None, |
|
603 preserve_file_count=False, |
602 ): |
604 ): |
603 if ( |
605 if ( |
604 repo is None |
606 repo is None |
605 or max_changeset is None |
607 or max_changeset is None |
606 # This use revlog-v2, ignore for now |
608 # This use revlog-v2, ignore for now |
611 return super().get_streams( |
613 return super().get_streams( |
612 repo=repo, |
614 repo=repo, |
613 vfs=vfs, |
615 vfs=vfs, |
614 copies=copies, |
616 copies=copies, |
615 max_changeset=max_changeset, |
617 max_changeset=max_changeset, |
|
618 preserve_file_count=preserve_file_count, |
616 ) |
619 ) |
|
620 elif not preserve_file_count: |
|
621 stream = [ |
|
622 f.get_stream(vfs, copies) |
|
623 for f in self.files() |
|
624 if not f.unencoded_path.endswith((b'.i', b'.d')) |
|
625 ] |
|
626 rl = self.get_revlog_instance(repo).get_revlog() |
|
627 rl_stream = rl.get_streams(max_changeset) |
|
628 stream.extend(rl_stream) |
|
629 return stream |
617 |
630 |
618 name_to_size = {} |
631 name_to_size = {} |
619 for f in self.files(): |
632 for f in self.files(): |
620 name_to_size[f.unencoded_path] = f.file_size(None) |
633 name_to_size[f.unencoded_path] = f.file_size(None) |
621 |
634 |