# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1155312038 18000
# Node ID e3fb4223e750f06749850a345059b6e821279c35
# Parent  046a8b03ea5986ef58ebec659a446f4031b579d2
Remove manifest.readflags

diff -r 046a8b03ea59 -r e3fb4223e750 mercurial/localrepo.py
--- a/mercurial/localrepo.py	Fri Aug 11 10:57:42 2006 -0500
+++ b/mercurial/localrepo.py	Fri Aug 11 11:00:38 2006 -0500
@@ -509,7 +509,7 @@
                     # deleted from p2?
                     pass
 
-        mnode = self.manifest.add(m1, m1, tr, linkrev, c1[0], c2[0])
+        mnode = self.manifest.add(m1, tr, linkrev, c1[0], c2[0])
         user = user or self.ui.username()
         n = self.changelog.add(mnode, changed, text, tr, p1, p2, user, date)
         tr.close()
@@ -597,7 +597,7 @@
         for f in remove:
             if f in m1:
                 del m1[f]
-        mn = self.manifest.add(m1, m1, tr, linkrev, c1[0], c2[0],
+        mn = self.manifest.add(m1, tr, linkrev, c1[0], c2[0],
                                (new, remove))
 
         # add changeset
diff -r 046a8b03ea59 -r e3fb4223e750 mercurial/manifest.py
--- a/mercurial/manifest.py	Fri Aug 11 10:57:42 2006 -0500
+++ b/mercurial/manifest.py	Fri Aug 11 11:00:38 2006 -0500
@@ -53,9 +53,6 @@
         self.mapcache = (node, mapping)
         return mapping
 
-    def readflags(self, node):
-        return self.read(node)
-
     def diff(self, a, b):
         return mdiff.textdiff(str(a), str(b))
 
@@ -112,7 +109,7 @@
         f, n = l.split('\0')
         return bin(n[:40]), n[40:-1] == 'x'
 
-    def add(self, map, flags, transaction, link, p1=None, p2=None,
+    def add(self, map, transaction, link, p1=None, p2=None,
             changed=None):
         # apply the changes collected during the bisect loop to our addlist
         # return a delta suitable for addrevision
@@ -140,7 +137,7 @@
 
             # if this is changed to support newlines in filenames,
             # be sure to check the templates/ dir again (especially *-raw.tmpl)
-            text = ["%s\000%s%s\n" % (f, hex(map[f]), flags.flags(f)) for f in files]
+            text = ["%s\000%s%s\n" % (f, hex(map[f]), map.flags(f)) for f in files]
             self.listcache = array.array('c', "".join(text))
             cachedelta = None
         else:
@@ -166,7 +163,7 @@
                 # bs will either be the index of the item or the insert point
                 start, end = self._search(addbuf, f, start)
                 if w[1] == 0:
-                    l = "%s\000%s%s\n" % (f, hex(map[f]), flags.flags(f))
+                    l = "%s\000%s%s\n" % (f, hex(map[f]), map.flags(f))
                 else:
                     l = ""
                 if start == end and w[1] == 1: