This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4334

index: rename _fix_index() since it no longer fixes the index
ClosedPublic

Authored by martinvonz on Aug 20 2018, 1:53 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG5961517fd2a8: index: rename _fix_index() since it no longer fixes the index
Summary

Since c0d411ea6639 (index: drop support for negative indexes into the
index, 2018-07-20), it always returns the input (unless it raises).

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Aug 20 2018, 1:53 AM
Closed by commit rHG5961517fd2a8: index: rename _fix_index() since it no longer fixes the index (authored by martinvonz). · Explain WhyAug 20 2018, 6:52 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/pure/parsers.py (11 lines)

Diff 10455

mercurial/pure/parsers.py

class BaseIndexObject(object): class BaseIndexObject(object):
def __len__(self): def __len__(self):
return self._lgt + len(self._extra) return self._lgt + len(self._extra)
def append(self, tup): def append(self, tup):
self._extra.append(tup) self._extra.append(tup)
def _fix_index(self, i): def _check_index(self, i):
if not isinstance(i, int): if not isinstance(i, int):
raise TypeError("expecting int indexes") raise TypeError("expecting int indexes")
if i < 0 or i >= len(self): if i < 0 or i >= len(self):
raise IndexError raise IndexError
return i
def __getitem__(self, i): def __getitem__(self, i):
if i == -1: if i == -1:
return (0, 0, 0, -1, -1, -1, -1, nullid) return (0, 0, 0, -1, -1, -1, -1, nullid)
i = self._fix_index(i) self._check_index(i)
if i >= self._lgt: if i >= self._lgt:
return self._extra[i - self._lgt] return self._extra[i - self._lgt]
index = self._calculate_index(i) index = self._calculate_index(i)
r = struct.unpack(indexformatng, self._data[index:index + indexsize]) r = struct.unpack(indexformatng, self._data[index:index + indexsize])
if i == 0: if i == 0:
e = list(r) e = list(r)
type = gettype(e[0]) type = gettype(e[0])
e[0] = offset_type(0, type) e[0] = offset_type(0, type)
return tuple(e) return tuple(e)
return r return r
class IndexObject(BaseIndexObject): class IndexObject(BaseIndexObject):
def __init__(self, data): def __init__(self, data):
assert len(data) % indexsize == 0 assert len(data) % indexsize == 0
self._data = data self._data = data
self._lgt = len(data) // indexsize self._lgt = len(data) // indexsize
self._extra = [] self._extra = []
def _calculate_index(self, i): def _calculate_index(self, i):
return i * indexsize return i * indexsize
def __delitem__(self, i): def __delitem__(self, i):
if not isinstance(i, slice) or not i.stop == -1 or i.step is not None: if not isinstance(i, slice) or not i.stop == -1 or i.step is not None:
raise ValueError("deleting slices only supports a:-1 with step 1") raise ValueError("deleting slices only supports a:-1 with step 1")
i = self._fix_index(i.start) i = i.start
self._check_index(i)
if i < self._lgt: if i < self._lgt:
self._data = self._data[:i * indexsize] self._data = self._data[:i * indexsize]
self._lgt = i self._lgt = i
self._extra = [] self._extra = []
else: else:
self._extra = self._extra[:i - self._lgt] self._extra = self._extra[:i - self._lgt]
class InlinedIndexObject(BaseIndexObject): class InlinedIndexObject(BaseIndexObject):
off += indexsize + s off += indexsize + s
if off != len(self._data): if off != len(self._data):
raise ValueError("corrupted data") raise ValueError("corrupted data")
return count return count
def __delitem__(self, i): def __delitem__(self, i):
if not isinstance(i, slice) or not i.stop == -1 or i.step is not None: if not isinstance(i, slice) or not i.stop == -1 or i.step is not None:
raise ValueError("deleting slices only supports a:-1 with step 1") raise ValueError("deleting slices only supports a:-1 with step 1")
i = self._fix_index(i.start) i = i.start
self._check_index(i)
if i < self._lgt: if i < self._lgt:
self._offsets = self._offsets[:i] self._offsets = self._offsets[:i]
self._lgt = i self._lgt = i
self._extra = [] self._extra = []
else: else:
self._extra = self._extra[:i - self._lgt] self._extra = self._extra[:i - self._lgt]
def _calculate_index(self, i): def _calculate_index(self, i):