D4704: revlog: use proper version comparison during verify

[indygreg (Gregory Szorc)]

indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  Verify appears to want to compare the changelog's revlog version
  number with the version number of filelogs and error if they are
  different. But what it was actually doing was comparing the full
  32-bit header integer, which contains 2 shorts: 1 for the revlog
  version number and 1 for feature flags.
  
  This commit tweaks the verification code so it only looks at the
  version number component of the header and emits a warning if they
  differ.
  
  The new code is more robust because it accounts for future revlog
  version numbers without them needing to be special cased.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D4704

AFFECTED FILES
  mercurial/revlog.py
  mercurial/verify.py

CHANGE DETAILS

diff --git a/mercurial/verify.py b/mercurial/verify.py
--- a/mercurial/verify.py
+++ b/mercurial/verify.py
@@ -342,7 +342,8 @@
                 storefiles.add(_normpath(f))
 
         state = {
-            'revlogv1': self.revlogv1,
+            # TODO this assumes revlog storage for changelog.
+            'expectedversion': self.repo.changelog.version & 0xFFFF
         }
 
         files = sorted(set(filenodes) | set(filelinkrevs))
diff --git a/mercurial/revlog.py b/mercurial/revlog.py
--- a/mercurial/revlog.py
+++ b/mercurial/revlog.py
@@ -2600,10 +2600,10 @@
         if di:
             yield revlogproblem(error=_('index contains %d extra bytes') % di)
 
-        if self.version != REVLOGV0:
-            if not state['revlogv1']:
-                yield revlogproblem(warning=_("warning: `%s' uses revlog "
-                                             "format 1") % self.indexfile)
-        elif state['revlogv1']:
-            yield revlogproblem(warning=_("warning: `%s' uses revlog "
-                                          "format 0") % self.indexfile)
+        version = self.version & 0xFFFF
+
+        # The verifier tells us what version revlog we should be.
+        if version != state['expectedversion']:
+            yield revlogproblem(
+                warning=_("warning: '%s' uses revlog format %d; expected %d") %
+                        (self.indexfile, version, state['expectedversion']))



To: indygreg, #hg-reviewers
Cc: mercurial-devel