( )⚙ D7809 revlogutils: move the NodeMap class in a dedicated nodemap module

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7809

revlogutils: move the NodeMap class in a dedicated nodemap module
ClosedPublic

Authored by marmoute on Jan 7 2020, 7:52 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGab595920de0e: revlogutils: move the NodeMap class in a dedicated nodemap module
Summary

We will introduce more nodemap related code, so it make sense to move the
existing code in that module first.

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.Jan 7 2020, 7:52 AM
marmoute added a commit: rHGab595920de0e: revlogutils: move the NodeMap class in a dedicated nodemap module.Jan 8 2020, 3:04 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGab595920de0e: revlogutils: move the NodeMap class in a dedicated nodemap module (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.
martinvonz added a subscriber: martinvonz.Jan 9 2020, 12:41 PM

We recently gained a mercurial.utils module. Should mercurial.revlogutils become mercurial.utils.revlogutil instead?

marmoute added a comment.Jan 9 2020, 1:03 PM

utils is older than revlogutils, revlogutils focus on revlog related changes and his worth keeping at this.

Revision Contents
Changeset List

Diff 19108

mercurial/pure/parsers.py

# parsers.py - Python implementation of parsers.c # parsers.py - Python implementation of parsers.c
# #
# Copyright 2009 Matt Mackall <mpm@selenic.com> and others # Copyright 2009 Matt Mackall <mpm@selenic.com> and others
# #
# 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
import struct import struct
import zlib import zlib
from ..node import nullid, nullrev from ..node import nullid, nullrev
from .. import ( from .. import (
pycompat, pycompat,
revlogutils,
util, util,
) )
from ..revlogutils import nodemap as nodemaputil
stringio = pycompat.bytesio stringio = pycompat.bytesio
_pack = struct.pack _pack = struct.pack
_unpack = struct.unpack _unpack = struct.unpack
_compress = zlib.compress _compress = zlib.compress
_decompress = zlib.decompress _decompress = zlib.decompress
@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
@util.propertycache @util.propertycache
def _nodemap(self): def _nodemap(self):
nodemap = revlogutils.NodeMap({nullid: nullrev}) nodemap = nodemaputil.NodeMap({nullid: nullrev})
for r in range(0, len(self)): for r in range(0, len(self)):
n = self[r][7] n = self[r][7]
nodemap[n] = r nodemap[n] = r
return nodemap return nodemap
def has_node(self, node): def has_node(self, node):
"""return True if the node exist in the index""" """return True if the node exist in the index"""
return node in self._nodemap return node in self._nodemap

mercurial/revlog.py

from .thirdparty import attr from .thirdparty import attr
from . import ( from . import (
ancestor, ancestor,
dagop, dagop,
error, error,
mdiff, mdiff,
policy, policy,
pycompat, pycompat,
revlogutils,
templatefilters, templatefilters,
util, util,
) )
from .interfaces import ( from .interfaces import (
repository, repository,
util as interfaceutil, util as interfaceutil,
) )
from .revlogutils import ( from .revlogutils import (
deltas as deltautil, deltas as deltautil,
flagutil, flagutil,
nodemap as nodemaputil,
sidedata as sidedatautil, sidedata as sidedatautil,
) )
from .utils import ( from .utils import (
storageutil, storageutil,
stringutil, stringutil,
) )
# blanked usage of all the name to prevent pyflakes constraints # blanked usage of all the name to prevent pyflakes constraints
@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
@util.propertycache @util.propertycache
def _nodemap(self): def _nodemap(self):
nodemap = revlogutils.NodeMap({nullid: nullrev}) nodemap = nodemaputil.NodeMap({nullid: nullrev})
for r in range(0, len(self)): for r in range(0, len(self)):
n = self[r][7] n = self[r][7]
nodemap[n] = r nodemap[n] = r
return nodemap return nodemap
def has_node(self, node): def has_node(self, node):
"""return True if the node exist in the index""" """return True if the node exist in the index"""
return node in self._nodemap return node in self._nodemap
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 = revlogutils.NodeMap({nullid: nullrev}) nodemap = nodemaputil.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 = ( e2 = (

mercurial/revlogutils/__init__.py

# mercurial.revlogutils -- basic utilities for revlog # mercurial.revlogutils -- basic utilities for revlog
# #
# Copyright 2019 Pierre-Yves David <pierre-yves.david@octobus.net> # Copyright 2019 Pierre-Yves David <pierre-yves.david@octobus.net>
# #
# 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 .. import error
class NodeMap(dict):
def __missing__(self, x):
raise error.RevlogError(b'unknown node: %s' % x)

mercurial/revlogutils/nodemap.py

  • This file was added.
# nodemap.py - nodemap related code and utilities
#
# Copyright 2019 Pierre-Yves David <pierre-yves.david@octobus.net>
# Copyright 2019 George Racinet <georges.racinet@octobus.net>
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
from __future__ import absolute_import
from .. import error
class NodeMap(dict):
def __missing__(self, x):
raise error.RevlogError(b'unknown node: %s' % x)