This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10795

revlog: use entry in revlogv0.py
ClosedPublic

Authored by marmoute on May 30 2021, 1:29 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG8f87dcb46f53: revlog: use entry in revlogv0.py
Summary

This make things clearer and we can reply on some of the default value directly.

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

marmoute created this revision.May 30 2021, 1:29 PM
baymax updated this revision to Diff 28308.May 31 2021, 6:51 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

Alphare accepted this revision as: Alphare.May 31 2021, 10:43 AM
baymax updated this revision to Diff 28323.May 31 2021, 4:21 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

baymax updated this revision to Diff 28405.Jun 1 2021, 11:17 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

baymax updated this revision to Diff 28420.Jun 2 2021, 7:43 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

baymax updated this revision to Diff 28454.Jun 4 2021, 11:05 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

baymax updated this revision to Diff 28476.Jun 7 2021, 5:17 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

marmoute added a commit: rHG8f87dcb46f53: revlog: use entry in revlogv0.py.Jun 7 2021, 5:25 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG8f87dcb46f53: revlog: use entry in revlogv0.py (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/revlogutils/revlogv0.py (43 lines)

Diff 28498

mercurial/revlogutils/revlogv0.py

# revlogv0 - code related to revlog format "V0" # revlogv0 - code related to revlog format "V0"
# #
# Copyright 2005-2007 Olivia Mackall <olivia@selenic.com> # Copyright 2005-2007 Olivia Mackall <olivia@selenic.com>
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from __future__ import absolute_import from __future__ import absolute_import
from ..node import sha1nodeconstants from ..node import sha1nodeconstants
from .constants import ( from .constants import (
COMP_MODE_INLINE,
INDEX_ENTRY_V0, INDEX_ENTRY_V0,
) )
from ..i18n import _ from ..i18n import _
from .. import ( from .. import (
error, error,
node, node,
pycompat, pycompat,
revlogutils, revlogutils,
util, util,
) )
from . import ( from . import (
flagutil,
nodemap as nodemaputil, nodemap as nodemaputil,
) )
def getoffset(q): def getoffset(q):
return int(q >> 16) return int(q >> 16)
def gettype(q): def gettype(q):
return int(q & 0xFFFF) return int(q & 0xFFFF)
class revlogoldindex(list): class revlogoldindex(list):
rust_ext_compat = 0 rust_ext_compat = 0
entry_size = INDEX_ENTRY_V0.size entry_size = INDEX_ENTRY_V0.size
null_item = ( null_item = revlogutils.entry(
0, data_offset=0,
0, data_compressed_length=0,
0, data_delta_base=node.nullrev,
-1, link_rev=node.nullrev,
-1, parent_rev_1=node.nullrev,
-1, parent_rev_2=node.nullrev,
-1, node_id=sha1nodeconstants.nullid,
sha1nodeconstants.nullid,
0,
0,
COMP_MODE_INLINE,
COMP_MODE_INLINE,
) )
@property @property
def nodemap(self): def nodemap(self):
msg = b"index.nodemap is deprecated, use index.[has_node|rev|get_rev]" msg = b"index.nodemap is deprecated, use index.[has_node|rev|get_rev]"
util.nouideprecwarn(msg, b'5.3', stacklevel=2) util.nouideprecwarn(msg, b'5.3', stacklevel=2)
return self._nodemap return self._nodemap
nodemap = nodemaputil.NodeMap({node.nullid: node.nullrev}) nodemap = nodemaputil.NodeMap({node.nullid: node.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 = INDEX_ENTRY_V0.unpack(cur) e = INDEX_ENTRY_V0.unpack(cur)
# transform to revlogv1 format # transform to revlogv1 format
e2 = ( e2 = revlogutils.entry(
revlogutils.offset_type(e[0], 0), data_offset=e[0],
e[1], data_compressed_length=e[1],
-1, data_delta_base=e[2],
e[2], link_rev=e[3],
e[3], parent_rev_1=nodemap.get(e[4], node.nullrev),
nodemap.get(e[4], node.nullrev), parent_rev_2=nodemap.get(e[5], node.nullrev),
nodemap.get(e[5], node.nullrev), node_id=e[6],
e[6],
0, # no side data support
0, # no side data support
COMP_MODE_INLINE,
) )
index.append(e2) index.append(e2)
nodemap[e[6]] = n nodemap[e[6]] = n
n += 1 n += 1
index = revlogoldindex(index) index = revlogoldindex(index)
return index, None return index, None