This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4757

storageutil: extract revision number iteration
ClosedPublic

Authored by indygreg on Sep 26 2018, 2:29 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGd63153611ed5: storageutil: extract revision number iteration
rHG6037974f8aba: storageutil: extract revision number iteration
Summary

This code is a bit quirky (and possibly buggy). It will likely be used
by multiple storage backends. Let's extract it so it is reusable.

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

indygreg created this revision.Sep 26 2018, 2:29 PM
Closed by commit rHG6037974f8aba: storageutil: extract revision number iteration (authored by indygreg). · Explain WhySep 26 2018, 5:13 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/revlog.py (12 lines)
Mmercurial/utils/storageutil.py (18 lines)

Diff 11433

mercurial/revlog.py

def __contains__(self, rev): def __contains__(self, rev):
return 0 <= rev < len(self) return 0 <= rev < len(self)
def __len__(self): def __len__(self):
return len(self.index) return len(self.index)
def __iter__(self): def __iter__(self):
return iter(pycompat.xrange(len(self))) return iter(pycompat.xrange(len(self)))
def revs(self, start=0, stop=None): def revs(self, start=0, stop=None):
"""iterate over all rev in this revlog (from start to stop)""" """iterate over all rev in this revlog (from start to stop)"""
step = 1 return storageutil.iterrevs(len(self), start=start, stop=stop)
length = len(self)
if stop is not None:
if start > stop:
step = -1
stop += step
if stop > length:
stop = length
else:
stop = length
return pycompat.xrange(start, stop, step)
@util.propertycache @util.propertycache
def nodemap(self): def nodemap(self):
if self.index: if self.index:
# populate mapping down to the initial node # populate mapping down to the initial node
node0 = self.index[0][7] # get around changelog filtering node0 = self.index[0][7] # get around changelog filtering
self.rev(node0) self.rev(node0)
return self._nodecache return self._nodecache

mercurial/utils/storageutil.py

# storageutil.py - Storage functionality agnostic of backend implementation. # storageutil.py - Storage functionality agnostic of backend implementation.
# #
# Copyright 2018 Gregory Szorc <gregory.szorc@gmail.com> # Copyright 2018 Gregory Szorc <gregory.szorc@gmail.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
import hashlib import hashlib
import re import re
from ..node import ( from ..node import (
nullid, nullid,
) )
from .. import (
pycompat,
)
_nullhash = hashlib.sha1(nullid) _nullhash = hashlib.sha1(nullid)
def hashrevisionsha1(text, p1, p2): def hashrevisionsha1(text, p1, p2):
"""Compute the SHA-1 for revision data and its parents. """Compute the SHA-1 for revision data and its parents.
This hash combines both the current file contents and its history This hash combines both the current file contents and its history
in a manner that makes it easy to distinguish nodes with the same in a manner that makes it easy to distinguish nodes with the same
Returns ``text`` unless it has a metadata header, in which case we return Returns ``text`` unless it has a metadata header, in which case we return
a new buffer without hte metadata. a new buffer without hte metadata.
""" """
if not text.startswith(b'\x01\n'): if not text.startswith(b'\x01\n'):
return text return text
offset = text.index(b'\x01\n', 2) offset = text.index(b'\x01\n', 2)
return text[offset + 2:] return text[offset + 2:]
def iterrevs(storelen, start=0, stop=None):
"""Iterate over revision numbers in a store."""
step = 1
if stop is not None:
if start > stop:
step = -1
stop += step
if stop > storelen:
stop = storelen
else:
stop = storelen
return pycompat.xrange(start, stop, step)