--- a/mercurial/revlog.py	Sun Mar 19 01:02:42 2017 -0400
+++ b/mercurial/revlog.py	Sun Mar 19 01:05:28 2017 -0400
@@ -117,7 +117,7 @@
 def offset_type(offset, type):
     if (type & ~REVIDX_KNOWN_FLAGS) != 0:
         raise ValueError('unknown revlog index flags')
-    return long(long(offset) << 16 | type)
+    return int(int(offset) << 16 | type)
 
 _nullhash = hashlib.sha1(nullid)