diff --git a/swh/loader/svn/loader.py b/swh/loader/svn/loader.py --- a/swh/loader/svn/loader.py +++ b/swh/loader/svn/loader.py @@ -232,13 +232,10 @@ parents = swh_rev.parents assert self.svnrepo is not None - hash_data_per_revs = self.svnrepo.swh_hash_data_at_revision(revision_start) - - rev = revision_start - commit, root_dir = list(hash_data_per_revs)[0] + commit, root_dir = self.svnrepo.swh_hash_data_at_revision(revision_start) dir_id = root_dir.hash - swh_revision = self.build_swh_revision(rev, commit, dir_id, parents) + swh_revision = self.build_swh_revision(revision_start, commit, dir_id, parents) swh_revision_id = swh_revision.id return swh_revision_id == revision_id diff --git a/swh/loader/svn/svn.py b/swh/loader/svn/svn.py --- a/swh/loader/svn/svn.py +++ b/swh/loader/svn/svn.py @@ -261,7 +261,7 @@ def swh_hash_data_at_revision( self, revision: int - ) -> Iterator[Tuple[Dict, DirectoryFromDisk]]: + ) -> Tuple[Dict, DirectoryFromDisk]: """Compute the information at a given svn revision. This is expected to be used for checks only. @@ -282,7 +282,7 @@ # Clean export directory self.clean_fs(local_dirname) - yield commit, directory + return commit, directory def clean_fs(self, local_dirname: Optional[str] = None) -> None: """Clean up the local working copy.