# 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 -r 4b1acb3ecb3c -r 825516d16b25 mercurial/revlog.py
--- a/mercurial/revlog.py	Thu Jul 26 12:02:58 2007 -0500
+++ b/mercurial/revlog.py	Thu Jul 26 12:02:58 2007 -0500
@@ -29,8 +29,6 @@
     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 @@
         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