Skip to content
Snippets Groups Projects
Commit 3e0e3a8b authored by Jenkins for Software Heritage's avatar Jenkins for Software Heritage
Browse files

Update upstream source from tag 'debian/upstream/0.3.0'

Update to upstream version '0.3.0'
with Debian dir a838aee4a15705419ac1e8872dad306b4c52120d
parents de2683f9 29fe5130
No related branches found
No related tags found
No related merge requests found
Metadata-Version: 2.1
Name: swh.loader.cvs
Version: 0.2.2
Version: 0.3.0
Summary: Software Heritage CVS Loader
Home-page: https://forge.softwareheritage.org/diffusion/swh-loader-cvs
Author: Software Heritage developers
......
......@@ -3,3 +3,5 @@
norecursedirs = build docs .*
markers =
fs: execute tests that write to the filesystem
asyncio_mode = strict
......@@ -2,4 +2,6 @@
# 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
sentry-sdk
tenacity
Metadata-Version: 2.1
Name: swh.loader.cvs
Version: 0.2.2
Version: 0.3.0
Summary: Software Heritage CVS Loader
Home-page: https://forge.softwareheritage.org/diffusion/swh-loader-cvs
Author: Software Heritage developers
......
sentry-sdk
tenacity
swh.core[http]>=0.3
swh.storage>=0.11.3
......
# Copyright (C) 2015-2021 The Software Heritage developers
# Copyright (C) 2015-2022 The Software Heritage developers
# See the AUTHORS file at the top-level directory of this distribution
# License: GNU Affero General Public License version 3, or any later version
# See top-level LICENSE file for more information
......@@ -15,6 +15,7 @@ import tempfile
import time
from typing import Any, BinaryIO, Dict, Iterator, List, Optional, Sequence, Tuple, cast
import sentry_sdk
from tenacity import retry
from tenacity.retry import retry_if_exception_type
from tenacity.stop import stop_after_attempt
......@@ -141,7 +142,7 @@ class CvsLoader(BaseLoader):
else:
parents = ()
revision = self.build_swh_revision(k, logmsg, swh_dir.hash, parents)
self.log.info("SWH revision ID: %s", hashutil.hash_to_hex(revision.id))
self.log.debug("SWH revision ID: %s", hashutil.hash_to_hex(revision.id))
self._last_revision = revision
return (revision, swh_dir)
......@@ -168,7 +169,7 @@ class CvsLoader(BaseLoader):
wtpath = os.path.join(self.tempdir_path, path)
if not self.file_path_is_safe(wtpath):
raise BadPathException(f"unsafe path found in RCS file: {f.path}")
self.log.info("rev %s state %s file %s", f.rev, f.state, f.path)
self.log.debug("rev %s state %s file %s", f.rev, f.state, f.path)
if f.state == "dead":
# remove this file from work tree
try:
......@@ -217,7 +218,7 @@ class CvsLoader(BaseLoader):
wtpath = os.path.join(self.tempdir_path, path)
if not self.file_path_is_safe(wtpath):
raise BadPathException(f"unsafe path found in cvs rlog output: {f.path}")
self.log.info("rev %s state %s file %s", f.rev, f.state, f.path)
self.log.debug("rev %s state %s file %s", f.rev, f.state, f.path)
if f.state == "dead":
# remove this file from work tree
try:
......@@ -254,7 +255,7 @@ class CvsLoader(BaseLoader):
"""
for k in cvs_changesets:
tstr = time.strftime("%c", time.gmtime(k.max_time))
self.log.info(
self.log.debug(
"changeset from %s by %s on branch %s", tstr, k.author, k.branch
)
logmsg: Optional[bytes] = b""
......@@ -295,7 +296,7 @@ class CvsLoader(BaseLoader):
)
def cleanup(self) -> None:
self.log.info("cleanup")
self.log.debug("cleanup")
def configure_custom_id_keyword(self, cvsconfig):
"""Parse CVSROOT/config and look for a custom keyword definition.
......@@ -467,10 +468,10 @@ class CvsLoader(BaseLoader):
# will need to be modified such that it spools the list of changesets
# to disk instead.
cvs = CvsConv(self.cvsroot_path, RcsKeywords(), False, CHANGESET_FUZZ_SEC)
self.log.info("Walking CVS module %s", self.cvs_module_name)
self.log.debug("Walking CVS module %s", self.cvs_module_name)
cvs.walk(self.cvs_module_name)
cvs_changesets = sorted(cvs.changesets)
self.log.info(
self.log.debug(
"CVS changesets found in %s: %d",
self.cvs_module_name,
len(cvs_changesets),
......@@ -484,7 +485,7 @@ class CvsLoader(BaseLoader):
self.cvsroot_path = os.path.dirname(url.path)
self.cvsclient = CVSClient(url)
cvsroot_path = os.path.dirname(url.path)
self.log.info(
self.log.debug(
"Fetching CVS rlog from %s:%s/%s",
url.host,
cvsroot_path,
......@@ -537,7 +538,7 @@ class CvsLoader(BaseLoader):
self.rlog.parse_rlog(cast(BinaryIO, fp))
self.rlog_file = cast(BinaryIO, fp)
cvs_changesets = sorted(self.rlog.changesets)
self.log.info(
self.log.debug(
"CVS changesets found for %s: %d",
self.cvs_module_name,
len(cvs_changesets),
......@@ -555,12 +556,15 @@ class CvsLoader(BaseLoader):
except StopIteration:
assert self._last_revision is not None
self.snapshot = self.generate_and_load_snapshot(self._last_revision)
self.log.info("SWH snapshot ID: %s", hashutil.hash_to_hex(self.snapshot.id))
self.log.debug(
"SWH snapshot ID: %s", hashutil.hash_to_hex(self.snapshot.id)
)
self.flush()
self.loaded_snapshot_id = self.snapshot.id
return False
except Exception:
self.log.exception("Exception in fetch_data:")
sentry_sdk.capture_exception()
self._visit_status = "failed"
return False # Stopping iteration
self._contents, self._skipped_contents, self._directories, rev = data
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment