This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4020

pure: create type for revlog v0 index
ClosedPublic

Authored by martinvonz on Aug 1 2018, 2:47 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGda5a666f0f78: pure: create type for revlog v0 index
Summary

The new type takes care of hiding the nullid entry. This type helps us
transition away from including that entry at index[len(index)-1].

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Aug 1 2018, 2:47 PM
martinvonz updated this revision to Diff 9779.Aug 2 2018, 12:40 AM
yuja added a subscriber: yuja.Aug 4 2018, 12:05 AM

Queued up to this, thanks. Can you rebase the remainder?

Closed by commit rHGda5a666f0f78: pure: create type for revlog v0 index (authored by martinvonz). · Explain WhyAug 4 2018, 12:06 AM
This revision was automatically updated to reflect the committed changes.
martinvonz added a comment.Aug 4 2018, 12:14 AM
In D4020#63476, @yuja wrote:

Queued up to this, thanks. Can you rebase the remainder?

Thanks! Will do right away.

Revision Contents
Changeset List

PathPackages
Mmercurial/revlog.py (13 lines)

Diff 9883

mercurial/revlog.py

# 4 bytes: link rev # 4 bytes: link rev
# 20 bytes: parent 1 nodeid # 20 bytes: parent 1 nodeid
# 20 bytes: parent 2 nodeid # 20 bytes: parent 2 nodeid
# 20 bytes: nodeid # 20 bytes: nodeid
indexformatv0 = struct.Struct(">4l20s20s20s") indexformatv0 = struct.Struct(">4l20s20s20s")
indexformatv0_pack = indexformatv0.pack indexformatv0_pack = indexformatv0.pack
indexformatv0_unpack = indexformatv0.unpack indexformatv0_unpack = indexformatv0.unpack
class revlogoldindex(list):
def __len__(self):
return list.__len__(self) + 1
def __getitem__(self, i):
if i == -1 or i == len(self) - 1:
return (0, 0, 0, -1, -1, -1, -1, nullid)
return list.__getitem__(self, i)
class revlogoldio(object): class revlogoldio(object):
def __init__(self): def __init__(self):
self.size = indexformatv0.size self.size = indexformatv0.size
def parseindex(self, data, inline): def parseindex(self, data, inline):
s = self.size s = self.size
index = [] index = []
nodemap = {nullid: nullrev} nodemap = {nullid: nullrev}
n = off = 0 n = off = 0
l = len(data) l = len(data)
while off + s <= l: while off + s <= l:
cur = data[off:off + s] cur = data[off:off + s]
off += s off += s
e = indexformatv0_unpack(cur) e = indexformatv0_unpack(cur)
# transform to revlogv1 format # transform to revlogv1 format
e2 = (offset_type(e[0], 0), e[1], -1, e[2], e[3], e2 = (offset_type(e[0], 0), e[1], -1, e[2], e[3],
nodemap.get(e[4], nullrev), nodemap.get(e[5], nullrev), e[6]) nodemap.get(e[4], nullrev), nodemap.get(e[5], nullrev), e[6])
index.append(e2) index.append(e2)
nodemap[e[6]] = n nodemap[e[6]] = n
n += 1 n += 1
# add the magic null revision at -1 return revlogoldindex(index), nodemap, None
index.append((0, 0, 0, -1, -1, -1, -1, nullid))
return index, nodemap, None
def packentry(self, entry, node, version, rev): def packentry(self, entry, node, version, rev):
if gettype(entry[0]): if gettype(entry[0]):
raise RevlogError(_('index entry flags need revlog version 1')) raise RevlogError(_('index entry flags need revlog version 1'))
e2 = (getoffset(entry[0]), entry[1], entry[3], entry[4], e2 = (getoffset(entry[0]), entry[1], entry[3], entry[4],
node(entry[5]), node(entry[6]), entry[7]) node(entry[5]), node(entry[6]), entry[7])
return indexformatv0_pack(*e2) return indexformatv0_pack(*e2)