Page MenuHomeSoftware Heritage
Files F9312186

D6456.id23452.diff
No OneTemporary
Actions

D6456.id23452.diff
View Options

diff --git a/swh/provenance/provenance.py b/swh/provenance/provenance.py
--- a/swh/provenance/provenance.py
+++ b/swh/provenance/provenance.py
@@ -23,6 +23,7 @@
RevisionData,
)
from .model import DirectoryEntry, FileEntry, OriginEntry, RevisionEntry
+from .util import path_normalize
LOGGER = logging.getLogger(__name__)
@@ -286,14 +287,14 @@
self, directory: DirectoryEntry, blob: FileEntry, prefix: bytes
) -> None:
self.cache["content_in_directory"].add(
- (blob.id, directory.id, normalize(os.path.join(prefix, blob.name)))
+ (blob.id, directory.id, path_normalize(os.path.join(prefix, blob.name)))
)
def content_add_to_revision(
self, revision: RevisionEntry, blob: FileEntry, prefix: bytes
) -> None:
self.cache["content_in_revision"].add(
- (blob.id, revision.id, normalize(os.path.join(prefix, blob.name)))
+ (blob.id, revision.id, path_normalize(os.path.join(prefix, blob.name)))
)
def content_find_first(self, id: Sha1Git) -> Optional[ProvenanceResult]:
@@ -320,7 +321,7 @@
self, revision: RevisionEntry, directory: DirectoryEntry, path: bytes
) -> None:
self.cache["directory_in_revision"].add(
- (directory.id, revision.id, normalize(path))
+ (directory.id, revision.id, path_normalize(path))
)
def directory_get_date_in_isochrone_frontier(
@@ -415,7 +416,3 @@
return revision.id in dict(self.cache["revision_in_origin"]) or bool(
self.storage.relation_get(RelationType.REV_IN_ORG, [revision.id])
)
-
-
-def normalize(path: bytes) -> bytes:
- return path[2:] if path.startswith(bytes("." + os.path.sep, "utf-8")) else path
diff --git a/swh/provenance/util.py b/swh/provenance/util.py
new file mode 100644
--- /dev/null
+++ b/swh/provenance/util.py
@@ -0,0 +1,10 @@
+# Copyright (C) 2021 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
+
+
+def path_normalize(path: bytes) -> bytes:
+ return path[2:] if path.startswith(bytes("." + os.path.sep, "utf-8")) else path

File Metadata

Mime Type
text/plain
Expires
Wed, Jul 2, 10:45 AM (1 w, 6 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3225573

Event Timeline

About · Developer information · Legal