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']))
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))