[PATCH 1 of 2] Abstract manifest block parsing

[Brendan Cully]

# HG changeset patch
# User Brendan Cully <brendan at kublai.com>
# Date 1159470935 25200
# Node ID 9d6cf040135ad59f64c4fc647b715525f2095c8e
# Parent  245bb70d7dfbd48e24e7fa3c143a6a340bdb2deb
Abstract manifest block parsing.

diff -r 245bb70d7dfb -r 9d6cf040135a mercurial/manifest.py
--- a/mercurial/manifest.py	Thu Sep 28 11:41:33 2006 -0700
+++ b/mercurial/manifest.py	Thu Sep 28 12:15:35 2006 -0700
@@ -9,6 +9,7 @@ from i18n import gettext as _
 from i18n import gettext as _
 from demandload import *
 demandload(globals(), "array bisect struct")
+demandload(globals(), "mdiff")
 
 class manifestdict(dict):
     def __init__(self, mapping=None, flags=None):
@@ -42,16 +43,25 @@ class manifest(revlog):
         revlog.__init__(self, opener, "00manifest.i", "00manifest.d",
                         defversion)
 
+    def parselines(self, lines):
+        for l in lines.splitlines(1):
+            yield l.split('\0')
+
+    def readdelta(self, node):
+        delta = mdiff.patchtext(self.delta(node))
+        deltamap = manifestdict()
+        for f, n in self.parselines(delta):
+            deltamap.rawset(f, n)
+        return deltamap
+            
     def read(self, node):
         if node == nullid: return manifestdict() # don't upset local cache
         if self.mapcache and self.mapcache[0] == node:
             return self.mapcache[1]
         text = self.revision(node)
         self.listcache = array.array('c', text)
-        lines = text.splitlines(1)
         mapping = manifestdict()
-        for l in lines:
-            (f, n) = l.split('\0')
+        for f, n in self.parselines(text):
             mapping.rawset(f, n)
         self.mapcache = (node, mapping)
         return mapping
diff -r 245bb70d7dfb -r 9d6cf040135a mercurial/verify.py
--- a/mercurial/verify.py	Thu Sep 28 11:41:33 2006 -0700
+++ b/mercurial/verify.py	Thu Sep 28 12:15:35 2006 -0700
@@ -102,20 +102,14 @@ def verify(repo):
                     (short(n), short(p)))
 
         try:
-            delta = mdiff.patchtext(repo.manifest.delta(n))
+            for f, fn in repo.manifest.readdelta(n).iteritems():
+                filenodes.setdefault(f, {})[fn] = 1
         except KeyboardInterrupt:
             repo.ui.warn(_("interrupted"))
             raise
         except Exception, inst:
-            err(_("unpacking manifest %s: %s") % (short(n), inst))
+            err(_("reading delta for manifest %s: %s") % (short(n), inst))
             continue
-
-        try:
-            ff = [ l.split('\0') for l in delta.splitlines() ]
-            for f, fn in ff:
-                filenodes.setdefault(f, {})[bin(fn[:40])] = 1
-        except (ValueError, TypeError), inst:
-            err(_("broken delta in manifest %s: %s") % (short(n), inst))
 
     repo.ui.status(_("crosschecking files in changesets and manifests\n"))