diff --git a/swh/loader/svn/replay.py b/swh/loader/svn/replay.py index 96987ee..956d849 100644 --- a/swh/loader/svn/replay.py +++ b/swh/loader/svn/replay.py @@ -1,1021 +1,1056 @@ # Copyright (C) 2016-2022 The Software Heritage developers # See the AUTHORS file at the top-level directory of this distribution # License: GNU General Public License version 3, or any later version # See top-level LICENSE file for more information """Remote Access client to svn server. """ from __future__ import annotations import codecs from collections import defaultdict from dataclasses import dataclass, field from distutils.dir_util import copy_tree from itertools import chain import logging import os import shutil import tempfile from typing import ( TYPE_CHECKING, Any, BinaryIO, Callable, Dict, List, Optional, Set, Tuple, Union, cast, ) import click from subvertpy import SubversionException, delta, properties from subvertpy.ra import Auth, RemoteAccess, get_username_provider from swh.model import from_disk, hashutil from swh.model.from_disk import DiskBackedContent from swh.model.model import Content, Directory, SkippedContent if TYPE_CHECKING: from swh.loader.svn.svn import SvnRepo from swh.loader.svn.utils import ( is_recursive_external, parse_external_definition, svn_urljoin, ) _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). Args: lines: The lines to normalize eol_style: The line ending format as defined for svn:eol-style property. Acceptable values are 'native', 'CRLF', 'LF' and 'CR' Returns: Lines with endings normalized """ if eol_style in _eol_style: lines = lines.replace(_eol_style["CRLF"], _eol_style["LF"]).replace( _eol_style["CR"], _eol_style["LF"] ) if _eol_style[eol_style] != _eol_style["LF"]: lines = lines.replace(_eol_style["LF"], _eol_style[eol_style]) return lines def apply_txdelta_handler( sbuf: bytes, target_stream: BinaryIO ) -> Callable[[Any, bytes, BinaryIO], None]: """Return a function that can be called repeatedly with txdelta windows. When done, closes the target_stream. Adapted from subvertpy.delta.apply_txdelta_handler to close the stream when done. Args: sbuf: Source buffer target_stream: Target stream to write to. Returns: Function to be called to apply txdelta windows """ def apply_window( window: Any, sbuf: bytes = sbuf, target_stream: BinaryIO = target_stream ): if window is None: target_stream.close() return # Last call patch = delta.apply_txdelta_window(sbuf, window) target_stream.write(patch) return apply_window def read_svn_link(data: bytes) -> Tuple[bytes, bytes]: """Read the svn link's content. Args: data: svn link's raw content Returns: The tuple of (filetype, destination path) """ split_byte = b" " first_line = data.split(b"\n")[0] filetype, *src = first_line.split(split_byte) target = split_byte.join(src) return filetype, target def is_file_an_svnlink_p(fullpath: bytes) -> Tuple[bool, bytes]: """Determine if a filepath is an svnlink or something else. Args: fullpath: Full path to the potential symlink to check Returns: Tuple containing a boolean value to determine if it's indeed a symlink (as per svn) and the link target. """ if os.path.islink(fullpath): return False, b"" with open(fullpath, "rb") as f: filetype, src = read_svn_link(f.read()) return filetype == b"link", src def _ra_codecs_error_handler(e: UnicodeError) -> Tuple[Union[str, bytes], int]: """Subvertpy may fail to decode to utf-8 the user svn properties. As they are not used by the loader, return an empty string instead of the decoded content. Args: e: exception raised during the svn properties decoding. """ return "", cast(UnicodeDecodeError, e).end DEFAULT_FLAG = 0 EXEC_FLAG = 1 NOEXEC_FLAG = 2 SVN_PROPERTY_EOL = "svn:eol-style" @dataclass class FileState: """Persists some file states (eg. end of lines style) across revisions while replaying them.""" eol_style: Optional[str] = None """EOL state check mess""" svn_special_path_non_link_data: Optional[bytes] = None """keep track of non link file content with svn:special property set""" # default value: 0, 1: set the flag, 2: remove the exec flag executable: int = DEFAULT_FLAG """keep track if file is executable when setting svn:executable property""" link: bool = False """keep track if file is a svn link when setting svn:special property""" class FileEditor: """File Editor in charge of updating file on disk and memory objects.""" __slots__ = [ "directory", "path", "fullpath", "executable", "link", "state", "svnrepo", "editor", ] def __init__( self, directory: from_disk.Directory, rootpath: bytes, path: bytes, state: FileState, svnrepo: SvnRepo, ): self.directory = directory self.path = path self.fullpath = os.path.join(rootpath, path) self.state = state self.svnrepo = svnrepo self.editor = svnrepo.swhreplay.editor def change_prop(self, key: str, value: str) -> None: if key == properties.PROP_EXECUTABLE: if value is None: # bit flip off self.state.executable = NOEXEC_FLAG else: self.state.executable = EXEC_FLAG elif key == properties.PROP_SPECIAL: # Possibly a symbolic link. We cannot check further at # that moment though, patch(s) not being applied yet self.state.link = value is not None elif key == SVN_PROPERTY_EOL: # backup end of line style for file self.state.eol_style = value def __make_symlink(self, src: bytes) -> None: """Convert the svnlink to a symlink on disk. This function expects self.fullpath to be a svn link. Args: src: Path to the link's source Return: tuple: The svnlink's data tuple: - type (should be only 'link') - """ os.remove(self.fullpath) os.symlink(src=src, dst=self.fullpath) def __make_svnlink(self) -> bytes: """Convert the symlink to a svnlink on disk. Return: The symlink's svnlink data (``b'type '``) """ # we replace the symlink by a svnlink # to be able to patch the file on future commits src = os.readlink(self.fullpath) os.remove(self.fullpath) sbuf = b"link " + src with open(self.fullpath, "wb") as f: f.write(sbuf) return sbuf def apply_textdelta(self, base_checksum) -> Callable[[Any, bytes, BinaryIO], None]: # if the filepath matches an external, do not apply local patch if self.path in self.editor.external_paths: return lambda *args: None if os.path.lexists(self.fullpath): if os.path.islink(self.fullpath): # svn does not deal with symlink so we transform into # real svn symlink for potential patching in later # commits sbuf = self.__make_svnlink() self.state.link = True else: with open(self.fullpath, "rb") as f: sbuf = f.read() else: sbuf = b"" t = open(self.fullpath, "wb") return apply_txdelta_handler(sbuf, target_stream=t) def close(self) -> None: """When done with the file, this is called. So the file exists and is updated, we can: - adapt accordingly its execution flag if any - compute the objects' checksums - replace the svnlink with a real symlink (for disk computation purposes) """ if self.state.link: # can only check now that the link is a real one # since patch has been applied is_link, src = is_file_an_svnlink_p(self.fullpath) if is_link: self.__make_symlink(src) elif not os.path.isdir(self.fullpath): # not a real link ... # when a file with the svn:special property set is not a svn link, # the svn export operation might extract a truncated version of it # if it is a binary file, so ensure to produce the same file as the # export operation. with open(self.fullpath, "rb") as f: content = f.read() self.svnrepo.export( os.path.join(self.svnrepo.remote_url.encode(), self.path), to=self.fullpath, peg_rev=self.editor.revnum, ignore_keywords=True, overwrite=True, ) with open(self.fullpath, "rb") as f: exported_data = f.read() if exported_data != content: # keep track of original file content in order to restore # it if the svn:special property gets unset in another revision self.state.svn_special_path_non_link_data = content elif os.path.islink(self.fullpath): # path was a symbolic link in previous revision but got the property # svn:special unset in current one, revert its content to svn link format self.__make_svnlink() elif self.state.svn_special_path_non_link_data is not None: # path was a non link file with the svn:special property previously set # and got truncated on export, restore its original content with open(self.fullpath, "wb") as f: f.write(self.state.svn_special_path_non_link_data) self.state.svn_special_path_non_link_data = None is_link = os.path.islink(self.fullpath) if not is_link: # if a link, do nothing regarding flag if self.state.executable == EXEC_FLAG: os.chmod(self.fullpath, 0o755) elif self.state.executable == NOEXEC_FLAG: os.chmod(self.fullpath, 0o644) # And now compute file's checksums if self.state.eol_style and not is_link: # ensure to normalize line endings as defined by svn:eol-style # property to get the same file checksum as after an export # or checkout operation with subversion with open(self.fullpath, "rb") as f: data = f.read() data = _normalize_line_endings(data, self.state.eol_style) mode = os.lstat(self.fullpath).st_mode self.directory[self.path] = from_disk.Content.from_bytes( mode=mode, data=data ) else: self.directory[self.path] = from_disk.Content.from_file(path=self.fullpath) ExternalDefinition = Tuple[str, Optional[int], bool] @dataclass class DirState: """Persists some directory states (eg. externals) across revisions while replaying them.""" externals: Dict[str, List[ExternalDefinition]] = field(default_factory=dict) """Map a path in the directory to a list of (external_url, revision, relative_url) targeting it""" + externals_paths: Set[bytes] = field(default_factory=set) + """Keep track of all external paths reachable from the directory""" class DirEditor: """Directory Editor in charge of updating directory hashes computation. This implementation includes empty folder in the hash computation. """ __slots__ = [ "directory", "rootpath", "path", "file_states", "dir_states", "svnrepo", "editor", "externals", ] def __init__( self, directory: from_disk.Directory, rootpath: bytes, path: bytes, file_states: Dict[bytes, FileState], dir_states: Dict[bytes, DirState], 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.dir_states = dir_states self.svnrepo = svnrepo self.editor = svnrepo.swhreplay.editor self.externals: Dict[str, List[ExternalDefinition]] = {} def remove_child(self, path: bytes) -> None: """Remove a path from the current objects. The path can be resolved as link, file or directory. This function takes also care of removing the link between the child and the parent. Args: path: to remove from the current objects. """ - try: + if path in self.directory: entry_removed = self.directory[path] - except KeyError: - entry_removed = None - else: del self.directory[path] fpath = os.path.join(self.rootpath, path) if isinstance(entry_removed, from_disk.Directory): shutil.rmtree(fpath) else: os.remove(fpath) # when deleting a directory ensure to remove any svn property for the # file it contains as they can be added again later in another revision # without the same property set fullpath = os.path.join(self.rootpath, path) for state_path in list(self.file_states): if state_path.startswith(fullpath + b"/"): del self.file_states[state_path] def open_directory(self, path: str, *args) -> DirEditor: """Updating existing directory.""" return DirEditor( self.directory, rootpath=self.rootpath, path=os.fsencode(path), file_states=self.file_states, dir_states=self.dir_states, svnrepo=self.svnrepo, ) 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) if path_bytes and path_bytes not in self.directory: self.dir_states[path_bytes] = DirState() self.directory[path_bytes] = from_disk.Directory() return DirEditor( self.directory, self.rootpath, path_bytes, self.file_states, self.dir_states, svnrepo=self.svnrepo, ) def open_file(self, path: str, *args) -> FileEditor: """Updating existing file.""" path_bytes = os.fsencode(path) self.directory[path_bytes] = from_disk.Content() fullpath = os.path.join(self.rootpath, path_bytes) return FileEditor( self.directory, rootpath=self.rootpath, path=path_bytes, state=self.file_states[fullpath], svnrepo=self.svnrepo, ) def add_file(self, path: str, *args) -> FileEditor: """Creating a new file.""" path_bytes = os.fsencode(path) self.directory[path_bytes] = from_disk.Content() fullpath = os.path.join(self.rootpath, path_bytes) self.file_states[fullpath] = FileState() return FileEditor( self.directory, self.rootpath, path_bytes, state=self.file_states[fullpath], svnrepo=self.svnrepo, ) def change_prop(self, key: str, value: str) -> None: """Change property callback on directory.""" if key == properties.PROP_EXTERNALS: logger.debug( "Setting '%s' property with value '%s' on path %s", key, value, self.path, ) self.externals = defaultdict(list) if value is not None: try: # externals are set on that directory path, parse and store them # for later processing in the close method for external in value.split("\n"): external = external.rstrip("\r") # skip empty line or comment if not external or external.startswith("#"): continue ( path, external_url, revision, relative_url, ) = parse_external_definition( external, os.fsdecode(self.path), self.svnrepo.origin_url ) self.externals[path].append( (external_url, revision, relative_url) ) except ValueError: logger.debug( "Failed to parse external: %s\n" "Externals defined on path %s will not be processed", external, self.path, ) # as the official subversion client, do not process externals in case # of parsing error self.externals = {} if not self.externals: # externals might have been unset on that directory path, # remove associated paths from the reconstructed filesystem externals = self.dir_states[self.path].externals for path in externals.keys(): self.remove_external_path(os.fsencode(path)) self.dir_states[self.path].externals = {} def delete_entry(self, path: str, revision: int) -> None: """Remove a path.""" path_bytes = os.fsencode(path) + fullpath = os.path.join(self.rootpath, path_bytes) + + if os.path.isdir(fullpath): + # remove all external paths associated to the removed directory + # (we cannot simply remove a root external directory as externals + # paths associated to ancestor directories can overlap) + for external_path in self.dir_states[path_bytes].externals_paths: + self.remove_external_path( + external_path, + root_path=path_bytes, + remove_subpaths=False, + force=True, + ) + if path_bytes not in self.editor.external_paths: - fullpath = os.path.join(self.rootpath, path_bytes) self.file_states.pop(fullpath, None) self.remove_child(path_bytes) + elif os.path.isdir(fullpath): + # versioned and external paths can overlap so we need to iterate on + # all subpaths to check which ones to remove + for root, dirs, files in os.walk(fullpath): + for p in chain(dirs, files): + full_repo_path = os.path.join(root, p) + repo_path = full_repo_path.replace(self.rootpath + b"/", b"") + if repo_path not in self.editor.external_paths: + self.file_states.pop(full_repo_path, None) + self.remove_child(repo_path) def close(self): """Function called when we finish processing a repository. SVN external definitions are processed by it. """ prev_externals = self.dir_states[self.path].externals if self.externals: # externals definition list might have changed in the current replayed # revision, we need to determine if some were removed and delete the # associated paths externals = self.externals prev_externals_set = { (path, url, rev) for path in prev_externals.keys() for (url, rev, _) in prev_externals[path] } externals_set = { (path, url, rev) for path in externals.keys() for (url, rev, _) in externals[path] } old_externals = prev_externals_set - externals_set for path, _, _ in old_externals: self.remove_external_path(os.fsencode(path)) else: # some external paths might have been removed in the current replayed # revision by a delete operation on an overlapping versioned path so we # need to restore them externals = prev_externals # For each external, try to export it in reconstructed filesystem for path, externals_def in externals.items(): for i, external in enumerate(externals_def): external_url, revision, relative_url = external self.process_external( path, external_url, revision, relative_url, remove_target_path=i == 0, ) # backup externals in directory state if self.externals: self.dir_states[self.path].externals = self.externals # do operations below only when closing the root directory if self.path == b"": self.svnrepo.has_relative_externals = any( relative_url for (_, relative_url) in self.editor.valid_externals.values() ) self.svnrepo.has_recursive_externals = any( is_recursive_external( self.svnrepo.origin_url, os.fsdecode(path), external_path, external_url, ) for path, dir_state in self.dir_states.items() for external_path in dir_state.externals.keys() for (external_url, _, _) in dir_state.externals[external_path] ) if self.svnrepo.has_recursive_externals: # If the repository has recursive externals, we stop processing # externals and remove those already exported, # We will then ignore externals when exporting the revision to # check for divergence with the reconstructed filesystem. for external_path in list(self.editor.external_paths): self.remove_external_path(external_path, force=True) def process_external( self, path: str, external_url: str, revision: Optional[int], relative_url: bool, remove_target_path: bool = True, ) -> None: external = (external_url, revision, relative_url) dest_path = os.fsencode(path) dest_fullpath = os.path.join(self.path, dest_path) prev_externals = self.dir_states[self.path].externals if ( path in prev_externals and external in prev_externals[path] and dest_fullpath in self.directory ): # external already exported, nothing to do return if is_recursive_external( self.svnrepo.origin_url, os.fsdecode(self.path), path, external_url ): # recursive external, skip it return logger.debug( "Exporting external %s%s to path %s", external_url, f"@{revision}" if revision else "", dest_fullpath, ) if external not in self.editor.externals_cache: try: # try to export external in a temporary path, destination path could # be versioned and must be overridden only if the external URL is # still valid temp_dir = os.fsencode( tempfile.mkdtemp(dir=self.editor.externals_cache_dir) ) temp_path = os.path.join(temp_dir, dest_path) os.makedirs(b"/".join(temp_path.split(b"/")[:-1]), exist_ok=True) if external_url not in self.editor.dead_externals: url = external_url.rstrip("/") origin_url = self.svnrepo.origin_url.rstrip("/") if ( url.startswith(origin_url + "/") and not self.svnrepo.has_relative_externals ): url = url.replace(origin_url, self.svnrepo.remote_url) self.svnrepo.export( url, to=temp_path, peg_rev=revision, ignore_keywords=True, ) self.editor.externals_cache[external] = temp_path except SubversionException as se: # external no longer available (404) logger.debug(se) self.editor.dead_externals.add(external_url) else: temp_path = self.editor.externals_cache[external] # subversion export will always create the subdirectories of the external # path regardless the validity of the remote URL dest_path_split = dest_path.split(b"/") current_path = self.path self.add_directory(os.fsdecode(current_path)) for subpath in dest_path_split[:-1]: current_path = os.path.join(current_path, subpath) self.add_directory(os.fsdecode(current_path)) if os.path.exists(temp_path): # external successfully exported if remove_target_path: # remove previous path in from_disk model self.remove_external_path(dest_path, remove_subpaths=False) # mark external as valid self.editor.valid_externals[dest_fullpath] = ( external_url, relative_url, ) # copy exported path to reconstructed filesystem fullpath = os.path.join(self.rootpath, dest_fullpath) - # update from_disk model and store external paths - self.editor.external_paths[dest_fullpath] += 1 - if os.path.isfile(temp_path): if os.path.islink(fullpath): # remove destination file if it is a link os.remove(fullpath) shutil.copy(os.fsdecode(temp_path), os.fsdecode(fullpath)) self.directory[dest_fullpath] = from_disk.Content.from_file( path=fullpath ) else: self.add_directory(os.fsdecode(dest_fullpath)) # copy_tree needs sub-directories to exist in destination for root, dirs, files in os.walk(temp_path): for dir in dirs: temp_dir_fullpath = os.path.join(root, dir) if os.path.islink(temp_dir_fullpath): # do not create folder if it's a link or copy_tree will fail continue subdir = temp_dir_fullpath.replace(temp_path + b"/", b"") self.add_directory( os.fsdecode(os.path.join(dest_fullpath, subdir)) ) copy_tree( os.fsdecode(temp_path), os.fsdecode(fullpath), preserve_symlinks=True, ) # TODO: replace code above by the line below once we use Python >= 3.8 in production # noqa # shutil.copytree(temp_path, fullpath, symlinks=True, dirs_exist_ok=True) # noqa self.directory[dest_fullpath] = from_disk.Directory.from_disk( path=fullpath ) - external_paths = set() - for root, dirs, files in os.walk(fullpath): - external_paths.update( - [ - os.path.join(root.replace(self.rootpath + b"/", b""), p) - for p in chain(dirs, files) - ] - ) - for external_path in external_paths: - self.editor.external_paths[external_path] += 1 + + # update set of external paths reachable from the directory + external_paths = set() + dest_path_part = dest_path.split(b"/") + for i in range(1, len(dest_path_part) + 1): + external_paths.add(b"/".join(dest_path_part[:i])) + + for root, dirs, files in os.walk(temp_path): + external_paths.update( + [ + os.path.join( + dest_path, + os.path.join(root, p).replace(temp_path, b"").strip(b"/"), + ) + for p in chain(dirs, files) + ] + ) + + self.dir_states[self.path].externals_paths.update(external_paths) + + for external_path in external_paths: + self.editor.external_paths[os.path.join(self.path, external_path)] += 1 # ensure hash update for the directory with externals set self.directory[self.path].update_hash(force=True) def remove_external_path( - self, external_path: bytes, remove_subpaths: bool = True, force: bool = False + self, + external_path: bytes, + remove_subpaths: bool = True, + force: bool = False, + root_path: Optional[bytes] = None, ) -> None: """Remove a previously exported SVN external path from the reconstructed filesystem. """ - fullpath = os.path.join(self.path, external_path) + path = root_path if root_path else self.path + fullpath = os.path.join(path, external_path) # decrement number of references for external path when we really remove it # (when remove_subpaths is False, we just cleanup the external path before # copying exported paths in it) - if fullpath in self.editor.external_paths and remove_subpaths: + if force or (fullpath in self.editor.external_paths and remove_subpaths): self.editor.external_paths[fullpath] -= 1 if ( - force - or fullpath in self.editor.external_paths + fullpath in self.editor.external_paths and self.editor.external_paths[fullpath] == 0 ): self.remove_child(fullpath) self.editor.external_paths.pop(fullpath, None) self.editor.valid_externals.pop(fullpath, None) for path in list(self.editor.external_paths): if path.startswith(fullpath + b"/"): self.editor.external_paths[path] -= 1 if self.editor.external_paths[path] == 0: self.editor.external_paths.pop(path) if remove_subpaths: - subpath_split = external_path.split(b"/")[:-1] + subpath_split = fullpath.split(b"/")[:-1] for i in reversed(range(1, len(subpath_split) + 1)): # delete external sub-directory only if it is not versioned - subpath = os.path.join(self.path, b"/".join(subpath_split[0:i])) + subpath = b"/".join(subpath_split[0:i]) try: self.svnrepo.client.info( svn_urljoin(self.svnrepo.remote_url, os.fsdecode(subpath)), peg_revision=self.editor.revnum, revision=self.editor.revnum, ) except SubversionException: self.remove_child(subpath) else: break try: # externals can overlap with versioned files so we must restore # them after removing the path above dest_path = os.path.join(self.rootpath, fullpath) self.svnrepo.client.export( svn_urljoin(self.svnrepo.remote_url, os.fsdecode(fullpath)), to=dest_path, peg_rev=self.editor.revnum, ignore_keywords=True, ) if os.path.isfile(dest_path) or os.path.islink(dest_path): self.directory[fullpath] = from_disk.Content.from_file(path=dest_path) else: self.directory[fullpath] = from_disk.Directory.from_disk(path=dest_path) except SubversionException: pass class Editor: """Editor in charge of replaying svn events and computing objects along. This implementation accounts for empty folder during hash computations. """ def __init__( self, rootpath: bytes, directory: from_disk.Directory, svnrepo: SvnRepo, temp_dir: str, ): self.rootpath = rootpath self.directory = directory self.file_states: Dict[bytes, FileState] = defaultdict(FileState) self.dir_states: Dict[bytes, DirState] = defaultdict(DirState) self.external_paths: Dict[bytes, int] = defaultdict(int) self.valid_externals: Dict[bytes, Tuple[str, bool]] = {} self.dead_externals: Set[str] = set() self.externals_cache_dir = tempfile.mkdtemp(dir=temp_dir) self.externals_cache: Dict[ExternalDefinition, bytes] = {} self.svnrepo = svnrepo self.revnum = None def set_target_revision(self, revnum) -> None: self.revnum = revnum def abort(self) -> None: pass def close(self) -> None: pass def open_root(self, base_revnum: int) -> DirEditor: return DirEditor( self.directory, rootpath=self.rootpath, path=b"", file_states=self.file_states, dir_states=self.dir_states, svnrepo=self.svnrepo, ) class Replay: """Replay class.""" def __init__( self, conn: RemoteAccess, rootpath: bytes, svnrepo: SvnRepo, temp_dir: str, directory: Optional[from_disk.Directory] = None, ): self.conn = conn self.rootpath = rootpath if directory is None: directory = from_disk.Directory() self.directory = directory self.editor = Editor( rootpath=rootpath, directory=directory, svnrepo=svnrepo, temp_dir=temp_dir ) def replay(self, rev: int) -> from_disk.Directory: """Replay svn actions between rev and rev+1. This method updates in place the self.editor.directory, as well as the filesystem. Returns: The updated root directory """ codecs.register_error("strict", _ra_codecs_error_handler) self.conn.replay(rev, rev + 1, self.editor) codecs.register_error("strict", codecs.strict_errors) return self.editor.directory def compute_objects( self, rev: int ) -> Tuple[List[Content], List[SkippedContent], List[Directory]]: """Compute objects added or modified at revisions rev. Expects the state to be at previous revision's objects. Args: rev: The revision to start the replay from. Returns: The updated objects between rev and rev+1. Beware that this mutates the filesystem at rootpath accordingly. """ self.replay(rev) contents: List[Content] = [] skipped_contents: List[SkippedContent] = [] directories: List[Directory] = [] for obj_node in self.directory.collect(): obj = obj_node.to_model() # type: ignore obj_type = obj.object_type if obj_type in (Content.object_type, DiskBackedContent.object_type): contents.append(obj.with_data()) elif obj_type == SkippedContent.object_type: skipped_contents.append(obj) elif obj_type == Directory.object_type: directories.append(obj) else: assert False, obj_type return contents, skipped_contents, directories @click.command() @click.option("--local-url", default="/tmp", help="local svn working copy") @click.option( "--svn-url", default="file:///home/storage/svn/repos/pkg-fox", help="svn repository's url.", ) @click.option( "--revision-start", default=1, type=click.INT, help="svn repository's starting revision.", ) @click.option( "--revision-end", default=-1, type=click.INT, help="svn repository's ending revision.", ) @click.option( "--debug/--nodebug", default=True, help="Indicates if the server should run in debug mode.", ) @click.option( "--cleanup/--nocleanup", default=True, help="Indicates whether to cleanup disk when done or not.", ) def main(local_url, svn_url, revision_start, revision_end, debug, cleanup): """Script to present how to use Replay class.""" conn = RemoteAccess(svn_url.encode("utf-8"), auth=Auth([get_username_provider()])) os.makedirs(local_url, exist_ok=True) rootpath = tempfile.mkdtemp( prefix=local_url, suffix="-" + os.path.basename(svn_url) ) rootpath = os.fsencode(rootpath) # Do not go beyond the repository's latest revision revision_end_max = conn.get_latest_revnum() if revision_end == -1: revision_end = revision_end_max revision_end = min(revision_end, revision_end_max) try: replay = Replay(conn, rootpath) for rev in range(revision_start, revision_end + 1): contents, skipped_contents, directories = replay.compute_objects(rev) print( "r%s %s (%s new contents, %s new directories)" % ( rev, hashutil.hash_to_hex(replay.directory.hash), len(contents) + len(skipped_contents), len(directories), ) ) if debug: print("%s" % rootpath.decode("utf-8")) finally: if cleanup: if os.path.exists(rootpath): shutil.rmtree(rootpath) if __name__ == "__main__": main() diff --git a/swh/loader/svn/tests/test_externals.py b/swh/loader/svn/tests/test_externals.py index 3ac938f..4610588 100644 --- a/swh/loader/svn/tests/test_externals.py +++ b/swh/loader/svn/tests/test_externals.py @@ -1,1567 +1,1642 @@ # Copyright (C) 2022 The Software Heritage developers # See the AUTHORS file at the top-level directory of this distribution # License: GNU General Public License version 3, or any later version # See top-level LICENSE file for more information import pytest from swh.loader.svn.loader import SvnLoader, SvnLoaderFromRemoteDump from swh.loader.svn.utils import svn_urljoin from swh.loader.tests import assert_last_visit_matches, check_snapshot from .utils import CommitChange, CommitChangeType, add_commit, create_repo @pytest.fixture def external_repo_url(tmpdir_factory): # create a repository return create_repo(tmpdir_factory.mktemp("external")) def test_loader_with_valid_svn_externals( swh_storage, repo_url, external_repo_url, tmp_path ): # first commit on external add_commit( external_repo_url, "Create some directories and files in an external repository", [ CommitChange( change_type=CommitChangeType.AddOrUpdate, path="code/hello/hello-world", properties={"svn:executable": "*"}, data=b"#!/bin/bash\necho Hello World !", ), CommitChange( change_type=CommitChangeType.AddOrUpdate, path="foo.sh", properties={"svn:executable": "*"}, data=b"#!/bin/bash\necho foo", ), ], ) # first commit add_commit( repo_url, "Create repository structure.", [ CommitChange( change_type=CommitChangeType.AddOrUpdate, path="branches/", ), CommitChange( change_type=CommitChangeType.AddOrUpdate, path="tags/", ), CommitChange( change_type=CommitChangeType.AddOrUpdate, path="trunk/", ), CommitChange( change_type=CommitChangeType.AddOrUpdate, path="trunk/bar.sh", properties={"svn:executable": "*"}, data=b"#!/bin/bash\necho bar", ), ], ) # second commit add_commit( repo_url, ( "Set svn:externals property on trunk/externals path of repository to load." "One external targets a remote directory and another one a remote file." ), [ CommitChange( change_type=CommitChangeType.AddOrUpdate, path="trunk/externals/", properties={ "svn:externals": ( f"{svn_urljoin(external_repo_url, 'code/hello')} hello\n" f"{svn_urljoin(external_repo_url, 'foo.sh')} foo.sh\n" f"{svn_urljoin(repo_url, 'trunk/bar.sh')} bar.sh" ) }, ), ], ) # first load loader = SvnLoader(swh_storage, repo_url, temp_directory=tmp_path, check_revision=1) assert loader.load() == {"status": "eventful"} assert_last_visit_matches( loader.storage, repo_url, status="full", type="svn", ) check_snapshot(loader.snapshot, loader.storage) # third commit add_commit( repo_url, "Unset svn:externals property on trunk/externals path", [ CommitChange( change_type=CommitChangeType.AddOrUpdate, path="trunk/externals/", properties={"svn:externals": None}, ), ], ) # second load loader = SvnLoader(swh_storage, repo_url, temp_directory=tmp_path, check_revision=1) assert loader.load() == {"status": "eventful"} assert_last_visit_matches( loader.storage, repo_url, status="full", type="svn", ) check_snapshot(loader.snapshot, loader.storage) def test_loader_with_invalid_svn_externals(swh_storage, repo_url, tmp_path, mocker): # first commit add_commit( repo_url, "Create repository structure.", [ CommitChange( change_type=CommitChangeType.AddOrUpdate, path="branches/", ), CommitChange( change_type=CommitChangeType.AddOrUpdate, path="tags/", ), CommitChange( change_type=CommitChangeType.AddOrUpdate, path="trunk/", ), ], ) # second commit add_commit( repo_url, ( "Set svn:externals property on trunk/externals path of repository to load." "The externals URLs are not valid." ), [ CommitChange( change_type=CommitChangeType.AddOrUpdate, path="trunk/externals/", properties={ "svn:externals": ( "file:///tmp/invalid/svn/repo/hello hello\n" "file:///tmp/invalid/svn/repo/foo.sh foo.sh" ) }, ), ], ) loader = SvnLoader(swh_storage, repo_url, temp_directory=tmp_path, check_revision=1) assert loader.load() == {"status": "eventful"} assert_last_visit_matches( loader.storage, repo_url, status="full", type="svn", ) check_snapshot(loader.snapshot, loader.storage) def test_loader_with_valid_externals_modification( swh_storage, repo_url, external_repo_url, tmp_path ): # first commit on external add_commit( external_repo_url, "Create some directories and files in an external repository", [ CommitChange( change_type=CommitChangeType.AddOrUpdate, path="code/hello/hello-world", properties={"svn:executable": "*"}, data=b"#!/bin/bash\necho Hello World !", ), CommitChange( change_type=CommitChangeType.AddOrUpdate, path="code/bar/bar.sh", properties={"svn:executable": "*"}, data=b"#!/bin/bash\necho bar", ), CommitChange( change_type=CommitChangeType.AddOrUpdate, path="foo.sh", properties={"svn:executable": "*"}, data=b"#!/bin/bash\necho foo", ), ], ) # first commit add_commit( repo_url, ("Set svn:externals property on trunk/externals path of repository to load."), [ CommitChange( change_type=CommitChangeType.AddOrUpdate, path="trunk/externals/", properties={ "svn:externals": ( f"{svn_urljoin(external_repo_url, 'code/hello')} src/code/hello\n" # noqa f"{svn_urljoin(external_repo_url, 'foo.sh')} src/foo.sh\n" ) }, ), ], ) # second commit add_commit( repo_url, ( "Modify svn:externals property on trunk/externals path of repository to load." # noqa ), [ CommitChange( change_type=CommitChangeType.AddOrUpdate, path="trunk/externals/", properties={ "svn:externals": ( f"{svn_urljoin(external_repo_url, 'code/bar')} src/code/bar\n" # noqa f"{svn_urljoin(external_repo_url, 'foo.sh')} src/foo.sh\n" ) }, ), ], ) loader = SvnLoader(swh_storage, repo_url, temp_directory=tmp_path, check_revision=1) assert loader.load() == {"status": "eventful"} assert_last_visit_matches( loader.storage, repo_url, status="full", type="svn", ) check_snapshot(loader.snapshot, loader.storage) def test_loader_with_valid_externals_and_versioned_path( swh_storage, repo_url, external_repo_url, tmp_path ): # first commit on external add_commit( external_repo_url, "Create a file in an external repository", [ CommitChange( change_type=CommitChangeType.AddOrUpdate, path="code/script.sh", data=b"#!/bin/bash\necho Hello World !", ), ], ) # first commit add_commit( repo_url, "Add file with same name but different content in main repository", [ CommitChange( change_type=CommitChangeType.AddOrUpdate, path="trunk/script.sh", data=b"#!/bin/bash\necho foo", ), ], ) # second commit add_commit( repo_url, "Add externals targeting the versioned file", [ CommitChange( change_type=CommitChangeType.AddOrUpdate, path="trunk/", properties={ "svn:externals": ( f"{svn_urljoin(external_repo_url, 'code/script.sh')} script.sh" # noqa ) }, ), ], ) # third commit add_commit( repo_url, "Modify the versioned file", [ CommitChange( change_type=CommitChangeType.AddOrUpdate, path="trunk/script.sh", data=b"#!/bin/bash\necho bar", ), ], ) loader = SvnLoader(swh_storage, repo_url, temp_directory=tmp_path, check_revision=1) assert loader.load() == {"status": "eventful"} assert_last_visit_matches( loader.storage, repo_url, status="full", type="svn", ) check_snapshot(loader.snapshot, loader.storage) def test_loader_with_invalid_externals_and_versioned_path( swh_storage, repo_url, tmp_path ): # first commit add_commit( repo_url, "Add file in main repository", [ CommitChange( change_type=CommitChangeType.AddOrUpdate, path="trunk/script.sh", data=b"#!/bin/bash\necho foo", ), ], ) # second commit add_commit( repo_url, "Add invalid externals targeting the versioned file", [ CommitChange( change_type=CommitChangeType.AddOrUpdate, path="trunk/", properties={ "svn:externals": ( "file:///tmp/invalid/svn/repo/code/script.sh script.sh" ) }, ), ], ) loader = SvnLoader(swh_storage, repo_url, temp_directory=tmp_path, check_revision=1) assert loader.load() == {"status": "eventful"} assert_last_visit_matches( loader.storage, repo_url, status="full", type="svn", ) check_snapshot(loader.snapshot, loader.storage) def test_loader_set_externals_then_remove_and_add_as_local( swh_storage, repo_url, external_repo_url, tmp_path ): # first commit on external add_commit( external_repo_url, "Create a file in an external repository", [ CommitChange( change_type=CommitChangeType.AddOrUpdate, path="code/script.sh", data=b"#!/bin/bash\necho Hello World !", ), ], ) # first commit add_commit( repo_url, "Add trunk directory and set externals", [ CommitChange( change_type=CommitChangeType.AddOrUpdate, path="trunk/", properties={ "svn:externals": (f"{svn_urljoin(external_repo_url, 'code')} code") }, ), ], ) # second commit add_commit( repo_url, "Unset externals on trunk and add remote path as local path", [ CommitChange( change_type=CommitChangeType.AddOrUpdate, path="trunk/", properties={"svn:externals": None}, ), CommitChange( change_type=CommitChangeType.AddOrUpdate, path="trunk/code/script.sh", data=b"#!/bin/bash\necho Hello World !", ), ], ) loader = SvnLoader(swh_storage, repo_url, temp_directory=tmp_path, check_revision=1) assert loader.load() == {"status": "eventful"} assert_last_visit_matches( loader.storage, repo_url, status="full", type="svn", ) check_snapshot(loader.snapshot, loader.storage) def test_loader_set_invalid_externals_then_remove(swh_storage, repo_url, tmp_path): # first commit add_commit( repo_url, "Add trunk directory and set invalid external", [ CommitChange( change_type=CommitChangeType.AddOrUpdate, path="trunk/", properties={ "svn:externals": "file:///tmp/invalid/svn/repo/code external/code" }, ), ], ) # second commit add_commit( repo_url, "Unset externals on trunk", [ CommitChange( change_type=CommitChangeType.AddOrUpdate, path="trunk/", properties={"svn:externals": None}, ), ], ) loader = SvnLoader(swh_storage, repo_url, temp_directory=tmp_path, check_revision=1) assert loader.load() == {"status": "eventful"} assert_last_visit_matches( loader.storage, repo_url, status="full", type="svn", ) check_snapshot(loader.snapshot, loader.storage) def test_loader_set_externals_with_versioned_file_overlap( swh_storage, repo_url, external_repo_url, tmp_path ): # first commit on external add_commit( external_repo_url, "Create a file in an external repository", [ CommitChange( change_type=CommitChangeType.AddOrUpdate, path="code/script.sh", data=b"#!/bin/bash\necho Hello World !", ), ], ) # first commit add_commit( repo_url, "Add file with same name as in the external repository", [ CommitChange( change_type=CommitChangeType.AddOrUpdate, path="trunk/script.sh", data=b"#!/bin/bash\necho foo", ), ], ) # second commit add_commit( repo_url, "Set external on trunk overlapping versioned file", [ CommitChange( change_type=CommitChangeType.AddOrUpdate, path="trunk/", properties={ "svn:externals": ( f"{svn_urljoin(external_repo_url, 'code/script.sh')} script.sh" ) }, ), ], ) # third commit add_commit( repo_url, "Unset externals on trunk", [ CommitChange( change_type=CommitChangeType.AddOrUpdate, path="trunk/", properties={"svn:externals": None}, ), ], ) loader = SvnLoader(swh_storage, repo_url, temp_directory=tmp_path, check_revision=1) assert loader.load() == {"status": "eventful"} assert_last_visit_matches( loader.storage, repo_url, status="full", type="svn", ) check_snapshot(loader.snapshot, loader.storage) def test_dump_loader_relative_externals_detection( swh_storage, repo_url, external_repo_url, tmp_path ): add_commit( external_repo_url, "Create a file in external repository.", [ CommitChange( change_type=CommitChangeType.AddOrUpdate, path="project1/foo.sh", data=b"#!/bin/bash\necho foo", ), ], ) add_commit( external_repo_url, "Create another file in repository to load.", [ CommitChange( change_type=CommitChangeType.AddOrUpdate, path="project2/bar.sh", data=b"#!/bin/bash\necho bar", ), ], ) external_url = f"{external_repo_url.replace('file://', '//')}/project2/bar.sh" add_commit( repo_url, "Set external relative to URL scheme in repository to load", [ CommitChange( change_type=CommitChangeType.AddOrUpdate, path="project1/", properties={"svn:externals": (f"{external_url} bar.sh")}, ), ], ) loader = SvnLoaderFromRemoteDump( swh_storage, repo_url, temp_directory=tmp_path, check_revision=1 ) assert loader.load() == {"status": "eventful"} assert_last_visit_matches( loader.storage, repo_url, status="full", type="svn", ) check_snapshot(loader.snapshot, loader.storage) assert loader.svnrepo.has_relative_externals add_commit( repo_url, "Unset external in repository to load", [ CommitChange( change_type=CommitChangeType.AddOrUpdate, path="project1/", properties={"svn:externals": None}, ), ], ) loader = SvnLoaderFromRemoteDump( swh_storage, repo_url, temp_directory=tmp_path, check_revision=1 ) assert loader.load() == {"status": "eventful"} assert_last_visit_matches( loader.storage, repo_url, status="full", type="svn", ) check_snapshot(loader.snapshot, loader.storage) assert not loader.svnrepo.has_relative_externals def test_loader_externals_cache(swh_storage, repo_url, external_repo_url, tmp_path): # first commit on external add_commit( external_repo_url, "Create some directories and files in an external repository", [ CommitChange( change_type=CommitChangeType.AddOrUpdate, path="code/hello/hello-world", properties={"svn:executable": "*"}, data=b"#!/bin/bash\necho Hello World !", ), ], ) # first commit add_commit( repo_url, "Create repository structure.", [ CommitChange( change_type=CommitChangeType.AddOrUpdate, path="project1/", ), CommitChange( change_type=CommitChangeType.AddOrUpdate, path="project2/", ), ], ) external_url = svn_urljoin(external_repo_url, "code/hello") # second commit add_commit( repo_url, ( "Set svn:externals property on trunk/externals path of repository to load." "One external targets a remote directory and another one a remote file." ), [ CommitChange( change_type=CommitChangeType.AddOrUpdate, path="project1/externals/", properties={"svn:externals": (f"{external_url} hello\n")}, ), CommitChange( change_type=CommitChangeType.AddOrUpdate, path="project2/externals/", properties={"svn:externals": (f"{external_url} hello\n")}, ), ], ) loader = SvnLoader(swh_storage, repo_url, temp_directory=tmp_path, check_revision=1) assert loader.load() == {"status": "eventful"} assert_last_visit_matches( loader.storage, repo_url, status="full", type="svn", ) check_snapshot(loader.snapshot, loader.storage) assert ( external_url, None, False, ) in loader.svnrepo.swhreplay.editor.externals_cache def test_loader_remove_versioned_path_with_external_overlap( swh_storage, repo_url, external_repo_url, tmp_path ): # first commit on external add_commit( external_repo_url, "Create a file in an external repository", [ CommitChange( change_type=CommitChangeType.AddOrUpdate, path="code/hello.sh", data=b"#!/bin/bash\necho Hello World !", ), ], ) # first commit add_commit( repo_url, "Add a file", [ CommitChange( change_type=CommitChangeType.AddOrUpdate, path="trunk/project/script.sh", data=b"#!/bin/bash\necho foo", ), ], ) # second commit add_commit( repo_url, "Set external on trunk overlapping versioned path", [ CommitChange( change_type=CommitChangeType.AddOrUpdate, path="trunk/", properties={ "svn:externals": ( f"{svn_urljoin(external_repo_url, 'code')} project/code" ) }, ), ], ) # third commit add_commit( repo_url, "Remove trunk/project/ versioned path", [ CommitChange( change_type=CommitChangeType.Delete, path="trunk/project/", ), ], ) loader = SvnLoader( swh_storage, repo_url, temp_directory=tmp_path, check_revision=1, ) assert loader.load() == {"status": "eventful"} assert_last_visit_matches( loader.storage, repo_url, status="full", type="svn", ) check_snapshot(loader.snapshot, loader.storage) def test_loader_export_external_path_using_peg_rev( swh_storage, repo_url, external_repo_url, tmp_path ): # first commit on external add_commit( external_repo_url, "Create a file in an external repository", [ CommitChange( change_type=CommitChangeType.AddOrUpdate, path="code/foo.sh", data=b"#!/bin/bash\necho foo", ), ], ) # second commit on external add_commit( external_repo_url, "Remove previously added file", [ CommitChange( change_type=CommitChangeType.Delete, path="code/foo.sh", ), ], ) # third commit on external add_commit( external_repo_url, "Add file again but with different content", [ CommitChange( change_type=CommitChangeType.AddOrUpdate, path="code/foo.sh", data=b"#!/bin/bash\necho bar", ), ], ) # first commit add_commit( repo_url, "Add trunk dir", [ CommitChange( change_type=CommitChangeType.AddOrUpdate, path="trunk/", ), ], ) # second commit add_commit( repo_url, "Set external on trunk targeting first revision of external repo", [ CommitChange( change_type=CommitChangeType.AddOrUpdate, path="trunk/", properties={ "svn:externals": ( f"{svn_urljoin(external_repo_url, 'code/foo.sh')}@1 foo.sh" ) }, ), ], ) # third commit add_commit( repo_url, "Modify external on trunk to target third revision of external repo", [ CommitChange( change_type=CommitChangeType.AddOrUpdate, path="trunk/", properties={ "svn:externals": ( f"{svn_urljoin(external_repo_url, 'code/foo.sh')}@3 foo.sh" ) }, ), ], ) loader = SvnLoader( swh_storage, repo_url, temp_directory=tmp_path, check_revision=1, ) assert loader.load() == {"status": "eventful"} assert_last_visit_matches( loader.storage, repo_url, status="full", type="svn", ) check_snapshot(loader.snapshot, loader.storage) def test_loader_remove_external_overlapping_versioned_path( swh_storage, repo_url, external_repo_url, tmp_path ): # first commit on external add_commit( external_repo_url, "Create files in an external repository", [ CommitChange( change_type=CommitChangeType.AddOrUpdate, path="code/foo.sh", data=b"#!/bin/bash\necho foo", ), CommitChange( change_type=CommitChangeType.AddOrUpdate, path="code/link", data=b"#!/bin/bash\necho link", ), ], ) # first commit add_commit( repo_url, "Add trunk dir and a link file", [ CommitChange(change_type=CommitChangeType.AddOrUpdate, path="trunk/"), CommitChange( change_type=CommitChangeType.AddOrUpdate, path="trunk/link", data=b"link ../test", properties={"svn:special": "*"}, ), ], ) # second commit add_commit( repo_url, "Set external on root dir overlapping versioned trunk path", [ CommitChange( change_type=CommitChangeType.AddOrUpdate, path="", # repo root dir properties={ "svn:externals": ( f"{svn_urljoin(external_repo_url, 'code/foo.sh')} trunk/code/foo.sh\n" # noqa f"{svn_urljoin(external_repo_url, 'code/link')} trunk/link" ) }, ), ], ) # third commit add_commit( repo_url, "Remove external on root dir", [ CommitChange( change_type=CommitChangeType.AddOrUpdate, path="", properties={"svn:externals": None}, ), ], ) loader = SvnLoader( swh_storage, repo_url, temp_directory=tmp_path, check_revision=1, ) assert loader.load() == {"status": "eventful"} assert_last_visit_matches( loader.storage, repo_url, status="full", type="svn", ) check_snapshot(loader.snapshot, loader.storage) def test_loader_modify_external_same_path( swh_storage, repo_url, external_repo_url, tmp_path ): # first commit on external add_commit( external_repo_url, "Create a file in an external repository", [ CommitChange( change_type=CommitChangeType.AddOrUpdate, path="code/foo.sh", data=b"#!/bin/bash\necho foo", ), ], ) # first commit add_commit( repo_url, "Add trunk dir", [CommitChange(change_type=CommitChangeType.AddOrUpdate, path="trunk/")], ) # second commit add_commit( repo_url, "Set external code on trunk dir", [ CommitChange( change_type=CommitChangeType.AddOrUpdate, path="trunk/", properties={ "svn:externals": (f"{svn_urljoin(external_repo_url, 'code')} code") }, ), ], ) # third commit add_commit( repo_url, "Change code external on trunk targeting an invalid URL", [ CommitChange( change_type=CommitChangeType.AddOrUpdate, path="trunk/", properties={"svn:externals": "file:///tmp/invalid/svn/repo/path code"}, ), ], ) loader = SvnLoader( swh_storage, repo_url, temp_directory=tmp_path, check_revision=1, ) assert loader.load() == {"status": "eventful"} assert_last_visit_matches( loader.storage, repo_url, status="full", type="svn", ) check_snapshot(loader.snapshot, loader.storage) def test_loader_with_recursive_external( swh_storage, repo_url, external_repo_url, tmp_path ): # first commit on external add_commit( external_repo_url, "Create a file in an external repository", [ CommitChange( change_type=CommitChangeType.AddOrUpdate, path="code/foo.sh", data=b"#!/bin/bash\necho foo", ), ], ) # first commit add_commit( repo_url, "Add trunk dir and a file", [ CommitChange( change_type=CommitChangeType.AddOrUpdate, path="trunk/bar.sh", data=b"#!/bin/bash\necho bar", ) ], ) # second commit add_commit( repo_url, "Set externals code on trunk/externals dir, one being recursive", [ CommitChange( change_type=CommitChangeType.AddOrUpdate, path="trunk/externals/", properties={ "svn:externals": ( f"{svn_urljoin(external_repo_url, 'code')} code\n" f"{repo_url} recursive" ) }, ), ], ) # first load loader = SvnLoader( swh_storage, repo_url, temp_directory=tmp_path, check_revision=1, ) assert loader.load() == {"status": "eventful"} assert_last_visit_matches( loader.storage, repo_url, status="full", type="svn", ) check_snapshot(loader.snapshot, loader.storage) assert loader.svnrepo.has_recursive_externals # second load on stale repo loader = SvnLoader( swh_storage, repo_url, temp_directory=tmp_path, check_revision=1, ) assert loader.load() == {"status": "uneventful"} assert_last_visit_matches( loader.storage, repo_url, status="full", type="svn", ) check_snapshot(loader.snapshot, loader.storage) assert loader.svnrepo.has_recursive_externals # third commit add_commit( repo_url, "Remove recursive external on trunk/externals dir", [ CommitChange( change_type=CommitChangeType.AddOrUpdate, path="trunk/externals/", properties={ "svn:externals": (f"{svn_urljoin(external_repo_url, 'code')} code") }, ), ], ) # third load loader = SvnLoader( swh_storage, repo_url, temp_directory=tmp_path, check_revision=1, ) assert loader.load() == {"status": "eventful"} assert_last_visit_matches( loader.storage, repo_url, status="full", type="svn", ) check_snapshot(loader.snapshot, loader.storage) assert not loader.svnrepo.has_recursive_externals def test_loader_externals_with_same_target( swh_storage, repo_url, external_repo_url, tmp_path ): # first commit on external add_commit( external_repo_url, "Create files in an external repository", [ CommitChange( change_type=CommitChangeType.AddOrUpdate, path="foo/foo.sh", data=b"#!/bin/bash\necho foo", ), CommitChange( change_type=CommitChangeType.AddOrUpdate, path="bar/bar.sh", data=b"#!/bin/bash\necho bar", ), ], ) # first commit add_commit( repo_url, "Add trunk/src dir", [CommitChange(change_type=CommitChangeType.AddOrUpdate, path="trunk/src/")], ) # second commit add_commit( repo_url, "Add externals on trunk targeting same directory", [ CommitChange( change_type=CommitChangeType.AddOrUpdate, path="trunk/", properties={ "svn:externals": ( f"{svn_urljoin(external_repo_url, 'foo')} src\n" f"{svn_urljoin(external_repo_url, 'bar')} src" ) }, ), ], ) loader = SvnLoader( swh_storage, repo_url, temp_directory=tmp_path, check_revision=1, ) assert loader.load() == {"status": "eventful"} assert_last_visit_matches( loader.storage, repo_url, status="full", type="svn", ) check_snapshot(loader.snapshot, loader.storage) def test_loader_external_in_versioned_path( swh_storage, repo_url, external_repo_url, tmp_path ): # first commit on external add_commit( external_repo_url, "Create a file in an external repository", [ CommitChange( change_type=CommitChangeType.AddOrUpdate, path="src/foo.sh", data=b"#!/bin/bash\necho foo", ), ], ) # first commit add_commit( repo_url, "Add trunk/src dir", [CommitChange(change_type=CommitChangeType.AddOrUpdate, path="trunk/src/")], ) # second commit add_commit( repo_url, "Add a file in trunk/src directory and set external on trunk targeting src", [ CommitChange( change_type=CommitChangeType.AddOrUpdate, path="trunk/src/bar.sh", data=b"#!/bin/bash\necho bar", ), CommitChange( change_type=CommitChangeType.AddOrUpdate, path="trunk/", properties={ "svn:externals": (f"{svn_urljoin(external_repo_url, 'src')} src") }, ), ], ) loader = SvnLoader( swh_storage, repo_url, temp_directory=tmp_path, check_revision=1, ) assert loader.load() == {"status": "eventful"} assert_last_visit_matches( loader.storage, repo_url, status="full", type="svn", ) check_snapshot(loader.snapshot, loader.storage) def test_dump_loader_externals_in_loaded_repository(swh_storage, tmp_path, mocker): repo_url = create_repo(tmp_path, repo_name="foo") externa_url = create_repo(tmp_path, repo_name="foobar") # first commit on external add_commit( externa_url, "Create a file in an external repository", [ CommitChange( change_type=CommitChangeType.AddOrUpdate, path="trunk/src/foo.sh", data=b"#!/bin/bash\necho foo", ), ], ) add_commit( repo_url, ( "Add a file and set externals on trunk/externals:" "one external located in this repository, the other in a remote one" ), [ CommitChange( change_type=CommitChangeType.AddOrUpdate, path="trunk/src/bar.sh", data=b"#!/bin/bash\necho bar", ), CommitChange( change_type=CommitChangeType.AddOrUpdate, path="trunk/externals/", properties={ "svn:externals": ( f"{svn_urljoin(repo_url, 'trunk/src/bar.sh')} bar.sh\n" f"{svn_urljoin(externa_url, 'trunk/src/foo.sh')} foo.sh" ) }, ), ], ) from swh.loader.svn.svn import client mock_client = mocker.MagicMock() mocker.patch.object(client, "Client", mock_client) class Info: repos_root_url = repo_url mock_client().info.return_value = {"repo": Info()} loader = SvnLoaderFromRemoteDump(swh_storage, repo_url, temp_directory=tmp_path) loader.load() export_call_args = mock_client().export.call_args_list # first external export should use the base URL of the local repository # mounted from the remote dump as it is located in loaded repository assert export_call_args[0][0][0] != svn_urljoin( loader.svnrepo.origin_url, "trunk/src/bar.sh" ) assert export_call_args[0][0][0] == svn_urljoin( loader.svnrepo.remote_url, "trunk/src/bar.sh" ) # second external export should use the remote URL of the external repository assert export_call_args[1][0][0] == svn_urljoin(externa_url, "trunk/src/foo.sh") def test_loader_externals_add_remove_readd_on_subpath( swh_storage, repo_url, external_repo_url, tmp_path ): # first commit on external add_commit( external_repo_url, "Create files in an external repository", [ CommitChange( change_type=CommitChangeType.AddOrUpdate, path="src/foo.sh", data=b"#!/bin/bash\necho foo", ), CommitChange( change_type=CommitChangeType.AddOrUpdate, path="src/bar.sh", data=b"#!/bin/bash\necho bar", ), ], ) # first commit add_commit( repo_url, "Set external on two paths targeting the same absolute path", [ CommitChange( change_type=CommitChangeType.AddOrUpdate, path="trunk/src/", properties={ "svn:externals": ( f"{svn_urljoin(external_repo_url, 'src/foo.sh')} foo.sh" ) }, ), CommitChange( change_type=CommitChangeType.AddOrUpdate, path="trunk/", properties={ "svn:externals": ( f"{svn_urljoin(external_repo_url, 'src/foo.sh')} src/foo.sh" ) }, ), ], ) # second commit add_commit( repo_url, "Remove external on a single path", [ CommitChange( change_type=CommitChangeType.AddOrUpdate, path="trunk/", properties={ "svn:externals": ( f"{svn_urljoin(external_repo_url, 'src/bar.sh')} src/bar.sh" ) }, ), ], ) loader = SvnLoader( swh_storage, repo_url, temp_directory=tmp_path, check_revision=1, ) assert loader.load() == {"status": "eventful"} assert_last_visit_matches( loader.storage, repo_url, status="full", type="svn", ) check_snapshot(loader.snapshot, loader.storage) def test_loader_directory_symlink_in_external( swh_storage, repo_url, external_repo_url, tmp_path ): # first commit on external add_commit( external_repo_url, "Create dirs in an external repository", [ CommitChange( change_type=CommitChangeType.AddOrUpdate, path="src/apps/", ), CommitChange( change_type=CommitChangeType.AddOrUpdate, path="src/deps/", ), ], ) # second commit on external add_commit( external_repo_url, "Add symlink to src/deps in src/apps directory", [ CommitChange( change_type=CommitChangeType.AddOrUpdate, path="src/apps/deps", data=b"link ../deps", properties={"svn:special": "*"}, ), ], ) # first commit add_commit( repo_url, "Add deps dir", [CommitChange(change_type=CommitChangeType.AddOrUpdate, path="deps/")], ) # second commit add_commit( repo_url, "Set external to deps folder", [ CommitChange( change_type=CommitChangeType.AddOrUpdate, path="deps/", properties={"svn:externals": (f"{external_repo_url} external")}, ), ], ) loader = SvnLoader( swh_storage, repo_url, temp_directory=tmp_path, check_revision=1, ) assert loader.load() == {"status": "eventful"} assert_last_visit_matches( loader.storage, repo_url, status="full", type="svn", ) check_snapshot(loader.snapshot, loader.storage) def test_loader_with_externals_parsing_error( swh_storage, repo_url, external_repo_url, tmp_path ): # first commit on external add_commit( external_repo_url, "Create code directory", [ CommitChange( change_type=CommitChangeType.AddOrUpdate, path="code/", ), ], ) # second commit on external add_commit( external_repo_url, "Create code/foo.sh file", [ CommitChange( change_type=CommitChangeType.AddOrUpdate, path="code/foo.sh", properties={"svn:executable": "*"}, data=b"#!/bin/bash\necho foo", ), ], ) # first commit add_commit( repo_url, "Create trunk directory.", [ CommitChange( change_type=CommitChangeType.AddOrUpdate, path="trunk/", ), ], ) # second commit add_commit( repo_url, "Set external on trunk directory that will result in a parsing error.", [ CommitChange( change_type=CommitChangeType.AddOrUpdate, path="trunk/", properties={ "svn:externals": ( f"-r2{svn_urljoin(external_repo_url, 'code/foo.sh')} foo.sh" ) }, ), ], ) # third commit add_commit( repo_url, "Fix external definition on trunk directory.", [ CommitChange( change_type=CommitChangeType.AddOrUpdate, path="trunk/", properties={ "svn:externals": ( f"-r2 {svn_urljoin(external_repo_url, 'code/foo.sh')} foo.sh" ) }, ), ], ) loader = SvnLoader( swh_storage, repo_url, temp_directory=tmp_path, check_revision=1, ) assert loader.load() == {"status": "eventful"} assert_last_visit_matches( loader.storage, repo_url, status="full", type="svn", ) check_snapshot(loader.snapshot, loader.storage) + + +@pytest.mark.parametrize("remote_external_path", ["src/main/project", "src/main"]) +def test_loader_overlapping_external_paths_removal( + swh_storage, repo_url, external_repo_url, tmp_path, remote_external_path +): + add_commit( + external_repo_url, + "Create external repository layout", + [ + CommitChange( + change_type=CommitChangeType.AddOrUpdate, + path="src/main/project/foo/bar", + data=b"bar", + ), + ], + ) + + add_commit( + repo_url, + "Create repository layout", + [ + CommitChange( + change_type=CommitChangeType.AddOrUpdate, + path="trunk/src/main/project/", + ), + ], + ) + + add_commit( + repo_url, + "Add overlapping externals", + [ + CommitChange( + change_type=CommitChangeType.AddOrUpdate, + path="trunk/src/main/", + properties={ + "svn:externals": f"{svn_urljoin(external_repo_url, remote_external_path)} project" # noqa + }, + ), + CommitChange( + change_type=CommitChangeType.AddOrUpdate, + path="trunk/src/main/project/", + properties={ + "svn:externals": f'{svn_urljoin(external_repo_url, "src/main/project/foo")} foo' # noqa + }, + ), + ], + ) + + add_commit( + repo_url, + "Remove directory with externals overlapping with those from ancestor directory", + [ + CommitChange( + change_type=CommitChangeType.Delete, + path="trunk/src/main/project/", + ), + ], + ) + + loader = SvnLoader( + swh_storage, + repo_url, + temp_directory=tmp_path, + check_revision=1, + ) + assert loader.load() == {"status": "eventful"} + assert_last_visit_matches( + loader.storage, + repo_url, + status="full", + type="svn", + ) + check_snapshot(loader.snapshot, loader.storage)