Mercurial > hg
changeset 50496:e50d1fe7ebb4
store: issue a single entry for each revlog
We now yield a single entry, with data about each files involved. This help to
simplify multiple code using this and it will help to further simplify and
fixes the streaming code.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Mon, 15 May 2023 09:03:15 +0200 |
| parents | ed8cda1c18e1 |
| children | 66c556968222 |
| files | mercurial/repair.py mercurial/revlogutils/rewrite.py mercurial/store.py mercurial/upgrade_utils/engine.py |
| diffstat | 4 files changed, 67 insertions(+), 60 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/repair.py Mon May 15 09:02:59 2023 +0200 +++ b/mercurial/repair.py Mon May 15 09:03:15 2023 +0200 @@ -448,9 +448,7 @@ for entry in repo.store.datafiles(): if not entry.is_revlog: continue - if not entry.revlog_type == store.FILEFLAGS_MANIFESTLOG: - continue - if entry.is_revlog_main: + if entry.revlog_type == store.FILEFLAGS_MANIFESTLOG: yield repo.manifestlog.getstorage(entry.target_id)
--- a/mercurial/revlogutils/rewrite.py Mon May 15 09:02:59 2023 +0200 +++ b/mercurial/revlogutils/rewrite.py Mon May 15 09:03:15 2023 +0200 @@ -828,9 +828,7 @@ entry for entry in repo.store.datafiles() if ( - entry.is_revlog - and entry.is_revlog_main - and entry.revlog_type == store.FILEFLAGS_FILELOG + entry.is_revlog and entry.revlog_type == store.FILEFLAGS_FILELOG ) )
--- a/mercurial/store.py Mon May 15 09:02:59 2023 +0200 +++ b/mercurial/store.py Mon May 15 09:03:15 2023 +0200 @@ -464,6 +464,13 @@ This is returned by `store.walk` and represent some data in the store.""" + +@attr.s(slots=True, init=False) +class SimpleStoreEntry(BaseStoreEntry): + """A generic entry in the store""" + + is_revlog = False + _entry_path = attr.ib() _is_volatile = attr.ib(default=False) _file_size = attr.ib(default=None) @@ -474,6 +481,7 @@ is_volatile=False, file_size=None, ): + super().__init__() self._entry_path = entry_path self._is_volatile = is_volatile self._file_size = file_size @@ -489,42 +497,41 @@ @attr.s(slots=True, init=False) -class SimpleStoreEntry(BaseStoreEntry): - """A generic entry in the store""" - - is_revlog = False - - -@attr.s(slots=True, init=False) class RevlogStoreEntry(BaseStoreEntry): """A revlog entry in the store""" is_revlog = True + revlog_type = attr.ib(default=None) target_id = attr.ib(default=None) - is_revlog_main = attr.ib(default=None) + _path_prefix = attr.ib(default=None) + _details = attr.ib(default=None) def __init__( self, - entry_path, revlog_type, + path_prefix, target_id, - is_revlog_main=False, - is_volatile=False, - file_size=None, + details, ): - super().__init__( - entry_path=entry_path, - is_volatile=is_volatile, - file_size=file_size, - ) + super().__init__() self.revlog_type = revlog_type self.target_id = target_id - self.is_revlog_main = is_revlog_main + self._path_prefix = path_prefix + assert b'.i' in details, (path_prefix, details) + self._details = details def main_file_path(self): """unencoded path of the main revlog file""" - return self._entry_path + return self._path_prefix + b'.i' + + def files(self): + files = [] + for ext in sorted(self._details, key=_ext_key): + path = self._path_prefix + ext + data = self._details[ext] + files.append(StoreFile(unencoded_path=path, **data)) + return files @attr.s(slots=True) @@ -532,7 +539,7 @@ """a file matching an entry""" unencoded_path = attr.ib() - _file_size = attr.ib(default=False) + _file_size = attr.ib(default=None) is_volatile = attr.ib(default=False) def file_size(self, vfs): @@ -652,17 +659,19 @@ files = self._walk(base_dir, True, undecodable=undecodable) files = (f for f in files if f[1][0] is not None) for revlog, details in _gather_revlog(files): + file_details = {} + revlog_target_id = revlog.split(b'/', 1)[1] for ext, (t, s) in sorted(details.items()): - u = revlog + ext - revlog_target_id = revlog.split(b'/', 1)[1] - yield RevlogStoreEntry( - entry_path=u, - revlog_type=rl_type, - target_id=revlog_target_id, - is_revlog_main=bool(t & FILEFLAGS_REVLOG_MAIN), - is_volatile=bool(t & FILEFLAGS_VOLATILE), - file_size=s, - ) + file_details[ext] = { + 'is_volatile': bool(t & FILEFLAGS_VOLATILE), + 'file_size': s, + } + yield RevlogStoreEntry( + path_prefix=revlog, + revlog_type=rl_type, + target_id=revlog_target_id, + details=file_details, + ) def topfiles(self) -> Generator[BaseStoreEntry, None, None]: files = reversed(self._walk(b'', False)) @@ -692,18 +701,18 @@ assert len(changelogs) <= 1 for data, revlog_type in top_rl: for revlog, details in sorted(data.items()): - # (keeping ordering so we get 00changelog.i last) - key = lambda x: _ext_key(x[0]) - for ext, (t, s) in sorted(details.items(), key=key): - u = revlog + ext - yield RevlogStoreEntry( - entry_path=u, - revlog_type=revlog_type, - target_id=b'', - is_revlog_main=bool(t & FILEFLAGS_REVLOG_MAIN), - is_volatile=bool(t & FILEFLAGS_VOLATILE), - file_size=s, - ) + file_details = {} + for ext, (t, s) in details.items(): + file_details[ext] = { + 'is_volatile': bool(t & FILEFLAGS_VOLATILE), + 'file_size': s, + } + yield RevlogStoreEntry( + path_prefix=revlog, + revlog_type=revlog_type, + target_id=b'', + details=file_details, + ) def walk(self, matcher=None) -> Generator[BaseStoreEntry, None, None]: """return files related to data storage (ie: revlogs) @@ -981,6 +990,7 @@ files = (f for f in files if f[1] is not None) by_revlog = _gather_revlog(files) for revlog, details in by_revlog: + file_details = {} if revlog.startswith(b'data/'): rl_type = FILEFLAGS_FILELOG revlog_target_id = revlog.split(b'/', 1)[1] @@ -992,17 +1002,18 @@ else: # unreachable assert False, revlog - for ext, t in sorted(details.items()): - f = revlog + ext - entry = RevlogStoreEntry( - entry_path=f, - revlog_type=rl_type, - target_id=revlog_target_id, - is_revlog_main=bool(t & FILEFLAGS_REVLOG_MAIN), - is_volatile=bool(t & FILEFLAGS_VOLATILE), - ) - if _match_tracked_entry(entry, matcher): - yield entry + for ext, t in details.items(): + file_details[ext] = { + 'is_volatile': bool(t & FILEFLAGS_VOLATILE), + } + entry = RevlogStoreEntry( + path_prefix=revlog, + revlog_type=rl_type, + target_id=revlog_target_id, + details=file_details, + ) + if _match_tracked_entry(entry, matcher): + yield entry def copylist(self): d = (
--- a/mercurial/upgrade_utils/engine.py Mon May 15 09:02:59 2023 +0200 +++ b/mercurial/upgrade_utils/engine.py Mon May 15 09:03:15 2023 +0200 @@ -194,7 +194,7 @@ # Perform a pass to collect metadata. This validates we can open all # source files and allows a unified progress bar to be displayed. for entry in alldatafiles: - if not (entry.is_revlog and entry.is_revlog_main): + if not entry.is_revlog: continue rl = _revlog_from_store_entry(srcrepo, entry)