Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/revlog.py @ 47188:58ef549ae55f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revlog: directly use self._format_flags when loading index The shorthand variable does not bring much, so we drop it to simplify the code. Differential Revision: https://phab.mercurial-scm.org/D10600
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Mon, 03 May 2021 12:26:48 +0200
parents ef7a8a1622ad
children 21ef5f75edf0
comparison
equal deleted inserted replaced
47187:ef7a8a1622ad 47188:58ef549ae55f
488 header = INDEX_HEADER.unpack(indexdata[:4])[0] 488 header = INDEX_HEADER.unpack(indexdata[:4])[0]
489 self._initempty = False 489 self._initempty = False
490 else: 490 else:
491 header = new_header 491 header = new_header
492 492
493 flags = self._format_flags = header & ~0xFFFF 493 self._format_flags = header & ~0xFFFF
494 self._format_version = header & 0xFFFF 494 self._format_version = header & 0xFFFF
495 495
496 if self._format_version == REVLOGV0: 496 if self._format_version == REVLOGV0:
497 if flags: 497 if self._format_flags:
498 msg = _(b'unknown flags (%#04x) in version %d revlog %s') 498 msg = _(b'unknown flags (%#04x) in version %d revlog %s')
499 msg %= (flags >> 16, self._format_version, self.display_id) 499 display_flag = self._format_flags >> 16
500 msg %= (display_flag, self._format_version, self.display_id)
500 raise error.RevlogError(msg) 501 raise error.RevlogError(msg)
501 502
502 self._inline = False 503 self._inline = False
503 self._generaldelta = False 504 self._generaldelta = False
504 505
505 elif self._format_version == REVLOGV1: 506 elif self._format_version == REVLOGV1:
506 if flags & ~REVLOGV1_FLAGS: 507 if self._format_flags & ~REVLOGV1_FLAGS:
507 msg = _(b'unknown flags (%#04x) in version %d revlog %s') 508 msg = _(b'unknown flags (%#04x) in version %d revlog %s')
508 msg %= (flags >> 16, self._format_version, self.display_id) 509 display_flag = self._format_flags >> 16
510 msg %= (display_flag, self._format_version, self.display_id)
509 raise error.RevlogError(msg) 511 raise error.RevlogError(msg)
510 512
511 self._inline = self._format_flags & FLAG_INLINE_DATA 513 self._inline = self._format_flags & FLAG_INLINE_DATA
512 self._generaldelta = self._format_flags & FLAG_GENERALDELTA 514 self._generaldelta = self._format_flags & FLAG_GENERALDELTA
513 515
514 elif self._format_version == REVLOGV2: 516 elif self._format_version == REVLOGV2:
515 if flags & ~REVLOGV2_FLAGS: 517 if self._format_flags & ~REVLOGV2_FLAGS:
516 msg = _(b'unknown flags (%#04x) in version %d revlog %s') 518 msg = _(b'unknown flags (%#04x) in version %d revlog %s')
517 msg %= (flags >> 16, self._format_version, self.display_id) 519 display_flag = self._format_flags >> 16
520 msg %= (display_flag, self._format_version, self.display_id)
518 raise error.RevlogError(msg) 521 raise error.RevlogError(msg)
519 522
520 # There is a bug in the transaction handling when going from an 523 # There is a bug in the transaction handling when going from an
521 # inline revlog to a separate index and data file. Turn it off until 524 # inline revlog to a separate index and data file. Turn it off until
522 # it's fixed, since v2 revlogs sometimes get rewritten on exchange. 525 # it's fixed, since v2 revlogs sometimes get rewritten on exchange.