Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revlog: more robust for damaged indexes
authorMatt Mackall <mpm@selenic.com>
Fri, 21 Sep 2007 17:14:39 -0500
changeset 5312 fb070713ff36
parent 5311 599f3a690d8f
child 5313 29be4228303b
revlog: more robust for damaged indexes - fix flag reporting - make broken length reporting smarter
mercurial/revlog.py file | annotate | diff | comparison | revisions 
--- a/mercurial/revlog.py	Fri Sep 21 17:13:38 2007 -0500
+++ b/mercurial/revlog.py	Fri Sep 21 17:14:39 2007 -0500
@@ -912,7 +912,8 @@
 
         # check rev flags
         if self.index[rev][0] & 0xFFFF:
-            raise RevlogError(_('incompatible revision flag %x') % q)
+            raise RevlogError(_('incompatible revision flag %x') %
+                              (self.index[rev][0] & 0xFFFF))
 
         if self._inline:
             # we probably have the whole chunk cached
@@ -1236,7 +1237,7 @@
     def checksize(self):
         expected = 0
         if self.count():
-            expected = self.end(self.count() - 1)
+            expected = max(0, self.end(self.count() - 1))
 
         try:
             f = self.opener(self.datafile)
@@ -1253,12 +1254,12 @@
             f.seek(0, 2)
             actual = f.tell()
             s = self._io.size
-            i = actual / s
+            i = max(0, actual / s)
             di = actual - (i * s)
             if self._inline:
                 databytes = 0
                 for r in xrange(self.count()):
-                    databytes += self.length(r)
+                    databytes += max(0, self.length(r))
                 dd = 0
                 di = actual - self.count() * s - databytes
         except IOError, inst:
Mercurial