Mercurial > hg

changeset 47174: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
files mercurial/revlog.py
diffstat 1 files changed, 10 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/revlog.py	Mon May 03 12:26:37 2021 +0200
+++ b/mercurial/revlog.py	Mon May 03 12:26:48 2021 +0200
@@ -490,31 +490,34 @@
         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