Don't let subproject get knowledge about manifest

Author: spoorcc

dfetch/project/subproject.py

@@ -142,25 +142,23 @@ def update(
 
     def _apply_patches(self) -> list[str]:
         """Apply the patches."""
-        manifest_dir = Path(".").resolve()
+        cwd = Path(".").resolve()
         applied_patches = []
         for patch in self.__project.patch:
 
-            patch_path = (manifest_dir / patch).resolve()
+            patch_path = (cwd / patch).resolve()
 
             try:
-                patch_path.relative_to(manifest_dir)
+                patch_path.relative_to(cwd)
             except ValueError:
-                self._log_project(
-                    f'Skipping patch "{patch}" which is outside manifest dir.'
-                )
+                self._log_project(f'Skipping patch "{patch}" which is outside {cwd}.')
                 continue
 
             if not patch_path.exists():
                 self._log_project(f"Skipping non-existent patch {patch}")
                 continue
 
-            normalized_patch_path = str(patch_path.relative_to(manifest_dir).as_posix())
+            normalized_patch_path = str(patch_path.relative_to(cwd).as_posix())
 
             apply_patch(normalized_patch_path, root=self.local_path)
             self._log_project(f'Applied patch "{normalized_patch_path}"')

features/patch-after-fetch-git.feature

@@ -195,5 +195,5 @@ Feature: Patch after fetching from git repo
             """
             Dfetch (0.11.0)
               ext/test-repo-tag   : Fetched v2.0
-              ext/test-repo-tag   : Skipping patch "../diff.patch" which is outside manifest dir.
+              ext/test-repo-tag   : Skipping patch "../diff.patch" which is outside /some/path.
             """

features/steps/generic_steps.py

@@ -25,6 +25,7 @@
 urn_uuid = re.compile(r"[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}")
 bom_ref = re.compile(r"BomRef\.[0-9]+\.[0-9]+")
 svn_error = re.compile(r"svn: E\d{6}: .+")
+abs_path = re.compile(r"/tmp/[\w_]+")
 
 
 def remote_server_path(context):
@@ -181,6 +182,7 @@ def check_output(context, line_count=None):
                 "some-remote-server",
             ),
             (svn_error, "svn: EXXXXXX: <some error text>"),
+            (abs_path, "/some/path"),
         ],
         text=context.cmd_output,
     )