This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4720

filelog: drop index attribute (API)
ClosedPublic

Authored by indygreg on Sep 24 2018, 1:15 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGd9b3cc3d5d07: filelog: drop index attribute (API)
Summary

The previous commit removed the last consumer of the "index" attribute
on the file storage interface. The index is an extremely low-level
data structure that is revlog specific and isn't appropriate to
expose as part of a generic storage API. There may be a market for
an efficient data structure to obtain metadata on every revision for
a file. But if there is, it should be designed using e.g. named
attributes for lookup instead of a list-like of 8-tuples.

Let's drop the attribute from filelog and remove the attribute from
the file storage interface.

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 24 2018, 1:15 PM
Closed by commit rHGd9b3cc3d5d07: filelog: drop index attribute (API) (authored by indygreg). · Explain WhySep 26 2018, 1:25 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/filelog.py (2 lines)
Mmercurial/repository.py (3 lines)
Mtests/simplestorerepo.py (10 lines)

Diff 11391

mercurial/filelog.py

class filelog(object): class filelog(object):
def __init__(self, opener, path): def __init__(self, opener, path):
self._revlog = revlog.revlog(opener, self._revlog = revlog.revlog(opener,
'/'.join(('data', path + '.i')), '/'.join(('data', path + '.i')),
censorable=True) censorable=True)
# Full name of the user visible file, relative to the repository root. # Full name of the user visible file, relative to the repository root.
# Used by LFS. # Used by LFS.
self._revlog.filename = path self._revlog.filename = path
# Used by repo upgrade.
self.index = self._revlog.index
# Used by changegroup generation. # Used by changegroup generation.
self._generaldelta = self._revlog._generaldelta self._generaldelta = self._revlog._generaldelta
def __len__(self): def __len__(self):
return len(self._revlog) return len(self._revlog)
def __iter__(self): def __iter__(self):
return self._revlog.__iter__() return self._revlog.__iter__()

mercurial/repository.py

This interface defines the index portion of the interface. This interface defines the index portion of the interface.
The index logically consists of: The index logically consists of:
* A mapping between revision numbers and nodes. * A mapping between revision numbers and nodes.
* DAG data (storing and querying the relationship between nodes). * DAG data (storing and querying the relationship between nodes).
* Metadata to facilitate storage. * Metadata to facilitate storage.
""" """
index = interfaceutil.Attribute(
"""An ``ifilerevisionssequence`` instance.""")
def __len__(): def __len__():
"""Obtain the number of revisions stored for this file.""" """Obtain the number of revisions stored for this file."""
def __iter__(): def __iter__():
"""Iterate over revision numbers for this file.""" """Iterate over revision numbers for this file."""
def revs(start=0, stop=None): def revs(start=0, stop=None):
"""Iterate over revision numbers for this file, with control.""" """Iterate over revision numbers for this file, with control."""

tests/simplestorerepo.py

indexdata = self._svfs.tryread(self._indexpath) indexdata = self._svfs.tryread(self._indexpath)
if indexdata: if indexdata:
indexdata = cbor.loads(indexdata) indexdata = cbor.loads(indexdata)
self._indexdata = indexdata or [] self._indexdata = indexdata or []
self._indexbynode = {} self._indexbynode = {}
self._indexbyrev = {} self._indexbyrev = {}
self.index = [] self._index = []
self._refreshindex() self._refreshindex()
# This is used by changegroup code :/ # This is used by changegroup code :/
self._generaldelta = True self._generaldelta = True
def _refreshindex(self): def _refreshindex(self):
self._indexbynode.clear() self._indexbynode.clear()
self._indexbyrev.clear() self._indexbyrev.clear()
self.index = [] self._index = []
for i, entry in enumerate(self._indexdata): for i, entry in enumerate(self._indexdata):
self._indexbynode[entry[b'node']] = entry self._indexbynode[entry[b'node']] = entry
self._indexbyrev[i] = entry self._indexbyrev[i] = entry
self._indexbynode[nullid] = { self._indexbynode[nullid] = {
b'node': nullid, b'node': nullid,
b'p1': nullid, b'p1': nullid,
b'linkrev': nullrev, b'linkrev': nullrev,
b'flags': 0, b'flags': 0,
} }
for i, entry in enumerate(self._indexdata): for i, entry in enumerate(self._indexdata):
p1rev, p2rev = self.parentrevs(self.rev(entry[b'node'])) p1rev, p2rev = self.parentrevs(self.rev(entry[b'node']))
# start, length, rawsize, chainbase, linkrev, p1, p2, node # start, length, rawsize, chainbase, linkrev, p1, p2, node
self.index.append((0, 0, 0, -1, entry[b'linkrev'], p1rev, p2rev, self._index.append((0, 0, 0, -1, entry[b'linkrev'], p1rev, p2rev,
entry[b'node'])) entry[b'node']))
self.index.append((0, 0, 0, -1, -1, -1, -1, nullid)) self._index.append((0, 0, 0, -1, -1, -1, -1, nullid))
def __len__(self): def __len__(self):
return len(self._indexdata) return len(self._indexdata)
def __iter__(self): def __iter__(self):
return iter(range(len(self))) return iter(range(len(self)))
def revs(self, start=0, stop=None): def revs(self, start=0, stop=None):