diff --git a/PKG-INFO b/PKG-INFO index f591269..355e5a9 100644 --- a/PKG-INFO +++ b/PKG-INFO @@ -1,61 +1,61 @@ Metadata-Version: 2.1 Name: swh.loader.svn -Version: 1.2.1 +Version: 1.3.0 Summary: Software Heritage Loader SVN Home-page: https://forge.softwareheritage.org/diffusion/DLDSVN Author: Software Heritage developers Author-email: swh-devel@inria.fr License: UNKNOWN Project-URL: Bug Reports, https://forge.softwareheritage.org/maniphest Project-URL: Funding, https://www.softwareheritage.org/donate Project-URL: Source, https://forge.softwareheritage.org/source/swh-loader-svn Project-URL: Documentation, https://docs.softwareheritage.org/devel/swh-loader-svn/ Platform: UNKNOWN Classifier: Programming Language :: Python :: 3 Classifier: Intended Audience :: Developers Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3) Classifier: Operating System :: OS Independent Classifier: Development Status :: 5 - Production/Stable Requires-Python: >=3.7 Description-Content-Type: text/markdown Provides-Extra: testing License-File: LICENSE License-File: AUTHORS swh-loader-svn ============== The Software Heritage SVN Loader is a tool and a library to walk a remote svn repository and inject into the SWH dataset all contained files that weren't known before. The main entry points are - :class:`swh.loader.svn.loader.SvnLoader` for the main svn loader which ingests content out of a remote svn repository - :class:`swh.loader.svn.loader.SvnLoaderFromDumpArchive` which mounts a repository out of a svn dump prior to ingest it. - :class:`swh.loader.svn.loader.SvnLoaderFromRemoteDump` which mounts a repository with svnrdump prior to ingest its content. # CLI run With the configuration: /tmp/loader_svn.yml: ``` storage: cls: remote args: url: http://localhost:5002/ ``` Run: ``` swh loader --config-file /tmp/loader_svn.yml \ run svn ``` diff --git a/debian/changelog b/debian/changelog index 02fb002..1d2544c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,812 +1,814 @@ -swh-loader-svn (1.2.1-1~swh1~bpo10+1) buster-swh; urgency=medium +swh-loader-svn (1.3.0-1~swh1) unstable-swh; urgency=medium - * Rebuild for buster-swh + * New upstream release 1.3.0 - (tagged by Antoine Lambert + on 2022-03-24 13:30:17 +0100) + * Upstream changes: - version 1.3.0 - -- Software Heritage autobuilder (on jenkins-debian1) Wed, 09 Mar 2022 13:02:51 +0000 + -- Software Heritage autobuilder (on jenkins-debian1) Thu, 24 Mar 2022 12:34:14 +0000 swh-loader-svn (1.2.1-1~swh1) unstable-swh; urgency=medium * New upstream release 1.2.1 - (tagged by Antoine Lambert on 2022-03-09 13:57:18 +0100) * Upstream changes: - version 1.2.1 -- Software Heritage autobuilder (on jenkins-debian1) Wed, 09 Mar 2022 13:00:41 +0000 swh-loader-svn (1.2.0-1~swh2) unstable-swh; urgency=medium * Bump new release -- Antoine R. Dumont (@ardumont) Thu, 17 Feb 2022 12:46:20 +0100 swh-loader-svn (1.2.0-1~swh1) unstable-swh; urgency=medium * New upstream release 1.2.0 - (tagged by Antoine Lambert on 2022-02-11 17:19:45 +0100) * Upstream changes: - version 1.2.0 -- Software Heritage autobuilder (on jenkins-debian1) Fri, 11 Feb 2022 16:23:08 +0000 swh-loader-svn (1.1.1-1~swh1) unstable-swh; urgency=medium * New upstream release 1.1.1 - (tagged by Antoine Lambert on 2022-01-28 11:42:12 +0100) * Upstream changes: - version 1.1.1 -- Software Heritage autobuilder (on jenkins-debian1) Fri, 28 Jan 2022 10:44:57 +0000 swh-loader-svn (1.1.0-1~swh1) unstable-swh; urgency=medium * New upstream release 1.1.0 - (tagged by Antoine Lambert on 2022-01-24 17:57:36 +0100) * Upstream changes: - version 1.1.0 -- Software Heritage autobuilder (on jenkins-debian1) Mon, 24 Jan 2022 17:01:15 +0000 swh-loader-svn (1.0.0-1~swh1) unstable-swh; urgency=medium * New upstream release 1.0.0 - (tagged by Antoine Lambert on 2022-01-19 16:51:43 +0100) * Upstream changes: - version 1.0.0 -- Software Heritage autobuilder (on jenkins-debian1) Wed, 19 Jan 2022 15:54:56 +0000 swh-loader-svn (0.10.2-1~swh1) unstable-swh; urgency=medium * New upstream release 0.10.2 - (tagged by Antoine Lambert on 2021-11-29 14:36:35 +0100) * Upstream changes: - version 0.10.2 -- Software Heritage autobuilder (on jenkins-debian1) Mon, 29 Nov 2021 13:40:41 +0000 swh-loader-svn (0.10.1-1~swh1) unstable-swh; urgency=medium * New upstream release 0.10.1 - (tagged by Antoine Lambert on 2021-11-25 15:20:27 +0100) * Upstream changes: - version 0.10.1 -- Software Heritage autobuilder (on jenkins-debian1) Thu, 25 Nov 2021 14:26:34 +0000 swh-loader-svn (0.10.0-1~swh1) unstable-swh; urgency=medium * New upstream release 0.10.0 - (tagged by Antoine Lambert on 2021-11-19 11:58:43 +0100) * Upstream changes: - version 0.10.0 -- Software Heritage autobuilder (on jenkins-debian1) Fri, 19 Nov 2021 11:03:18 +0000 swh-loader-svn (0.9.1-1~swh1) unstable-swh; urgency=medium * New upstream release 0.9.1 - (tagged by Antoine R. Dumont (@ardumont) on 2021-11-18 14:19:23 +0100) * Upstream changes: - v0.9.1 - ra: Prevent erroneous removing of file state -- Software Heritage autobuilder (on jenkins-debian1) Thu, 18 Nov 2021 13:22:06 +0000 swh-loader-svn (0.9.0-1~swh1) unstable-swh; urgency=medium * New upstream release 0.9.0 - (tagged by Antoine Lambert on 2021-11-17 15:11:56 +0100) * Upstream changes: - version 0.9.0 -- Software Heritage autobuilder (on jenkins-debian1) Wed, 17 Nov 2021 14:14:34 +0000 swh-loader-svn (0.8.0-1~swh1) unstable-swh; urgency=medium * New upstream release 0.8.0 - (tagged by Antoine R. Dumont (@ardumont) on 2021-11-09 12:25:09 +0100) * Upstream changes: - v0.8.0 - SvnLoaderFromRemoteDump: Drop dump when svn repository is mounted - loader: Let log statement do the formatting - svn: Modify default loader to use the same as production task -- Software Heritage autobuilder (on jenkins-debian1) Tue, 09 Nov 2021 11:27:49 +0000 swh-loader-svn (0.7.3-1~swh1) unstable-swh; urgency=medium * New upstream release 0.7.3 - (tagged by Antoine R. Dumont (@ardumont) on 2021-11-08 17:29:05 +0100) * Upstream changes: - v0.7.3 - loader: Implement post_load to check for revision divergence - ra: Fix export of non link file with svn:special property set - loader: Fix error when first revision number is not one - loader: Perform a complete reloading when detecting altered history - ra: Handle invalid values for svn:eol-style property - ra: Handle unsetting svn:special property on svn links - ra: Do not process end of lines for svn links - ra: Fix edge case in svn:eol-style property handling - loader: Rename start_from_scratch parameter to incremental - loader: Let logging instructions do the formatting - loader: Fix SvnLoaderFromDumpArchive and add test - Remove reference to deprecated swh.model.identifiers module -- Software Heritage autobuilder (on jenkins-debian1) Mon, 08 Nov 2021 16:32:19 +0000 swh-loader-svn (0.7.2-1~swh1) unstable-swh; urgency=medium * New upstream release 0.7.2 - (tagged by Antoine R. Dumont (@ardumont) on 2021-09-30 10:07:44 +0200) * Upstream changes: - v0.7.2 - SvnLoaderFromRemoteDump: Fix failed visit which should be an uneventful visit - svn: Capture svnrdump failure as not_found instead of failed - mypy: Fix errors with release >= v0.900 -- Software Heritage autobuilder (on jenkins-debian1) Thu, 30 Sep 2021 08:10:27 +0000 swh-loader-svn (0.7.1-1~swh1) unstable-swh; urgency=medium * New upstream release 0.7.1 - (tagged by Antoine Lambert on 2021-04-29 14:31:33 +0200) * Upstream changes: - version 0.7.1 -- Software Heritage autobuilder (on jenkins-debian1) Thu, 29 Apr 2021 12:34:51 +0000 swh-loader-svn (0.7.0-1~swh1) unstable-swh; urgency=medium * New upstream release 0.7.0 - (tagged by Antoine R. Dumont (@ardumont) on 2021-02-17 18:19:35 +0100) * Upstream changes: - v0.7.0 - loader: Expect visit_date as an optional date in constructors - Rework loader instantiation logic according to loader core api -- Software Heritage autobuilder (on jenkins-debian1) Wed, 17 Feb 2021 17:23:16 +0000 swh-loader-svn (0.6.0-1~swh2) unstable-swh; urgency=medium * Update dependencies -- Antoine R. Dumont (@ardumont) Fri, 12 Feb 2021 18:05:59 +0100 swh-loader-svn (0.6.0-1~swh1) unstable-swh; urgency=medium * New upstream release 0.6.0 - (tagged by Antoine R. Dumont (@ardumont) on 2021-02-12 17:31:53 +0100) * Upstream changes: - v0.6.0 - svn.loader: Mark visit status as not_found when relevant - svn.loader: Mark visit status as failed - Drop the retrying dependency - tox.ini: pin black to the pre-commit version (19.10b0) to avoid flip-flops -- Software Heritage autobuilder (on jenkins-debian1) Fri, 12 Feb 2021 16:33:45 +0000 swh-loader-svn (0.5.0-1~swh1) unstable-swh; urgency=medium * New upstream release 0.5.0 - (tagged by Antoine R. Dumont (@ardumont) on 2020-10-02 14:16:50 +0200) * Upstream changes: - v0.5.0 - svn.loader: Migrate away from SWHConfig mixin - tests: Don't check the number of created 'person' objects - python: Reorder imports with isort - pre- commit: Add isort hook and configuration - pre-commit: Update flake8 hook configuration -- Software Heritage autobuilder (on jenkins-debian1) Fri, 02 Oct 2020 12:17:49 +0000 swh-loader-svn (0.4.1-1~swh1) unstable-swh; urgency=medium * New upstream release 0.4.1 - (tagged by Antoine Lambert on 2020-09-08 17:48:55 +0200) * Upstream changes: - version 0.4.1 -- Software Heritage autobuilder (on jenkins-debian1) Tue, 08 Sep 2020 15:53:11 +0000 swh-loader-svn (0.4.0-1~swh1) unstable-swh; urgency=medium * New upstream release 0.4.0 - (tagged by Antoine R. Dumont (@ardumont) on 2020-09-04 14:05:14 +0200) * Upstream changes: - v0.4.0 - Adapt storage.revision_get calls according to latest api change - Tell pytest not to recurse in dotdirs. -- Software Heritage autobuilder (on jenkins-debian1) Fri, 04 Sep 2020 12:07:00 +0000 swh-loader-svn (0.3.3-1~swh1) unstable-swh; urgency=medium * New upstream release 0.3.3 - (tagged by Antoine R. Dumont (@ardumont) on 2020-08-24 16:00:11 +0200) * Upstream changes: - v0.3.3 - svn.loader: Simplify and align incremental visit algorithm -- Software Heritage autobuilder (on jenkins-debian1) Mon, 24 Aug 2020 14:01:22 +0000 swh-loader-svn (0.3.2-1~swh1) unstable-swh; urgency=medium * New upstream release 0.3.2 - (tagged by Antoine R. Dumont (@ardumont) on 2020-07-28 08:07:12 +0200) * Upstream changes: - v0.3.2 - Migrate to setuptools-scm - Add missing conftest.py in MANIFEST.in -- Software Heritage autobuilder (on jenkins-debian1) Tue, 28 Jul 2020 06:09:53 +0000 swh-loader-svn (0.3.1-1~swh1) unstable-swh; urgency=medium * New upstream release 0.3.1 - (tagged by Antoine R. Dumont (@ardumont) on 2020-07-28 07:50:03 +0200) * Upstream changes: - v0.3.1 - loader: Update swh.storage.origin_get call to latest api change - tests: Reuse pytest fixtures from swh.loader.core - tests: Check against snapshot model object - svn.loader: Drop `build_swh_snapshot` function, oneliner used once - Fix branches types in tests - Clean up the swh.scheduler / swh.storage pytest plugin imports -- Software Heritage autobuilder (on jenkins-debian1) Tue, 28 Jul 2020 05:52:35 +0000 swh-loader-svn (0.3.0-1~swh1) unstable-swh; urgency=medium * New upstream release 0.3.0 - (tagged by David Douard on 2020-07-08 17:18:02 +0200) * Upstream changes: - v0.3.0 -- Software Heritage autobuilder (on jenkins-debian1) Wed, 08 Jul 2020 15:22:12 +0000 swh-loader-svn (0.2.1-1~swh1) unstable-swh; urgency=medium * New upstream release 0.2.1 - (tagged by Antoine R. Dumont (@ardumont) on 2020-07-03 15:17:44 +0200) * Upstream changes: - v0.2.1 - svn.loader: Fix uneventful visit case - svn.loader: Fix edge case on mistyped snapshot - tests: Refactor to use pytest - Reuse swh.model.from_disk.iter_directory function - Migrate to Use the object's object_type field when computing objects -- Software Heritage autobuilder (on jenkins-debian1) Fri, 03 Jul 2020 13:20:20 +0000 swh-loader-svn (0.2.0-1~swh1) unstable-swh; urgency=medium * New upstream release 0.2.0 - (tagged by Antoine R. Dumont (@ardumont) on 2020-06-23 15:25:21 +0200) * Upstream changes: - v0.2.0 - loader: Read snapshot out of the last origin visit status - tests: Refactor tests to use assert_last_visit_matches -- Software Heritage autobuilder (on jenkins-debian1) Tue, 23 Jun 2020 13:26:50 +0000 swh-loader-svn (0.1.2-1~swh1) unstable-swh; urgency=medium * New upstream release 0.1.2 - (tagged by Antoine R. Dumont (@ardumont) on 2020-06-09 11:03:56 +0200) * Upstream changes: - v0.1.2 - test_loader: assert returned loader status is what we expect - Adapt to swh.model 0.3 -- Software Heritage autobuilder (on jenkins-debian1) Tue, 09 Jun 2020 09:06:01 +0000 swh-loader-svn (0.1.1-1~swh3) unstable-swh; urgency=medium * Enable build for python3.8 (Debian ships a patched subvertpy.) -- Nicolas Dandrimont Wed, 03 Jun 2020 16:27:53 +0200 swh-loader-svn (0.1.1-1~swh2) unstable-swh; urgency=medium * Force removing __init__.py files. -- Nicolas Dandrimont Wed, 03 Jun 2020 16:13:31 +0200 swh-loader-svn (0.1.1-1~swh1) unstable-swh; urgency=medium * New upstream release 0.1.1 - (tagged by Antoine Lambert on 2020-06-03 11:49:31 +0200) * Upstream changes: - version 0.1.1 -- Software Heritage autobuilder (on jenkins-debian1) Wed, 03 Jun 2020 09:53:23 +0000 swh-loader-svn (0.1.0-1~swh1) unstable-swh; urgency=medium * New upstream release 0.1.0 - (tagged by Nicolas Dandrimont on 2020-06-02 18:54:30 +0200) * Upstream changes: - Release swh.loader.svn v0.1.0 - Blacken all files - Fix compatibility with swh.loader.core v0.1.0 - Fix parameter ordering for loader tasks -- Software Heritage autobuilder (on jenkins-debian1) Tue, 02 Jun 2020 16:58:55 +0000 swh-loader-svn (0.0.54-1~swh1) unstable-swh; urgency=medium * New upstream release 0.0.54 - (tagged by Antoine R. Dumont (@ardumont) on 2020-03-27 07:52:30 +0100) * Upstream changes: - v0.0.54 - svn.loader: Let core loader update snapshot & visit at the same time - test_loader: Add missing assertions on visit status - Fix crash on None snapshot -- Software Heritage autobuilder (on jenkins-debian1) Fri, 27 Mar 2020 06:57:15 +0000 swh-loader-svn (0.0.53-1~swh1) unstable-swh; urgency=medium * New upstream release 0.0.53 - (tagged by Antoine R. Dumont (@ardumont) on 2020-03-16 13:38:29 +0100) * Upstream changes: - v0.0.53 - Migrate to latest swh-loader- core api change - Move Person parsing to swh-model. -- Software Heritage autobuilder (on jenkins-debian1) Mon, 16 Mar 2020 12:41:14 +0000 swh-loader-svn (0.0.52-1~swh1) unstable-swh; urgency=medium * New upstream release 0.0.52 - (tagged by Antoine R. Dumont (@ardumont) on 2020-03-02 15:39:28 +0100) * Upstream changes: - v0.0.52 - loader.svn: Use swh.model objects within the loader - tox.ini: Add debugging dev tool in dedicated environment - converters: Clean up some more dead code - converters: Clean up dead code -- Software Heritage autobuilder (on jenkins-debian1) Mon, 02 Mar 2020 14:42:36 +0000 swh-loader-svn (0.0.51-1~swh1) unstable-swh; urgency=medium * New upstream release 0.0.51 - (tagged by Nicolas Dandrimont on 2020-02-19 20:01:31 +0100) * Upstream changes: - Release swh.loader.svn v0.0.51 - Ensure snapshots are properly linked by origin_visits - Update tests for swh.storage v0.0.174 -- Software Heritage autobuilder (on jenkins-debian1) Wed, 19 Feb 2020 19:20:03 +0000 swh-loader-svn (0.0.50-1~swh1) unstable-swh; urgency=medium * New upstream release 0.0.50 - (tagged by Antoine R. Dumont (@ardumont) on 2020-02-06 18:45:10 +0100) * Upstream changes: - v0.0.50 - loader.svn: Call storage's (skipped_)content_add endpoints - Fix sphinx warnings -- Software Heritage autobuilder (on jenkins-debian1) Thu, 06 Feb 2020 17:57:08 +0000 swh-loader-svn (0.0.49-1~swh1) unstable-swh; urgency=medium * New upstream release 0.0.49 - (tagged by Antoine R. Dumont (@ardumont) on 2020-01-15 15:59:52 +0100) * Upstream changes: - v0.0.49 - svn.loader: Adapt according to latest loader-core simplification -- Software Heritage autobuilder (on jenkins-debian1) Wed, 15 Jan 2020 15:03:50 +0000 swh-loader-svn (0.0.48-1~swh1) unstable-swh; urgency=medium * New upstream release 0.0.48 - (tagged by Antoine R. Dumont (@ardumont) on 2019-12-12 14:14:12 +0100) * Upstream changes: - v0.0.48 - svn.loader: Migrate to new buffer/filter behavior -- Software Heritage autobuilder (on jenkins-debian1) Thu, 12 Dec 2019 13:17:31 +0000 swh-loader-svn (0.0.47-1~swh1) unstable-swh; urgency=medium * New upstream release 0.0.47 - (tagged by Antoine R. Dumont (@ardumont) on 2019-12-12 11:18:45 +0100) * Upstream changes: - v0.0.47 - tasks: Enforce kwargs use in task message -- Software Heritage autobuilder (on jenkins-debian1) Thu, 12 Dec 2019 10:21:55 +0000 swh-loader-svn (0.0.46-1~swh2) unstable-swh; urgency=medium * Fix build for python3.7 only -- Antoine R. Dumont (@ardumont) Sat, 16 Feb 2019 02:43:37 +0100 swh-loader-svn (0.0.46-1~swh1) unstable-swh; urgency=medium * New upstream release 0.0.46 - (tagged by Antoine R. Dumont (@ardumont) on 2019-12-10 10:30:35 +0100) * Upstream changes: - v0.0.46 - tests: Migrate to use pytest- mock's mocker fixture - tasks: Use celery's shared_task decorator - loader.svn: Register svn worker - svn.tasks: Rename tasks according to production's - tasks: Adapt tasks according to the constructor unification - svn: Unify loader constructor with url as parameter - Fix a typo reported by codespell - Add a pre-commit config file - Migrate tox.ini to extras = xxx instead of deps = .[testing] - De-specify testenv:py3 - Include all requirements in MANIFEST.in -- Software Heritage autobuilder (on jenkins-debian1) Tue, 10 Dec 2019 09:38:45 +0000 swh-loader-svn (0.0.45-1~swh1) unstable-swh; urgency=medium * New upstream release 0.0.45 - (tagged by Stefano Zacchiroli on 2019-10-10 14:43:18 +0200) * Upstream changes: - v0.0.45 - * typing: minimal changes to make a no-op mypy run pass - * tox.ini: Fix py3 environment to use packaged tests - * Add attribute visit_type. - * Fix warning about pytest.mark.fs. - * add code of conduct document - * CONTRIBUTORS: add Ishan Bhanuka - * Remove unnecessary noqa - * Update dependency on swh-storage. - * Update argument name. - * Use origin urls instead of origin ids. - * update requirements - * Update coverage gitignore - * SvnLoaderFromRemoteDump: Add some debug output when svnrdump is running - * Remove debian packaging from master branch -- Software Heritage autobuilder (on jenkins-debian1) Thu, 10 Oct 2019 12:46:37 +0000 swh-loader-svn (0.0.44-1~swh3) unstable-swh; urgency=low * New upstream release (fixing the distribution) -- Antoine Romain Dumont Sat, 16 Feb 2019 02:43:37 +0100 swh-loader-svn (0.0.44-1~swh2) unstable; urgency=low * New upstream release to fix debian packaging -- Antoine Romain Dumont Sat, 16 Feb 2019 02:19:27 +0100 swh-loader-svn (0.0.44-1~swh1) unstable-swh; urgency=medium * New upstream release 0.0.44 - (tagged by David Douard on 2019-02-07 17:35:43 +0100) * Upstream changes: - v0.0.44 -- Software Heritage autobuilder (on jenkins-debian1) Thu, 07 Feb 2019 16:41:45 +0000 swh-loader-svn (0.0.42-1~swh1) unstable-swh; urgency=medium * v0.0.43 * loader: Rename default branch as HEAD * svn.tests: Refactor using loader-core mixins * setup: prepare for pypi upload * Add requirements-test.txt * docs: add title and brief module description -- Antoine R. Dumont (@ardumont) Thu, 11 Oct 2018 14:52:54 +0200 swh-loader-svn (0.0.41-1~swh1) unstable-swh; urgency=medium * v0.0.41 * Fix UnicodeDecodeError when decoding user-defined svn properties * preventing the origin ingestion to finish (T946) * Fix CR/LF issue preventing the origin ingestion to finish (T570) * svn.loader: Add more efficient loader based on remote dumps * svn.loader: Refactoring (align loader with other, name conventions, * improve maintenance, simplify some code, etc...) -- Antoine R. Dumont (@ardumont) Fri, 28 Sep 2018 12:16:31 +0200 swh-loader-svn (0.0.40-1~swh1) unstable-swh; urgency=medium * v0.0.40 * svn/loader: Remove wrong parameter name in dangling clean up call * svn/loader: Refactor: Reuse loader.core.utils.clean_dangling_folders * svn/tasks: Explicit tasks' arguments * svn/loader: Add pre-cleanup step to clean potential dangling folders * d/control: Bump to latest python3-swh.loader.core -- Antoine R. Dumont (@ardumont) Fri, 09 Mar 2018 14:51:09 +0100 swh-loader-svn (0.0.39-1~swh1) unstable-swh; urgency=medium * v0.0.39 * Improve origin_visit initialization step * Properly sandbox the prepare statement so that if it breaks, we can * update appropriately the visit with the correct status -- Antoine R. Dumont (@ardumont) Wed, 07 Mar 2018 11:31:34 +0100 swh-loader-svn (0.0.38-1~swh1) unstable-swh; urgency=medium * v0.0.38 * In failure mode, try harder to make snapshot -- Antoine R. Dumont (@ardumont) Fri, 09 Feb 2018 14:13:30 +0100 swh-loader-svn (0.0.37-1~swh1) unstable-swh; urgency=medium * v0.0.37 * swh.loader.svn: Detect eol inconsistency and make the loading fail * swh.loader.svn: Reduce log verbosity * swh.loader.svn: Migrate exception to their specific module -- Antoine R. Dumont (@ardumont) Thu, 08 Feb 2018 17:57:15 +0100 swh-loader-svn (0.0.36-1~swh1) unstable-swh; urgency=medium * v0.0.36 * swh.loader.svn: Fix corner edge case on symbolic link * swh.loader.svn: Deal with empty svn repository edge case -- Antoine R. Dumont (@ardumont) Wed, 07 Feb 2018 12:36:45 +0100 swh-loader-svn (0.0.35-1~swh1) unstable-swh; urgency=medium * Release swh.loader.svn v0.0.35 * Update to use snapshots instead of occurrences * Properly return loader status to scheduler -- Nicolas Dandrimont Tue, 06 Feb 2018 14:40:28 +0100 swh-loader-svn (0.0.34-1~swh1) unstable-swh; urgency=medium * v0.0.34 * Unify temporary directory naming -- Antoine R. Dumont (@ardumont) Fri, 15 Dec 2017 12:26:50 +0100 swh-loader-svn (0.0.33-1~swh1) unstable-swh; urgency=medium * v0.0.33 * swh.loader.svn: Add option to load a repository from scratch * swh.loader.svn.loader: Fix special symlink case -- Antoine R. Dumont (@ardumont) Fri, 08 Dec 2017 17:38:37 +0100 swh-loader-svn (0.0.32-1~swh1) unstable-swh; urgency=medium * v0.0.32 * d/control: Bump dependency to latest swh-loader-core * tests: Add commits with wrong symbolic links (broken, empty space) * ra: Fix not cleaned up path leading to file exists error * docs: add absolute anchor to documentation index -- Antoine R. Dumont (@ardumont) Wed, 08 Nov 2017 13:22:42 +0100 swh-loader-svn (0.0.31-1~swh1) unstable-swh; urgency=medium * v0.0.31 * swh.loader.svn.ra: Fix blank space in symlink path split problem * swh.loader.svn.ra: Fix missing case about existing directory * swh.loader.svn.ra: Explicit the closure * swh.loader.svn: Deal with origin creation inhibition in base class * swh.loader.svn: Remove unneeded instruction * swh.loader.svn: Fix initializing the origin multiple times * swh.loader.svn: Remove unneeded except clause * swh.loader.svn: uneventful visit is not an error -- Antoine R. Dumont (@ardumont) Tue, 24 Oct 2017 16:35:01 +0200 swh-loader-svn (0.0.30-1~swh1) unstable-swh; urgency=medium * Release swh.loader.svn version 0.0.30 * Update packaging runes -- Nicolas Dandrimont Thu, 12 Oct 2017 18:07:58 +0200 swh-loader-svn (0.0.29-1~swh1) unstable-swh; urgency=medium * v0.0.29 * swh.loader.svn.loader: Fix missing revision id key (which can lead * to an empty partial visit for example in the case of a repository * holding an svn:externals property). -- Antoine R. Dumont (@ardumont) Mon, 09 Oct 2017 16:02:23 +0200 swh-loader-svn (0.0.28-1~swh1) unstable-swh; urgency=medium * Release swh.loader.svn v0.0.28 * Replace swh.model.git with swh.model.from_disk -- Nicolas Dandrimont Fri, 06 Oct 2017 17:18:57 +0200 swh-loader-svn (0.0.27-1~swh1) unstable-swh; urgency=medium * v0.0.27 * d/control: Bump dependency to latest swh.loader.core * swh.loader.svn: Add args to raised exception in edge cases * swh-hashtree: Fix no longer existing swh.core.hashutil import * docs/: add sphinx apidoc generation skeleton -- Antoine R. Dumont (@ardumont) Tue, 03 Oct 2017 19:01:26 +0200 swh-loader-svn (0.0.26-1~swh1) unstable-swh; urgency=medium * Release swh.loader.svn 0.0.26 * update tasks to new swh.scheduler API -- Nicolas Dandrimont Mon, 12 Jun 2017 18:25:40 +0200 swh-loader-svn (0.0.25-1~swh1) unstable-swh; urgency=medium * v0.0.25 * Add blake2s256 new hash computation on content * Use gzip instead of pigz * Migrate from swh.core.hashutil to swh.model.hashutil -- Antoine R. Dumont (@ardumont) Tue, 04 Apr 2017 14:18:57 +0200 swh-loader-svn (0.0.24-1~swh1) unstable-swh; urgency=medium * v0.0.24 * Simplify loader's logic -- Antoine R. Dumont (@ardumont) Wed, 22 Feb 2017 14:09:15 +0100 swh-loader-svn (0.0.23-1~swh1) unstable-swh; urgency=medium * Release swh.loader.svn v0.0.23 * Return timestamps as pairs of integers (Close T680) -- Nicolas Dandrimont Tue, 14 Feb 2017 19:40:27 +0100 swh-loader-svn (0.0.22-1~swh1) unstable-swh; urgency=medium * v0.0.22 * Pass optionally the visit date to producer -- Antoine R. Dumont (@ardumont) Tue, 10 Jan 2017 15:03:45 +0100 swh-loader-svn (0.0.21-1~swh1) unstable-swh; urgency=medium * v0.0.21 * Use the dump's fetch date as visit date -- Antoine R. Dumont (@ardumont) Tue, 10 Jan 2017 15:03:24 +0100 swh-loader-svn (0.0.20-1~swh1) unstable-swh; urgency=medium * v0.0.20 * Fix function call -- Antoine R. Dumont (@ardumont) Fri, 06 Jan 2017 15:38:14 +0100 swh-loader-svn (0.0.19-1~swh1) unstable-swh; urgency=medium * v0.0.19 * Rename task_queue adequately * Fix - Remove empty temporary directory in corner cases * Fix generator issue when using local storage -- Antoine R. Dumont (@ardumont) Fri, 06 Jan 2017 14:10:19 +0100 swh-loader-svn (0.0.18-1~swh1) unstable-swh; urgency=medium * v0.0.18 * Add check revision hash computation divergence during loading * Add task to load a svn repository from an archive dump and load the * repository * Raise error when svn:externals keyword is encountered (T610) since * it's not dealt with yet. * Revert modifications related to svn:eol-style since no good policy has * been found yet to deal with it -- Antoine R. Dumont (@ardumont) Thu, 15 Dec 2016 10:57:26 +0100 swh-loader-svn (0.0.17-1~swh1) unstable-swh; urgency=medium * v0.0.17 * Force eol conversion when needed -- Antoine R. Dumont (@ardumont) Thu, 08 Dec 2016 18:25:55 +0100 swh-loader-svn (0.0.16-1~swh1) unstable-swh; urgency=medium * v0.0.16 * Improve origin_visit policy -- Antoine R. Dumont (@ardumont) Fri, 26 Aug 2016 15:59:31 +0200 swh-loader-svn (0.0.15-1~swh1) unstable-swh; urgency=medium * v0.0.15 * Update svn loader to register origin_visit's state -- Antoine R. Dumont (@ardumont) Wed, 24 Aug 2016 14:56:54 +0200 swh-loader-svn (0.0.14-1~swh1) unstable-swh; urgency=medium * v0.0.14 * Update svn loader to register origin_visit's state -- Antoine R. Dumont (@ardumont) Tue, 23 Aug 2016 16:38:16 +0200 swh-loader-svn (0.0.13-1~swh1) unstable-swh; urgency=medium * v0.0.13 -- Antoine R. Dumont (@ardumont) Thu, 18 Aug 2016 10:30:13 +0200 swh-loader-svn (0.0.12-1~swh1) unstable-swh; urgency=medium * v0.0.12 * Inhibit keyword expansion during export phase (svn update) -- Antoine R. Dumont (@ardumont) Wed, 06 Jul 2016 16:17:51 +0200 swh-loader-svn (0.0.11-1~swh1) unstable-swh; urgency=medium * v0.0.11 * Reschedule when error on loading an svn repository * Start from last known revision * Permit to load local mirror with remote mirror origin -- Antoine R. Dumont (@ardumont) Fri, 01 Jul 2016 16:51:37 +0200 swh-loader-svn (0.0.10-1~swh1) unstable-swh; urgency=medium * v0.0.10 * Add retry policy around britle action (connection to remote svn server) -- Antoine R. Dumont (@ardumont) Sat, 25 Jun 2016 11:30:34 +0200 swh-loader-svn (0.0.9-1~swh1) unstable-swh; urgency=medium * v0.0.9 * Restrict loader to 2 possible policies: swh, git-svn * Improve coverage * Update README -- Antoine R. Dumont (@ardumont) Fri, 24 Jun 2016 13:56:54 +0200 swh-loader-svn (0.0.8-1~swh1) unstable-swh; urgency=medium * v0.0.8 * Use remote-access approach to hash and compute hashes from svn * repository (migrate major dependency from pysvn to subvertpy) -- Antoine R. Dumont (@ardumont) Sat, 11 Jun 2016 19:55:54 +0200 swh-loader-svn (0.0.7-1~swh1) unstable-swh; urgency=medium * v0.0.7 * d/control: Bump dependency version to latest swh-model -- Antoine R. Dumont (@ardumont) Thu, 26 May 2016 16:10:32 +0200 swh-loader-svn (0.0.6-1~swh1) unstable-swh; urgency=medium * v0.0.6 * d/control: Bump swh-model dependency * Simplify ignore folder corner cases * Rework log -- Antoine R. Dumont (@ardumont) Wed, 25 May 2016 23:53:10 +0200 swh-loader-svn (0.0.5-1~swh1) unstable-swh; urgency=medium * v0.0.5 * Add svn update behavior as option (default to True) * d/control: Bump dependency version to swh-loader-core -- Antoine R. Dumont (@ardumont) Wed, 25 May 2016 12:44:35 +0200 swh-loader-svn (0.0.4-1~swh1) unstable-swh; urgency=medium * v0.0.4 * Add options for git-svn like behavior (git svn clone --no- metadata) * Ignore empty folder * Add extra-line in svn commit message * No revision metadata (beware that this break the update repo * mechanism) * Also, use @ pattern for committer/author -- Antoine R. Dumont (@ardumont) Tue, 24 May 2016 17:04:40 +0200 swh-loader-svn (0.0.3-1~swh1) unstable-swh; urgency=medium * v0.0.3 * Improve filesystem cleanup (before: left empty directory) * Use pysvn to extract uuid information (before: subprocess with subversion call) * Keep the working copy's name on the local checkout -- Antoine R. Dumont (@ardumont) Fri, 15 Apr 2016 16:10:51 +0200 swh-loader-svn (0.0.2-1~swh1) unstable-swh; urgency=medium * v0.0.2 * Update to the right swh dependencies. -- Antoine R. Dumont (@ardumont) Fri, 15 Apr 2016 13:02:04 +0200 swh-loader-svn (0.0.1-1~swh1) unstable-swh; urgency=medium * Initial release * v0.0.1 -- Antoine R. Dumont (@ardumont) Wed, 13 Apr 2016 16:46:37 +0200 diff --git a/debian/control b/debian/control index c0155ba..347cc65 100644 --- a/debian/control +++ b/debian/control @@ -1,39 +1,40 @@ Source: swh-loader-svn Maintainer: Software Heritage developers Section: python Priority: optional Build-Depends: debhelper (>= 9), dh-python (>= 2), python3-all, python3-click, python3-dateutil, python3-pytest, python3-pytest-mock, python3-pytest-postgresql, python3-swh.core.db.pytestplugin, python3-setuptools, python3-setuptools-scm, python3-subvertpy (>= 0.9.4~), python3-swh.core (>= 0.0.19~), python3-swh.loader.core (>= 0.5.9~), python3-swh.model (>= 0.4.0~), python3-swh.scheduler (>= 0.0.39~), python3-swh.storage (>= 0.11.3~), + python3-tenacity, python3-typing-extensions (>= 3.7.4~), subversion Standards-Version: 3.9.6 Homepage: https://forge.softwareheritage.org/diffusion/DLDSVN/ Package: python3-swh.loader.svn Architecture: all Depends: gzip, python3-swh.core (>= 0.0.19~), python3-swh.loader.core (>= 0.5.9~), python3-swh.model (>= 0.4.0~), python3-swh.scheduler (>= 0.0.39~), python3-swh.storage (>= 0.11.3~), subversion, ${misc:Depends}, ${python3:Depends} Description: Software Heritage Loader Svn Module in charge of loading svn repositories into swh storage. diff --git a/pytest.ini b/pytest.ini index bfdfdf2..d14d20c 100644 --- a/pytest.ini +++ b/pytest.ini @@ -1,7 +1,7 @@ [pytest] # Drop this when these fixtures aren't imported automatically addopts = -p no:pytest_swh_scheduler -p no:pytest_swh_storage -norecursedirs = docs .* +norecursedirs = build docs .* markers = fs: execute tests that write to the filesystem diff --git a/requirements.txt b/requirements.txt index f03579d..c737527 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,8 @@ # Add here external Python modules dependencies, one per line. Module names # should match https://pypi.python.org/pypi names. For the full spec or # dependency lines, see https://pip.readthedocs.org/en/1.1/requirements.html click iso8601 subvertpy >= 0.9.4 +tenacity >= 6.2 typing-extensions diff --git a/swh.loader.svn.egg-info/PKG-INFO b/swh.loader.svn.egg-info/PKG-INFO index f591269..355e5a9 100644 --- a/swh.loader.svn.egg-info/PKG-INFO +++ b/swh.loader.svn.egg-info/PKG-INFO @@ -1,61 +1,61 @@ Metadata-Version: 2.1 Name: swh.loader.svn -Version: 1.2.1 +Version: 1.3.0 Summary: Software Heritage Loader SVN Home-page: https://forge.softwareheritage.org/diffusion/DLDSVN Author: Software Heritage developers Author-email: swh-devel@inria.fr License: UNKNOWN Project-URL: Bug Reports, https://forge.softwareheritage.org/maniphest Project-URL: Funding, https://www.softwareheritage.org/donate Project-URL: Source, https://forge.softwareheritage.org/source/swh-loader-svn Project-URL: Documentation, https://docs.softwareheritage.org/devel/swh-loader-svn/ Platform: UNKNOWN Classifier: Programming Language :: Python :: 3 Classifier: Intended Audience :: Developers Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3) Classifier: Operating System :: OS Independent Classifier: Development Status :: 5 - Production/Stable Requires-Python: >=3.7 Description-Content-Type: text/markdown Provides-Extra: testing License-File: LICENSE License-File: AUTHORS swh-loader-svn ============== The Software Heritage SVN Loader is a tool and a library to walk a remote svn repository and inject into the SWH dataset all contained files that weren't known before. The main entry points are - :class:`swh.loader.svn.loader.SvnLoader` for the main svn loader which ingests content out of a remote svn repository - :class:`swh.loader.svn.loader.SvnLoaderFromDumpArchive` which mounts a repository out of a svn dump prior to ingest it. - :class:`swh.loader.svn.loader.SvnLoaderFromRemoteDump` which mounts a repository with svnrdump prior to ingest its content. # CLI run With the configuration: /tmp/loader_svn.yml: ``` storage: cls: remote args: url: http://localhost:5002/ ``` Run: ``` swh loader --config-file /tmp/loader_svn.yml \ run svn ``` diff --git a/swh.loader.svn.egg-info/SOURCES.txt b/swh.loader.svn.egg-info/SOURCES.txt index a7164de..3e19c6c 100644 --- a/swh.loader.svn.egg-info/SOURCES.txt +++ b/swh.loader.svn.egg-info/SOURCES.txt @@ -1,72 +1,74 @@ .gitignore .pre-commit-config.yaml AUTHORS CODE_OF_CONDUCT.md CONTRIBUTORS LICENSE MANIFEST.in Makefile README.md conftest.py mypy.ini pyproject.toml pytest.ini requirements-swh.txt requirements-test.txt requirements.txt setup.cfg setup.py svn-lib-client-analysis.org tox.ini bin/init-svn-repository.sh bin/swh-svn docs/.gitignore docs/Makefile docs/conf.py docs/index.rst docs/swh-loader-svn.txt docs/_static/.placeholder docs/_templates/.placeholder install/install-pysvn.sh install/install-subvertpy.sh resources/svn.ini swh/__init__.py swh.loader.svn.egg-info/PKG-INFO swh.loader.svn.egg-info/SOURCES.txt swh.loader.svn.egg-info/dependency_links.txt swh.loader.svn.egg-info/entry_points.txt swh.loader.svn.egg-info/requires.txt swh.loader.svn.egg-info/top_level.txt swh/loader/__init__.py swh/loader/svn/__init__.py swh/loader/svn/converters.py swh/loader/svn/exception.py swh/loader/svn/loader.py swh/loader/svn/py.typed swh/loader/svn/replay.py swh/loader/svn/svn.py +swh/loader/svn/svn_retry.py swh/loader/svn/tasks.py swh/loader/svn/utils.py swh/loader/svn/tests/__init__.py swh/loader/svn/tests/conftest.py swh/loader/svn/tests/test_converters.py swh/loader/svn/tests/test_externals.py swh/loader/svn/tests/test_loader.org swh/loader/svn/tests/test_loader.py +swh/loader/svn/tests/test_svn_retry.py swh/loader/svn/tests/test_task.py swh/loader/svn/tests/test_utils.py swh/loader/svn/tests/utils.py swh/loader/svn/tests/data/httthttt.tgz swh/loader/svn/tests/data/mediawiki-repo-r407-eol-native-crlf.tgz swh/loader/svn/tests/data/penguinsdbtools2018.dump.gz swh/loader/svn/tests/data/pkg-doc-linux-r10.tgz swh/loader/svn/tests/data/pkg-doc-linux-r11.tgz swh/loader/svn/tests/data/pkg-doc-linux-r12.tgz swh/loader/svn/tests/data/pkg-gourmet-add-remove-dir.tgz swh/loader/svn/tests/data/pkg-gourmet-tampered-rev6-log.tgz swh/loader/svn/tests/data/pkg-gourmet-with-edge-case-links-and-files.tgz swh/loader/svn/tests/data/pkg-gourmet-with-external-id.tgz swh/loader/svn/tests/data/pkg-gourmet-with-updates.tgz swh/loader/svn/tests/data/pkg-gourmet-with-wrong-link-cases.tgz swh/loader/svn/tests/data/pkg-gourmet.tgz swh/loader/svn/tests/data/pyang-repo-r343-eol-native-mixed-lf-crlf.tgz \ No newline at end of file diff --git a/swh.loader.svn.egg-info/requires.txt b/swh.loader.svn.egg-info/requires.txt index bf13391..feedd92 100644 --- a/swh.loader.svn.egg-info/requires.txt +++ b/swh.loader.svn.egg-info/requires.txt @@ -1,16 +1,17 @@ click iso8601 subvertpy>=0.9.4 +tenacity>=6.2 typing-extensions swh.storage>=0.11.3 swh.model>=4.3.0 swh.scheduler>=0.0.39 swh.loader.core>=0.18 [testing] pytest<7.0.0 pytest-mock pytest-postgresql swh.core[http]>=0.0.61 types-click types-python-dateutil diff --git a/swh/loader/svn/replay.py b/swh/loader/svn/replay.py index f6ddd6a..66180c9 100644 --- a/swh/loader/svn/replay.py +++ b/swh/loader/svn/replay.py @@ -1,1037 +1,1036 @@ # 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 self.editor.modified_paths.add(path) 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.client.export( + 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""" 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]] = {} # repository root dir has empty path if path: self.editor.modified_paths.add(path) 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: 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] self.editor.modified_paths.discard(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: # 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)) 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) 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) 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) - logger.debug( - "svn export --ignore-keywords %s%s", - url, - f"@{revision}" if revision else "", - ) - self.svnrepo.client.export( + 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 self.editor.modified_paths.add(dest_fullpath) 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: - subdir = os.path.join(root, dir).replace(temp_path + b"/", b"") + 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 self.editor.modified_paths.update(external_paths) # 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 ) -> None: """Remove a previously exported SVN external path from the reconstructed filesystem. """ fullpath = os.path.join(self.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: self.editor.external_paths[fullpath] -= 1 if ( force or 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] 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])) 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 # to store the set of paths added or modified when replaying a revision self.modified_paths: Set[bytes] = set() 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: # a new revision is being replayed so clear the modified_paths set self.modified_paths.clear() 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] = [] directories.append(self.editor.directory.to_model()) for path in self.editor.modified_paths: obj = self.directory[path].to_model() 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) 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/svn.py b/swh/loader/svn/svn.py index e14aaba..84fc5ee 100644 --- a/swh/loader/svn/svn.py +++ b/swh/loader/svn/svn.py @@ -1,414 +1,526 @@ # Copyright (C) 2015-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 """SVN client in charge of iterating over svn logs and yield commit representations including the hash tree/content computations per svn commit. """ - import logging import os import shutil import tempfile from typing import Dict, Iterator, List, Optional, Tuple, Union from subvertpy import SubversionException, client, properties from subvertpy.ra import Auth, RemoteAccess, get_username_provider from swh.model.from_disk import Directory as DirectoryFromDisk from swh.model.model import ( Content, Directory, Person, SkippedContent, TimestampWithTimezone, ) from . import converters, replay +from .svn_retry import svn_retry from .utils import is_recursive_external, parse_external_definition # When log message contains empty data DEFAULT_AUTHOR_MESSAGE = "" - logger = logging.getLogger(__name__) class SvnRepo: """Svn repository representation. Args: remote_url: Remove svn repository url origin_url: Associated origin identifier local_dirname: Path to write intermediary svn action results """ def __init__( self, remote_url: str, origin_url: str, local_dirname: str, max_content_length: int, from_dump: bool = False, ): self.remote_url = remote_url.rstrip("/") self.origin_url = origin_url self.from_dump = from_dump auth = Auth([get_username_provider()]) # one connection for log iteration - self.conn_log = RemoteAccess(self.remote_url, auth=auth) + self.conn_log = self.remote_access(auth) # another for replay - self.conn = RemoteAccess(self.remote_url, auth=auth) + self.conn = self.remote_access(auth) # one client for update operation self.client = client.Client(auth=auth) self.local_dirname = local_dirname local_name = os.path.basename(self.remote_url) self.local_url = os.path.join(self.local_dirname, local_name).encode("utf-8") self.uuid = self.conn.get_uuid().encode("utf-8") self.swhreplay = replay.Replay( conn=self.conn, rootpath=self.local_url, svnrepo=self, temp_dir=local_dirname, ) self.max_content_length = max_content_length self.has_relative_externals = False self.has_recursive_externals = False self.replay_started = False # compute root directory path from the remote repository URL, required to # properly load the sub-tree of a repository mounted from a dump file info = self.client.info(origin_url.rstrip("/")) repos_root_url = next(iter(info.values())).repos_root_url self.root_directory = origin_url.replace(repos_root_url, "", 1) def __str__(self): return str( { "swh-origin": self.origin_url, "remote_url": self.remote_url, "local_url": self.local_url, "uuid": self.uuid, } ) def head_revision(self) -> int: """Retrieve current head revision. """ return self.conn.get_latest_revnum() def initial_revision(self) -> int: """Retrieve the initial revision from which the remote url appeared. """ return 1 def convert_commit_message(self, msg: Union[str, bytes]) -> bytes: """Simply encode the commit message. Args: msg: the commit message to convert. Returns: The transformed message as bytes. """ if isinstance(msg, bytes): return msg return msg.encode("utf-8") def convert_commit_date(self, date: bytes) -> TimestampWithTimezone: """Convert the message commit date into a timestamp in swh format. The precision is kept. Args: date: the commit date to convert. Returns: The transformed date. """ return converters.svn_date_to_swh_date(date) def convert_commit_author(self, author: Optional[bytes]) -> Person: """Convert the commit author into an swh person. Args: author: the commit author to convert. Returns: Person as model object """ return converters.svn_author_to_swh_person(author) def __to_entry(self, log_entry: Tuple) -> Dict: changed_paths, rev, revprops, has_children = log_entry author_date = self.convert_commit_date( revprops.get(properties.PROP_REVISION_DATE) ) author = self.convert_commit_author( revprops.get(properties.PROP_REVISION_AUTHOR) ) message = self.convert_commit_message( revprops.get(properties.PROP_REVISION_LOG, DEFAULT_AUTHOR_MESSAGE) ) has_changes = ( not self.from_dump or changed_paths is not None and any( changed_path.startswith(self.root_directory) for changed_path in changed_paths.keys() ) ) return { "rev": rev, "author_date": author_date, "author_name": author, "message": message, "has_changes": has_changes, } def logs(self, revision_start: int, revision_end: int) -> Iterator[Dict]: """Stream svn logs between revision_start and revision_end by chunks of block_size logs. Yields revision and associated revision information between the revision start and revision_end. Args: revision_start: the svn revision starting bound revision_end: the svn revision ending bound Yields: tuple: tuple of revisions and logs: - revisions: list of revisions in order - logs: Dictionary with key revision number and value the log entry. The log entry is a dictionary with the following keys: - author_date: date of the commit - author_name: name of the author - message: commit message """ for log_entry in self.conn_log.iter_log( paths=None, start=revision_start, end=revision_end, discover_changed_paths=self.from_dump, ): yield self.__to_entry(log_entry) + @svn_retry() + def remote_access(self, auth: Auth) -> RemoteAccess: + """Simple wrapper around subvertpy.ra.RemoteAccess creation + enabling to retry the operation if a network error occurs.""" + return RemoteAccess(self.remote_url, auth=auth) + + @svn_retry() + def export( + self, + url: str, + to: str, + rev: Optional[int] = None, + peg_rev: Optional[int] = None, + recurse: bool = True, + ignore_externals: bool = False, + overwrite: bool = False, + ignore_keywords: bool = False, + ) -> int: + """Simple wrapper around subvertpy.client.Client.export enabling to retry + the command if a network error occurs. + + See documentation of svn_client_export5 function from subversion C API + to get details about parameters. + """ + # remove export path as command can be retried + if os.path.isfile(to) or os.path.islink(to): + os.remove(to) + elif os.path.isdir(to): + shutil.rmtree(to) + options = [] + if rev is not None: + options.append(f"-r {rev}") + if recurse: + options.append("--depth infinity") + if ignore_externals: + options.append("--ignore-externals") + if overwrite: + options.append("--force") + if ignore_keywords: + options.append("--ignore-keywords") + logger.debug( + "svn export %s %s%s %s", + " ".join(options), + url, + f"@{peg_rev}" if peg_rev else "", + to, + ) + return self.client.export( + url, + to=to, + rev=rev, + peg_rev=peg_rev, + recurse=recurse, + ignore_externals=ignore_externals, + overwrite=overwrite, + ignore_keywords=ignore_keywords, + ) + + @svn_retry() + def checkout( + self, + url: str, + path: str, + rev: Optional[int] = None, + peg_rev: Optional[int] = None, + recurse: bool = True, + ignore_externals: bool = False, + allow_unver_obstructions: bool = False, + ) -> int: + """Simple wrapper around subvertpy.client.Client.checkout enabling to retry + the command if a network error occurs. + + See documentation of svn_client_checkout3 function from subversion C API + to get details about parameters. + """ + # remove checkout path as command can be retried + if os.path.isdir(path): + shutil.rmtree(path) + options = [] + if rev is not None: + options.append(f"-r {rev}") + if recurse: + options.append("--depth infinity") + if ignore_externals: + options.append("--ignore-externals") + logger.debug( + "svn checkout %s %s%s %s", + " ".join(options), + self.remote_url, + f"@{peg_rev}" if peg_rev else "", + path, + ) + return self.client.checkout( + url, + path=path, + rev=rev, + peg_rev=peg_rev, + recurse=recurse, + ignore_externals=ignore_externals, + allow_unver_obstructions=allow_unver_obstructions, + ) + + @svn_retry() + def propget( + self, + name: str, + target: str, + peg_rev: Optional[int], + rev: Optional[int] = None, + recurse: bool = False, + ): + """Simple wrapper around subvertpy.client.Client.propget enabling to retry + the command if a network error occurs. + + See documentation of svn_client_propget5 function from subversion C API + to get details about parameters. + """ + return self.client.propget(name, target, peg_rev, rev, recurse) + def export_temporary(self, revision: int) -> Tuple[str, bytes]: """Export the repository to a given revision in a temporary location. This is up to the caller of this function to clean up the temporary location when done (cf. self.clean_fs method) Args: revision: Revision to export at Returns: The tuple local_dirname the temporary location root folder, local_url where the repository was exported. """ local_dirname = tempfile.mkdtemp( dir=self.local_dirname, prefix=f"check-revision-{revision}." ) local_name = os.path.basename(self.remote_url) local_url = os.path.join(local_dirname, local_name) url = self.remote_url # if some paths have external URLs relative to the repository URL but targeting # paths outside it, we need to export from the origin URL as the remote URL can # target a dump mounted on the local filesystem if self.replay_started and self.has_relative_externals: # externals detected while replaying revisions url = self.origin_url elif not self.replay_started: # revisions replay has not started, we need to check if svn:externals # properties are set from a checkout of the revision and if some # external URLs are relative to pick the right export URL, # recursive externals are also checked with tempfile.TemporaryDirectory( dir=self.local_dirname, prefix=f"checkout-revision-{revision}." ) as co_dirname: - logger.debug( - "svn checkout --ignore-externals %s@%s", self.remote_url, revision, - ) - self.client.checkout( + + self.checkout( self.remote_url, co_dirname, revision, ignore_externals=True ) # get all svn:externals properties recursively - externals = self.client.propget( - "svn:externals", co_dirname, None, None, True - ) + externals = self.propget("svn:externals", co_dirname, None, None, True) self.has_relative_externals = False self.has_recursive_externals = False for path, external_defs in externals.items(): if self.has_relative_externals or self.has_recursive_externals: break path = path.replace(self.remote_url.rstrip("/") + "/", "") for external_def in os.fsdecode(external_defs).split("\n"): # skip empty line or comment if not external_def or external_def.startswith("#"): continue ( external_path, external_url, _, relative_url, ) = parse_external_definition( external_def.rstrip("\r"), path, self.origin_url ) if is_recursive_external( self.origin_url, path, external_path, external_url, ): self.has_recursive_externals = True url = self.remote_url break if relative_url: self.has_relative_externals = True url = self.origin_url break try: url = url.rstrip("/") - logger.debug( - "svn export --ignore-keywords %s@%s", url, revision, - ) - self.client.export( + + self.export( url, to=local_url, rev=revision, ignore_keywords=True, ignore_externals=self.has_recursive_externals, ) except SubversionException as se: if se.args[0].startswith( ( "Error parsing svn:externals property", "Unrecognized format for the relative external URL", ) ): pass else: raise if self.from_dump: # when exporting a subpath of a subversion repository mounted from # a dump file generated by svnrdump, exported paths are relative to # the repository root path while they are relative to the subpath # otherwise, so we need to adjust the URL of the exported filesystem root_dir_local_url = os.path.join(local_url, self.root_directory.strip("/")) # check that root directory of a subproject did not get removed in revision if os.path.exists(root_dir_local_url): local_url = root_dir_local_url return local_dirname, os.fsencode(local_url) def swh_hash_data_per_revision( self, start_revision: int, end_revision: int ) -> Iterator[ Tuple[ int, Dict, Tuple[List[Content], List[SkippedContent], List[Directory]], DirectoryFromDisk, ], ]: """Compute swh hash data per each revision between start_revision and end_revision. Args: start_revision: starting revision end_revision: ending revision Yields: Tuple (rev, nextrev, commit, objects_per_path): - rev: current revision - commit: commit data (author, date, message) for such revision - objects_per_path: Tuple of list of objects between start_revision and end_revision - complete Directory representation """ # even in incremental loading mode, we need to replay the whole set of # path modifications from first revision to restore possible file states induced # by setting svn properties on those files (end of line style for instance) self.replay_started = True first_revision = 1 if start_revision else 0 # handle empty repository edge case for commit in self.logs(first_revision, end_revision): rev = commit["rev"] objects = self.swhreplay.compute_objects(rev) if rev >= start_revision: # start yielding new data to archive once we reached the revision to # resume the loading from if commit["has_changes"] or start_revision == 0: # yield data only if commit has changes or if repository is empty root_dir_path = self.root_directory.encode()[1:] if not root_dir_path or root_dir_path in self.swhreplay.directory: root_dir = self.swhreplay.directory[root_dir_path] else: # root directory of subproject got removed in revision, return # empty directory for that edge case root_dir = DirectoryFromDisk() yield rev, commit, objects, root_dir def swh_hash_data_at_revision( self, revision: int ) -> Tuple[Dict, DirectoryFromDisk]: """Compute the information at a given svn revision. This is expected to be used for checks only. Yields: The tuple (commit dictionary, targeted directory object). """ # Update disk representation of the repository at revision id local_dirname, local_url = self.export_temporary(revision) # Compute the current hashes on disk directory = DirectoryFromDisk.from_disk( path=local_url, max_content_length=self.max_content_length ) # Retrieve the commit information for revision commit = list(self.logs(revision, revision))[0] # Clean export directory self.clean_fs(local_dirname) return commit, directory def clean_fs(self, local_dirname: Optional[str] = None) -> None: """Clean up the local working copy. Args: local_dirname: Path to remove recursively if provided. Otherwise, remove the temporary upper root tree used for svn repository loading. """ dirname = local_dirname or self.local_dirname if os.path.exists(dirname): logger.debug("cleanup %s", dirname) shutil.rmtree(dirname) diff --git a/swh/loader/svn/svn_retry.py b/swh/loader/svn/svn_retry.py new file mode 100644 index 0000000..5080df5 --- /dev/null +++ b/swh/loader/svn/svn_retry.py @@ -0,0 +1,41 @@ +# 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 logging + +from subvertpy import SubversionException +from tenacity import retry +from tenacity.before_sleep import before_sleep_log +from tenacity.retry import retry_if_exception +from tenacity.stop import stop_after_attempt +from tenacity.wait import wait_exponential + +logger = logging.getLogger(__name__) + +SVN_RETRY_WAIT_EXP_BASE = 10 +SVN_RETRY_MAX_ATTEMPTS = 5 + + +def is_retryable_svn_exception(exception): + if isinstance(exception, SubversionException): + return exception.args[0].startswith( + ( + "Connection timed out", + "Unable to connect to a repository at URL", + "Error running context: The server unexpectedly closed the connection", + ) + ) + return isinstance(exception, (ConnectionResetError, TimeoutError)) + + +def svn_retry(): + return retry( + retry=retry_if_exception(is_retryable_svn_exception), + wait=wait_exponential(exp_base=SVN_RETRY_WAIT_EXP_BASE), + stop=stop_after_attempt(max_attempt_number=SVN_RETRY_MAX_ATTEMPTS), + before_sleep=before_sleep_log(logger, logging.DEBUG), + reraise=True, + ) diff --git a/swh/loader/svn/tests/test_externals.py b/swh/loader/svn/tests/test_externals.py index 1ca8e5a..a9a4784 100644 --- a/swh/loader/svn/tests/test_externals.py +++ b/swh/loader/svn/tests/test_externals.py @@ -1,1272 +1,1337 @@ # 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.loader import SvnLoader, SvnLoaderFromRemoteDump, SvnRepo 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(autouse=True) +def svn_retry_sleep_mocker(mocker): + mocker.patch.object(SvnRepo.export.retry, "sleep") + mocker.patch.object(SvnRepo.checkout.retry, "sleep") + mocker.patch.object(SvnRepo.propget.retry, "sleep") + mocker.patch.object(SvnRepo.remote_access.retry, "sleep") + + @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): +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) diff --git a/swh/loader/svn/tests/test_svn_retry.py b/swh/loader/svn/tests/test_svn_retry.py new file mode 100644 index 0000000..351c32f --- /dev/null +++ b/swh/loader/svn/tests/test_svn_retry.py @@ -0,0 +1,285 @@ +# 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 os + +import pytest +from subvertpy import SubversionException +from subvertpy.ra import Auth, RemoteAccess, get_username_provider + +from swh.loader.svn.svn import SvnRepo +from swh.loader.svn.svn_retry import SVN_RETRY_MAX_ATTEMPTS, SVN_RETRY_WAIT_EXP_BASE +from swh.loader.tests import prepare_repository_from_archive + + +def _get_repo_url(archive_name, datadir, tmp_path): + archive_path = os.path.join(datadir, f"{archive_name}.tgz") + return prepare_repository_from_archive(archive_path, "pkg-gourmet", tmp_path) + + +@pytest.fixture() +def sample_repo_url(datadir, tmp_path): + return _get_repo_url("pkg-gourmet", datadir, tmp_path) + + +@pytest.fixture() +def sample_repo_with_externals_url(datadir, tmp_path): + return _get_repo_url("pkg-gourmet-with-external-id", datadir, tmp_path) + + +class SVNClientWrapper: + """Methods of subvertpy.client.Client cannot be patched by mocker fixture + as they are read only attributes due to subvertpy.client module being + a C extension module. So we use that wrapper class instead to simulate + mocking behavior. + """ + + def __init__(self, client, exception, nb_failed_calls): + self.client = client + self.exception = exception + self.nb_failed_calls = nb_failed_calls + self.nb_calls = 0 + + def _wrapped_svn_cmd(self, svn_cmd, *args, **kwargs): + self.nb_calls = self.nb_calls + 1 + if self.nb_calls <= self.nb_failed_calls: + raise self.exception + else: + return svn_cmd(*args, **kwargs) + + def export(self, *args, **kwargs): + return self._wrapped_svn_cmd(self.client.export, *args, **kwargs) + + def checkout(self, *args, **kwargs): + return self._wrapped_svn_cmd(self.client.checkout, *args, **kwargs) + + def propget(self, *args, **kwargs): + return self._wrapped_svn_cmd(self.client.propget, *args, **kwargs) + + +def assert_sleep_calls(mock_sleep, mocker, nb_failures): + mock_sleep.assert_has_calls( + [ + mocker.call(param) + for param in [SVN_RETRY_WAIT_EXP_BASE ** i for i in range(nb_failures)] + ] + ) + + +RETRYABLE_EXCEPTIONS = [ + SubversionException( + "Error running context: The server unexpectedly closed the connection.", 120108, + ), + SubversionException("Connection timed out", 175012), + SubversionException("Unable to connect to a repository at URL", 170013), + ConnectionResetError(), + TimeoutError(), +] + + +@pytest.mark.parametrize("exception_to_retry", RETRYABLE_EXCEPTIONS) +def test_svn_export_retry_success( + mocker, tmp_path, sample_repo_url, exception_to_retry +): + svnrepo = SvnRepo( + sample_repo_url, sample_repo_url, tmp_path, max_content_length=100000 + ) + + mock_sleep = mocker.patch.object(svnrepo.export.retry, "sleep") + + nb_failed_calls = 2 + svnrepo.client = SVNClientWrapper( + svnrepo.client, exception_to_retry, nb_failed_calls + ) + + export_path = os.path.join(tmp_path, "export") + svnrepo.export(sample_repo_url, export_path) + assert os.path.exists(export_path) + + assert_sleep_calls(mock_sleep, mocker, nb_failed_calls) + + +@pytest.mark.parametrize("exception_to_retry", RETRYABLE_EXCEPTIONS) +def test_svn_export_retry_failure( + mocker, tmp_path, sample_repo_url, exception_to_retry +): + svnrepo = SvnRepo( + sample_repo_url, sample_repo_url, tmp_path, max_content_length=100000 + ) + + mock_sleep = mocker.patch.object(svnrepo.export.retry, "sleep") + + nb_failed_calls = SVN_RETRY_MAX_ATTEMPTS + svnrepo.client = SVNClientWrapper( + svnrepo.client, exception_to_retry, nb_failed_calls + ) + + with pytest.raises(type(exception_to_retry)): + export_path = os.path.join(tmp_path, "export") + svnrepo.export(sample_repo_url, export_path) + + assert not os.path.exists(export_path) + + assert_sleep_calls(mock_sleep, mocker, nb_failed_calls - 1) + + +@pytest.mark.parametrize("exception_to_retry", RETRYABLE_EXCEPTIONS) +def test_svn_checkout_retry_success( + mocker, tmp_path, sample_repo_url, exception_to_retry +): + svnrepo = SvnRepo( + sample_repo_url, sample_repo_url, tmp_path, max_content_length=100000 + ) + + mock_sleep = mocker.patch.object(svnrepo.checkout.retry, "sleep") + + nb_failed_calls = 2 + svnrepo.client = SVNClientWrapper( + svnrepo.client, exception_to_retry, nb_failed_calls + ) + + checkout_path = os.path.join(tmp_path, "checkout") + svnrepo.checkout(sample_repo_url, checkout_path, svnrepo.head_revision()) + assert os.path.exists(checkout_path) + + assert_sleep_calls(mock_sleep, mocker, nb_failed_calls) + + +@pytest.mark.parametrize("exception_to_retry", RETRYABLE_EXCEPTIONS) +def test_svn_checkout_retry_failure( + mocker, tmp_path, sample_repo_url, exception_to_retry +): + svnrepo = SvnRepo( + sample_repo_url, sample_repo_url, tmp_path, max_content_length=100000 + ) + + mock_sleep = mocker.patch.object(svnrepo.checkout.retry, "sleep") + + nb_failed_calls = SVN_RETRY_MAX_ATTEMPTS + svnrepo.client = SVNClientWrapper( + svnrepo.client, exception_to_retry, nb_failed_calls + ) + + checkout_path = os.path.join(tmp_path, "checkout") + with pytest.raises(type(exception_to_retry)): + svnrepo.checkout(sample_repo_url, checkout_path, svnrepo.head_revision()) + + assert not os.path.exists(checkout_path) + + assert_sleep_calls(mock_sleep, mocker, nb_failed_calls - 1) + + +@pytest.mark.parametrize("exception_to_retry", RETRYABLE_EXCEPTIONS) +def test_svn_propget_retry_success( + mocker, tmp_path, sample_repo_with_externals_url, exception_to_retry +): + svnrepo = SvnRepo( + sample_repo_with_externals_url, + sample_repo_with_externals_url, + tmp_path, + max_content_length=100000, + ) + + checkout_path = os.path.join(tmp_path, "checkout") + svnrepo.checkout( + sample_repo_with_externals_url, + checkout_path, + svnrepo.head_revision(), + ignore_externals=True, + ) + + mock_sleep = mocker.patch.object(svnrepo.propget.retry, "sleep") + + nb_failed_calls = 2 + svnrepo.client = SVNClientWrapper( + svnrepo.client, exception_to_retry, nb_failed_calls + ) + + externals = svnrepo.propget("svn:externals", checkout_path, None, None, True) + + assert externals + + assert_sleep_calls(mock_sleep, mocker, nb_failed_calls) + + +@pytest.mark.parametrize("exception_to_retry", RETRYABLE_EXCEPTIONS) +def test_svn_propget_retry_failure( + mocker, tmp_path, sample_repo_with_externals_url, exception_to_retry +): + svnrepo = SvnRepo( + sample_repo_with_externals_url, + sample_repo_with_externals_url, + tmp_path, + max_content_length=100000, + ) + + checkout_path = os.path.join(tmp_path, "checkout") + svnrepo.checkout( + sample_repo_with_externals_url, + checkout_path, + svnrepo.head_revision(), + ignore_externals=True, + ) + + mock_sleep = mocker.patch.object(svnrepo.propget.retry, "sleep") + + nb_failed_calls = SVN_RETRY_MAX_ATTEMPTS + svnrepo.client = SVNClientWrapper( + svnrepo.client, exception_to_retry, nb_failed_calls + ) + + with pytest.raises(type(exception_to_retry)): + svnrepo.propget("svn:externals", checkout_path, None, None, True) + + assert_sleep_calls(mock_sleep, mocker, nb_failed_calls - 1) + + +@pytest.mark.parametrize("exception_to_retry", RETRYABLE_EXCEPTIONS) +def test_remote_access_retry_success( + mocker, tmp_path, sample_repo_url, exception_to_retry +): + + nb_failed_calls = 2 + mock_ra = mocker.patch("swh.loader.svn.svn.RemoteAccess") + remote_access = RemoteAccess(sample_repo_url, auth=Auth([get_username_provider()])) + mock_ra.side_effect = ( + [exception_to_retry] * nb_failed_calls + + [remote_access] + + [exception_to_retry] * nb_failed_calls + + [remote_access] + ) + + mock_sleep = mocker.patch.object(SvnRepo.remote_access.retry, "sleep") + + SvnRepo( + sample_repo_url, sample_repo_url, tmp_path, max_content_length=100000, + ) + + assert_sleep_calls(mock_sleep, mocker, nb_failed_calls) + + +@pytest.mark.parametrize("exception_to_retry", RETRYABLE_EXCEPTIONS) +def test_remote_access_retry_failure( + mocker, tmp_path, sample_repo_url, exception_to_retry +): + + nb_failed_calls = SVN_RETRY_MAX_ATTEMPTS + mock_ra = mocker.patch("swh.loader.svn.svn.RemoteAccess") + remote_access = RemoteAccess(sample_repo_url, auth=Auth([get_username_provider()])) + mock_ra.side_effect = ( + [exception_to_retry] * nb_failed_calls + + [remote_access] + + [exception_to_retry] * nb_failed_calls + + [remote_access] + ) + + mock_sleep = mocker.patch.object(SvnRepo.remote_access.retry, "sleep") + + with pytest.raises(type(exception_to_retry)): + SvnRepo( + sample_repo_url, sample_repo_url, tmp_path, max_content_length=100000, + ) + + assert_sleep_calls(mock_sleep, mocker, nb_failed_calls - 1)