# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1185469378 18000
# Node ID 825516d16b25f9bd9b96eaa0e401e6b8aa85350b
# Parent  4b1acb3ecb3ce834fbbe74c16b8c4ebfb83ec0ab
revlog: move flag checking out of the offset fastpath

diff --git a/mercurial/revlog.py b/mercurial/revlog.py
--- a/mercurial/revlog.py
+++ b/mercurial/revlog.py
@@ -29,8 +29,6 @@ class LookupError(RevlogError):
     pass
 
 def getoffset(q):
-    if q & 0xFFFF:
-        raise RevlogError(_('incompatible revision flag %x') % q)
     return int(q >> 16)
 
 def gettype(q):
@@ -907,6 +905,10 @@ class revlog(object):
         rev = self.rev(node)
         base = self.base(rev)
 
+        # check rev flags
+        if self.index[rev][0] & 0xFFFF:
+            raise RevlogError(_('incompatible revision flag %x') % q)
+
         if self._inline:
             # we probably have the whole chunk cached
             df = None