D3393.diff
No OneTemporary
Actions

Size

1 KB

Subscribers

None

D3393.diff
View Options

	diff --git a/requirements-swh.txt b/requirements-swh.txt
	--- a/requirements-swh.txt
	+++ b/requirements-swh.txt
	@@ -1,4 +1,4 @@
	swh.storage >= 0.7.0
	-swh.model >= 0.3.5
	+swh.model >= 0.3.7
	swh.scheduler >= 0.0.39
	swh.loader.core >= 0.3.2
	diff --git a/swh/loader/svn/ra.py b/swh/loader/svn/ra.py
	--- a/swh/loader/svn/ra.py
	+++ b/swh/loader/svn/ra.py
	@@ -454,24 +454,7 @@

	"""
	self.replay(rev)
	- # TODO: Move this listing up in swh.model
	- contents: List[Content] = []
	- skipped_contents: List[SkippedContent] = []
	- directories: List[Directory] = []
	- for obj in self.directory.iter_tree():
	- obj = obj.to_model()
	- obj_type = obj.object_type
	- if obj_type in ("content_file", "content"):
	- obj = obj.with_data()
	- contents.append(obj)
	- elif obj_type == "skipped_content":
	- skipped_contents.append(obj)
	- elif obj_type == "directory":
	- directories.append(obj)
	- else:
	- raise TypeError(f"Unexpected content type from disk: {obj}")
	-
	- return contents, skipped_contents, directories
	+ return from_disk.iter_directory(self.directory)


	@click.command()