diff --git a/requirements-swh.txt b/requirements-swh.txt --- a/requirements-swh.txt +++ b/requirements-swh.txt @@ -1,4 +1,4 @@ swh.model >= 0.4.0 -swh.storage >= 0.10.0 +swh.storage >= 0.12.0 swh.scheduler >= 0.0.39 swh.loader.core >= 0.5.9 diff --git a/swh/loader/mercurial/loader.py b/swh/loader/mercurial/loader.py --- a/swh/loader/mercurial/loader.py +++ b/swh/loader/mercurial/loader.py @@ -28,7 +28,7 @@ from dateutil import parser from shutil import rmtree from tempfile import mkdtemp -from typing import Dict, Iterable, Optional +from typing import Dict, Iterable, List, Optional import billiard @@ -44,6 +44,7 @@ Revision, RevisionType, SkippedContent, + Sha1Git, Snapshot, SnapshotBranch, TargetType, @@ -437,20 +438,19 @@ """Compute directories to load """ - dirs = {} + dirs: Dict[Sha1Git, Directory] = {} self.num_directories = 0 for _, _, new_dirs in self.load_directories(): for d in new_dirs: self.num_directories += 1 dirs[d["id"]] = Directory.from_dict(d) - missing_dirs = list(dirs.keys()) + missing_dirs: List[Sha1Git] = list(dirs.keys()) if missing_dirs: - missing_dirs = self.storage.directory_missing(missing_dirs) + missing_dirs = list(self.storage.directory_missing(missing_dirs)) for _id in missing_dirs: yield dirs[_id] - dirs = {} def get_revisions(self) -> Iterable[Revision]: """Compute revisions to load