# HG changeset patch # User Pierre-Yves David # Date 2021-05-03 10:26:48 # Node ID 58ef549ae55f625696a50f13bfc8e46af1ad8d0f # Parent ef7a8a1622ad4eb4aec2f8c9e42cf685e88dc369 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 diff --git a/mercurial/revlog.py b/mercurial/revlog.py --- a/mercurial/revlog.py +++ b/mercurial/revlog.py @@ -490,31 +490,34 @@ class revlog(object): else: header = new_header - flags = self._format_flags = header & ~0xFFFF + self._format_flags = header & ~0xFFFF self._format_version = header & 0xFFFF if self._format_version == REVLOGV0: - if flags: + if self._format_flags: msg = _(b'unknown flags (%#04x) in version %d revlog %s') - msg %= (flags >> 16, self._format_version, self.display_id) + display_flag = self._format_flags >> 16 + msg %= (display_flag, self._format_version, self.display_id) raise error.RevlogError(msg) self._inline = False self._generaldelta = False elif self._format_version == REVLOGV1: - if flags & ~REVLOGV1_FLAGS: + if self._format_flags & ~REVLOGV1_FLAGS: msg = _(b'unknown flags (%#04x) in version %d revlog %s') - msg %= (flags >> 16, self._format_version, self.display_id) + display_flag = self._format_flags >> 16 + msg %= (display_flag, self._format_version, self.display_id) raise error.RevlogError(msg) self._inline = self._format_flags & FLAG_INLINE_DATA self._generaldelta = self._format_flags & FLAG_GENERALDELTA elif self._format_version == REVLOGV2: - if flags & ~REVLOGV2_FLAGS: + if self._format_flags & ~REVLOGV2_FLAGS: msg = _(b'unknown flags (%#04x) in version %d revlog %s') - msg %= (flags >> 16, self._format_version, self.display_id) + display_flag = self._format_flags >> 16 + msg %= (display_flag, self._format_version, self.display_id) raise error.RevlogError(msg) # There is a bug in the transaction handling when going from an