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

revlog: abstract out index entry packing

Browse Source 
This lets us remove most of the remaining v0/v1 logic from revlog
This commit is contained in:
Matt Mackall 2007-07-23 20:44:08 -05:00
parent 1f16099cd0
commit ff72ed852c
1 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
mercurial/revlog.py
View File

@ -329,6 +329,11 @@ class revlogoldio(object):
return index, nodemap, None
def packentry(self, entry, node, version):
e2 = (getoffset(entry[0]), entry[1], entry[3], entry[4],
node(entry[5]), node(entry[6]), entry[7])
return struct.pack(indexformatv0, *e2)
class revlogio(object):
def __init__(self):
self.size = struct.calcsize(indexformatng)
@ -378,6 +383,12 @@ class revlogio(object):
return index, nodemap, cache
def packentry(self, entry, node, version):
p = struct.pack(indexformatng, *entry)
if not entry[3] and not getoffset(entry[0]) and entry[5] == nullrev:
p = struct.pack(versionformat, version) + p[4:]
return p
class revlog(object):
"""
the underlying revision storage object
@ -946,16 +957,8 @@ class revlog(object):
fp = self.opener(self.indexfile, 'w', atomictemp=True)
self.version &= ~(REVLOGNGINLINEDATA)
self._inline = False
if self.count():
x = self.index[0]
e = struct.pack(indexformatng, *x)[4:]
l = struct.pack(versionformat, self.version)
fp.write(l)
fp.write(e)
for i in xrange(1, self.count()):
x = self.index[i]
e = struct.pack(indexformatng, *x)
for i in xrange(self.count()):
e = self._io.packentry(self.index[i], self.node, self.version)
fp.write(e)
# if we don't call rename, the temp file will never replace the
@ -1010,14 +1013,7 @@ class revlog(object):
self.index.insert(-1, e)
self.nodemap[node] = curr
if self.version == REVLOGV0:
e = (offset, l, base, link, p1, p2, node)
entry = struct.pack(indexformatv0, *e)
else:
entry = struct.pack(indexformatng, *e)
if not curr:
entry = struct.pack(versionformat, self.version) + entry[4:]
entry = self._io.packentry(e, self.node, self.version)
if not self._inline:
transaction.add(self.datafile, offset)
transaction.add(self.indexfile, curr * len(entry))
@ -1168,19 +1164,15 @@ class revlog(object):
link, self.rev(p1), self.rev(p2), node)
self.index.insert(-1, e)
self.nodemap[node] = r
entry = self._io.packentry(e, self.node, self.version)
if self._inline:
ifh.write(struct.pack(indexformatng, *e))
ifh.write(entry)
ifh.write(cdelta)
self.checkinlinesize(transaction, ifh)
if not self._inline:
dfh = self.opener(self.datafile, "a")
ifh = self.opener(self.indexfile, "a")
else:
if self.version == REVLOGV0:
e = (end, len(cdelta), base, link, p1, p2, node)
entry = struct.pack(indexformatv0, *e)
else:
entry = struct.pack(indexformatng, *e)
dfh.write(cdelta)
ifh.write(entry)