This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10868

revlog: list older-but-still-around file in `files`
ClosedPublic

Authored by marmoute on Jun 11 2021, 6:55 AM.

Details

Reviewers
indygreg
Alphare
Group Reviewers
hg-reviewers
Commits
rHGf93a867a6486: revlog: list older-but-still-around file in `files`
Summary

These older files will eventually be removed, but we have to take them in account until they are. So we update files to keep fncache happy.

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.Jun 11 2021, 6:55 AM
baymax updated this revision to Diff 28568.Jun 15 2021, 7:39 AM

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

Alphare accepted this revision.Jun 16 2021, 11:01 AM
This revision is now accepted and ready to land.Jun 16 2021, 11:01 AM
marmoute updated this revision to Diff 28645.Jun 21 2021, 9:10 AM
marmoute added a commit: rHGf93a867a6486: revlog: list older-but-still-around file in `files`.Jun 21 2021, 11:16 AM
Closed by commit rHGf93a867a6486: revlog: list older-but-still-around file in `files` (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/revlog.py (3 lines)
Mmercurial/revlogutils/docket.py (21 lines)

Diff 28663

mercurial/revlog.py

def files(self): def files(self):
res = [self._indexfile] res = [self._indexfile]
if self._docket_file is None: if self._docket_file is None:
if not self._inline: if not self._inline:
res.append(self._datafile) res.append(self._datafile)
else: else:
res.append(self._docket_file) res.append(self._docket_file)
res.extend(self._docket.old_index_filepaths(include_empty=False))
if self._docket.data_end: if self._docket.data_end:
res.append(self._datafile) res.append(self._datafile)
res.extend(self._docket.old_data_filepaths(include_empty=False))
if self._docket.sidedata_end: if self._docket.sidedata_end:
res.append(self._sidedatafile) res.append(self._sidedatafile)
res.extend(self._docket.old_sidedata_filepaths(include_empty=False))
return res return res
def emitrevisions( def emitrevisions(
self, self,
nodes, nodes,
nodesorder=None, nodesorder=None,
revisiondata=False, revisiondata=False,
assumehaveparentrevisions=False, assumehaveparentrevisions=False,

mercurial/revlogutils/docket.py

"""switch index file to a new UID """switch index file to a new UID
The previous index UID is moved to the "older" list.""" The previous index UID is moved to the "older" list."""
old = (self._index_uuid, self._index_end) old = (self._index_uuid, self._index_end)
self._older_index_uuids.insert(0, old) self._older_index_uuids.insert(0, old)
self._index_uuid = make_uid() self._index_uuid = make_uid()
return self.index_filepath() return self.index_filepath()
def old_index_filepaths(self, include_empty=True):
"""yield file path to older index files associated to this docket"""
# very simplistic version at first
for uuid, size in self._older_index_uuids:
if include_empty or size > 0:
yield b"%s-%s.idx" % (self._radix, uuid)
def data_filepath(self): def data_filepath(self):
"""file path to the current data file associated to this docket""" """file path to the current data file associated to this docket"""
# very simplistic version at first # very simplistic version at first
if self._data_uuid is None: if self._data_uuid is None:
self._data_uuid = make_uid() self._data_uuid = make_uid()
return b"%s-%s.dat" % (self._radix, self._data_uuid) return b"%s-%s.dat" % (self._radix, self._data_uuid)
def new_data_file(self): def new_data_file(self):
"""switch data file to a new UID """switch data file to a new UID
The previous data UID is moved to the "older" list.""" The previous data UID is moved to the "older" list."""
old = (self._data_uuid, self._data_end) old = (self._data_uuid, self._data_end)
self._older_data_uuids.insert(0, old) self._older_data_uuids.insert(0, old)
self._data_uuid = make_uid() self._data_uuid = make_uid()
return self.data_filepath() return self.data_filepath()
def old_data_filepaths(self, include_empty=True):
"""yield file path to older data files associated to this docket"""
# very simplistic version at first
for uuid, size in self._older_data_uuids:
if include_empty or size > 0:
yield b"%s-%s.dat" % (self._radix, uuid)
def sidedata_filepath(self): def sidedata_filepath(self):
"""file path to the current sidedata file associated to this docket""" """file path to the current sidedata file associated to this docket"""
# very simplistic version at first # very simplistic version at first
if self._sidedata_uuid is None: if self._sidedata_uuid is None:
self._sidedata_uuid = make_uid() self._sidedata_uuid = make_uid()
return b"%s-%s.sda" % (self._radix, self._sidedata_uuid) return b"%s-%s.sda" % (self._radix, self._sidedata_uuid)
def new_sidedata_file(self): def new_sidedata_file(self):
"""switch sidedata file to a new UID """switch sidedata file to a new UID
The previous sidedata UID is moved to the "older" list.""" The previous sidedata UID is moved to the "older" list."""
old = (self._sidedata_uuid, self._sidedata_end) old = (self._sidedata_uuid, self._sidedata_end)
self._older_sidedata_uuids.insert(0, old) self._older_sidedata_uuids.insert(0, old)
self._sidedata_uuid = make_uid() self._sidedata_uuid = make_uid()
return self.sidedata_filepath() return self.sidedata_filepath()
def old_sidedata_filepaths(self, include_empty=True):
"""yield file path to older sidedata files associated to this docket"""
# very simplistic version at first
for uuid, size in self._older_sidedata_uuids:
if include_empty or size > 0:
yield b"%s-%s.sda" % (self._radix, uuid)
@property @property
def index_end(self): def index_end(self):
return self._index_end return self._index_end
@index_end.setter @index_end.setter
def index_end(self, new_size): def index_end(self, new_size):
if new_size != self._index_end: if new_size != self._index_end:
self._index_end = new_size self._index_end = new_size