Show More
@@ -289,11 +289,11 b' def parse_index2(data, inline, revlogv2=' | |||||
289 | if not inline: |
|
289 | if not inline: | |
290 | cls = IndexObject2 if revlogv2 else IndexObject |
|
290 | cls = IndexObject2 if revlogv2 else IndexObject | |
291 | return cls(data), None |
|
291 | return cls(data), None | |
292 |
cls = |
|
292 | cls = InlinedIndexObject | |
293 | return cls(data, inline), (0, data) |
|
293 | return cls(data, inline), (0, data) | |
294 |
|
294 | |||
295 |
|
295 | |||
296 |
class Index2 |
|
296 | class IndexObject2(IndexObject): | |
297 | index_format = revlog_constants.INDEX_ENTRY_V2 |
|
297 | index_format = revlog_constants.INDEX_ENTRY_V2 | |
298 |
|
298 | |||
299 | def replace_sidedata_info( |
|
299 | def replace_sidedata_info( | |
@@ -353,36 +353,6 b' class Index2Mixin(object):' | |||||
353 | raise error.ProgrammingError(msg) |
|
353 | raise error.ProgrammingError(msg) | |
354 |
|
354 | |||
355 |
|
355 | |||
356 | class IndexObject2(Index2Mixin, IndexObject): |
|
|||
357 | pass |
|
|||
358 |
|
||||
359 |
|
||||
360 | class InlinedIndexObject2(Index2Mixin, InlinedIndexObject): |
|
|||
361 | def _inline_scan(self, lgt): |
|
|||
362 | sidedata_length_pos = 72 |
|
|||
363 | off = 0 |
|
|||
364 | if lgt is not None: |
|
|||
365 | self._offsets = [0] * lgt |
|
|||
366 | count = 0 |
|
|||
367 | while off <= len(self._data) - self.entry_size: |
|
|||
368 | start = off + self.big_int_size |
|
|||
369 | (data_size,) = struct.unpack( |
|
|||
370 | b'>i', |
|
|||
371 | self._data[start : start + self.int_size], |
|
|||
372 | ) |
|
|||
373 | start = off + sidedata_length_pos |
|
|||
374 | (side_data_size,) = struct.unpack( |
|
|||
375 | b'>i', self._data[start : start + self.int_size] |
|
|||
376 | ) |
|
|||
377 | if lgt is not None: |
|
|||
378 | self._offsets[count] = off |
|
|||
379 | count += 1 |
|
|||
380 | off += self.entry_size + data_size + side_data_size |
|
|||
381 | if off != len(self._data): |
|
|||
382 | raise ValueError(b"corrupted data") |
|
|||
383 | return count |
|
|||
384 |
|
||||
385 |
|
||||
386 | def parse_index_devel_nodemap(data, inline): |
|
356 | def parse_index_devel_nodemap(data, inline): | |
387 | """like parse_index2, but alway return a PersistentNodeMapIndexObject""" |
|
357 | """like parse_index2, but alway return a PersistentNodeMapIndexObject""" | |
388 | return PersistentNodeMapIndexObject(data), None |
|
358 | return PersistentNodeMapIndexObject(data), None |
General Comments 0
You need to be logged in to leave comments.
Login now