diff --git a/swh/loader/svn/ra.py b/swh/loader/svn/ra.py
index 8a51c49..c9d0440d88496f 100644
--- a/swh/loader/svn/ra.py
+++ b/swh/loader/svn/ra.py
@@ -11,6 +11,7 @@ from __future__ import annotations
import codecs
import dataclasses
+import logging
import os
import shutil
import tempfile
@@ -28,7 +29,8 @@ from typing import (
)
import click
-from subvertpy import delta, properties
+from subvertpy import SubversionException, delta, properties
+from subvertpy.client import Client
from subvertpy.ra import Auth, RemoteAccess, get_username_provider
from swh.model import from_disk, hashutil
@@ -39,6 +41,8 @@ if TYPE_CHECKING:
_eol_style = {"native": b"\n", "CRLF": b"\r\n", "LF": b"\n", "CR": b"\r"}
+logger = logging.getLogger(__name__)
+
def _normalize_line_endings(lines: bytes, eol_style: str = "native") -> bytes:
r"""Normalize line endings to unix (\\n), windows (\\r\\n) or mac (\\r).
@@ -196,6 +200,10 @@ class FileEditor:
self.svnrepo = svnrepo
def change_prop(self, key: str, value: str) -> None:
+ logger.debug(
+ f"Setting property '{key}' with value '{value}' "
+ f"on path '{self.path}' detected."
+ )
if key == properties.PROP_EXECUTABLE:
if value is None: # bit flip off
self.state.executable = NOEXEC_FLAG
@@ -332,3741 +340,2631 @@ class FileEditor:
self.directory[self.path] = from_disk.Content.from_file(path=self.fullpath)
-class BaseDirEditor:
- """Base class implementation of dir editor.
-
- see :class:`DirEditor` for an implementation that hashes every
- directory encountered.
-
- Instantiate a new class inheriting from this class and define the following
- functions::
-
- def update_checksum(self):
- # Compute the checksums at current state
-
- def open_directory(self, *args):
- # Update an existing folder.
+class DirEditor:
+ """Directory Editor in charge of updating directory hashes computation.
- def add_directory(self, *args):
- # Add a new one.
+ This implementation includes empty folder in the hash computation.
"""
- __slots__ = ["directory", "rootpath", "svnrepo"]
+ __slots__ = ["directory", "rootpath", "path", "file_states", "svnrepo", "externals"]
def __init__(
self,
directory: from_disk.Directory,
rootpath: bytes,
+ path: bytes,
file_states: Dict[bytes, FileState],
svnrepo: SvnRepo,
):
self.directory = directory
self.rootpath = rootpath
+ self.path = path
# build directory on init
os.makedirs(rootpath, exist_ok=True)
self.file_states = file_states
self.svnrepo = svnrepo
+ self.externals: List[Tuple[str, str]] = []
def remove_child(self, path: bytes) -> None:
"""Remove a path from the current objects.
@@ -400,14 +3978,45 @@ class BaseDirEditor:
if state_path.startswith(fullpath + b"/"):
del self.file_states[state_path]
- def update_checksum(self):
- raise NotImplementedError("This should be implemented.")
+ def update_checksum(self) -> None:
+ """Update the root path self.path's checksums according to the
+ children's objects.
+
- def open_directory(self, *args):
- raise NotImplementedError("This should be implemented.")
+ This function is expected to be called when the folder has
+ been completely 'walked'.
+
+ """
+ pass
- def openadd_directory(self, path: str, *args):
- raise NotImplementedError("This should be implemented.")
+ def open_directory(self, path: str, *args) -> DirEditor:
+ """Updating existing directory.
- def add_directory(self, path: str, *args):
- raise NotImplementedError("This should be implemented.")+
+ """
+ return DirEditor(
+ self.directory,
+ self.rootpath,
+ os.fsencode(path),
+ self.file_states,
+ svnrepo=self.svnrepo,
+ )
+
+ def add_directory(self, path: str, *args) -> DirEditor:
+ """Adding a new directory.
+
+ """
+ path_bytes = os.fsencode(path)
+ try:
+ os.makedirs(os.path.join(self.rootpath, path_bytes))
+ self.directory[path_bytes] = from_disk.Directory()
+ except FileExistsError:
+ pass
+ return DirEditor(
+ self.directory,
+ self.rootpath,
+ path_bytes,
+ self.file_states,
+ svnrepo=self.svnrepo,
+ )
def open_file(self, *args) -> FileEditor:
"""Updating existing file.
@@ -445,7 +473,484,23 @@ class BaseDirEditor:
"""
if key == properties.PROP_EXTERNALS:
- raise ValueError("Property '%s' detected. Not implemented yet." % key)
+ logger.debug(
+ f"Setting property '{key}' with value '{value}' "
+ f"on path '{self.path}' detected."
+ )
+ for external_line in value.split("\n"):
+ external_line = external_line.rstrip("\r")
+ if not external_line:
+ continue
+ logger.debug(external_line)
+ path = None
+ remote_url = None
+ # revision = None
+ for external_token in " ".join(external_line.split()).split(" "):
+ if external_token.startswith(("http://", "https://", "svn://")):
+ remote_url = external_token
+ else:
+ path = external_token
+ logger.debug("%s %s"self.externals.append((remote_url, path))
def delete_entry(self, path: str, remote_url)revision: int) -> None:
"""Remove a path.
@@ -459,42 +504,35 @@ class BaseDirEditor:
+ try:"""Function called when we finish walking a repository.
+
auth = Auth([get_username_provider()]) """
+ client = Client(auth=auth)for remote_url, path in self.externals:
+ fullpath = os.path.join(self.rootpathlogger.debug("%s %s", self.path, path.encode()remote_url)
+ client.export(try:
+ remote_url.encode(),auth = Auth([get_username_provider()])
+ to=fullpath,client = Client(auth=auth)
+ ignore_keywords=True,fullpath = os.path.join(self.rootpath, self.path, path.encode())
+ overwrite=True,client.export(
+ )remote_url.encode(),
+ dest_path = to=fullpath.encode(),
+ dest_path_split = dest_path.split(b"/")ignore_keywords=True,
+ current_path = self.pathoverwrite=True,
+ for subpath in dest_path_split[:-1]:)
+ currendest_path = os.path.join(current_path, subpathencode()
+ if currendest_path_split = dest_path not in self.directory:.split(b"/")
+ self.directory[current_path] = from_disk.Directory() = self.path
+ self.directory[for subpath in dest_path_split[:-1]:
+ oscurrent_path = os.path.join(self.current_path, dest_subpath)
+ ] = from_disk.Directory.from_disk(path=fullpath)if current_path not in self.directory:
+ except SubversionException as se: self.directory[current_path] = from_disk.Directory()
+ # external no longer availableself.directory[
+ logger.debug(seos.path.join(self.path, dest_path)
+ pass] = from_disk.Directory.from_disk(path=fullpath)
+ def delete_entry(self, path: str, revi except Subversion: int) -> None:Exception as se:
+ """Remove a path.# external no longer available
+ logger.debug(se)
@@ -462,39 +531,6 @@ class BaseDirEditor:+ pass
self.update_checksum()
-class DirEditor(BaseDirEditor):
- """Directory Editor in charge of updating directory hashes computation.
-
- This implementation includes empty folder in the hash computation.
-
- """
-
- def update_checksum(self) -> None:
- """Update the root path self.path's checksums according to the
- children's objects.
-
- This function is expected to be called when the folder has
- been completely 'walked'.
-
- """
- pass
-
- def open_directory(self, *args) -> DirEditor:
- """Updating existing directory.
-
- """
- return self
-
- def add_directory(self, path: str, *args) -> DirEditor:
- """Adding a new directory.
-
- """
- path_bytes = os.fsencode(path)
- os.makedirs(os.path.join(self.rootpath, path_bytes), exist_ok=True)
- self.directory[path_bytes] = from_disk.Directory()
- return self
-
-
class Editor:
"""Editor in charge of replaying svn events and computing objects
along.
@@ -526,6 +5624,7 @@ class Editor:
return DirEditor(
self.directory,
rootpath=self.rootpath,
+ path=b"",
file_states=self.file_states,
svnrepo=self.svnrepo,
)