facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 15:27:13 +03:00
Code Issues Projects Releases Wiki Activity

Remove manifest.readflags

Browse Source
This commit is contained in:
Matt Mackall 2006-08-11 11:00:38 -05:00
parent 44b96c96eb
commit 5c0d170547
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mercurial/localrepo.py
View File

@ -509,7 +509,7 @@ 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 @@ 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

9
mercurial/manifest.py
View File

@ -53,9 +53,6 @@ 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 @@ 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 @@ 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 @@ 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: