marmoute created this revision. Herald added a reviewer: indygreg. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches.
REVISION 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. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D10868 AFFECTED FILES mercurial/revlog.py mercurial/revlogutils/docket.py CHANGE DETAILS diff --git a/mercurial/revlogutils/docket.py b/mercurial/revlogutils/docket.py --- a/mercurial/revlogutils/docket.py +++ b/mercurial/revlogutils/docket.py @@ -180,6 +180,13 @@ self._index_uuid = make_uid() 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): """file path to the current data file associated to this docket""" # very simplistic version at first @@ -196,6 +203,13 @@ self._data_uuid = make_uid() 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): """file path to the current sidedata file associated to this docket""" # very simplistic version at first @@ -212,6 +226,13 @@ self._sidedata_uuid = make_uid() 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 def index_end(self): return self._index_end diff --git a/mercurial/revlog.py b/mercurial/revlog.py --- a/mercurial/revlog.py +++ b/mercurial/revlog.py @@ -2928,10 +2928,13 @@ res.append(self._datafile) else: res.append(self._docket_file) + res.extend(self._docket.old_index_filepaths(include_empty=False)) if self._docket.data_end: res.append(self._datafile) + res.extend(self._docket.old_data_filepaths(include_empty=False)) if self._docket.sidedata_end: res.append(self._sidedatafile) + res.extend(self._docket.old_sidedata_filepaths(include_empty=False)) return res def emitrevisions( To: marmoute, indygreg, #hg-reviewers Cc: mercurial-patches, mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
