Show More
@@ -686,6 +686,12 b' class basicstore:' | |||
|
686 | 686 | ) |
|
687 | 687 | |
|
688 | 688 | def top_entries(self, phase=False) -> Generator[BaseStoreEntry, None, None]: |
|
689 | if phase and self.vfs.exists(b'phaseroots'): | |
|
690 | yield SimpleStoreEntry( | |
|
691 | entry_path=b'phaseroots', | |
|
692 | is_volatile=True, | |
|
693 | ) | |
|
694 | ||
|
689 | 695 | files = reversed(self._walk(b'', False)) |
|
690 | 696 | |
|
691 | 697 | changelogs = collections.defaultdict(dict) |
@@ -725,11 +731,6 b' class basicstore:' | |||
|
725 | 731 | target_id=b'', |
|
726 | 732 | details=file_details, |
|
727 | 733 | ) |
|
728 | if phase and self.vfs.exists(b'phaseroots'): | |
|
729 | yield SimpleStoreEntry( | |
|
730 | entry_path=b'phaseroots', | |
|
731 | is_volatile=True, | |
|
732 | ) | |
|
733 | 734 | |
|
734 | 735 | def walk( |
|
735 | 736 | self, matcher=None, phase=False |
@@ -82,9 +82,9 b' Test that we can apply the bundle as a s' | |||
|
82 | 82 | adding [s] data/C.i (66 bytes) |
|
83 | 83 | adding [s] data/D.i (66 bytes) |
|
84 | 84 | adding [s] data/E.i (66 bytes) |
|
85 | adding [s] phaseroots (43 bytes) | |
|
85 | 86 | adding [s] 00manifest.i (584 bytes) |
|
86 | 87 | adding [s] 00changelog.i (595 bytes) |
|
87 | adding [s] phaseroots (43 bytes) | |
|
88 | 88 | adding [c] branch2-served (94 bytes) |
|
89 | 89 | adding [c] rbc-names-v1 (7 bytes) |
|
90 | 90 | adding [c] rbc-revs-v1 (40 bytes) |
@@ -139,9 +139,9 b' Test that we can apply the bundle as a s' | |||
|
139 | 139 | adding [s] data/C.i (66 bytes) |
|
140 | 140 | adding [s] data/D.i (66 bytes) |
|
141 | 141 | adding [s] data/E.i (66 bytes) |
|
142 | adding [s] phaseroots (43 bytes) | |
|
142 | 143 | adding [s] 00manifest.i (584 bytes) |
|
143 | 144 | adding [s] 00changelog.i (595 bytes) |
|
144 | adding [s] phaseroots (43 bytes) | |
|
145 | 145 | adding [c] branch2-served (94 bytes) |
|
146 | 146 | adding [c] rbc-names-v1 (7 bytes) |
|
147 | 147 | adding [c] rbc-revs-v1 (40 bytes) |
General Comments 0
You need to be logged in to leave comments.
Login now