Remove manifest.readflags

mercurial/localrepo.py

@@ -509,7 +509,7 b' class localrepository(repo.repository):'
                     # 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 b' class localrepository(repo.repository):'
         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

mercurial/manifest.py

@@ -53,9 +53,6 b' class manifest(revlog):'
         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 b' class manifest(revlog):'
         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 b' class manifest(revlog):'
 
             # 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 b' class manifest(revlog):'
                 # 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: